liuyuqi-dellpc 5 years ago
parent
commit
0eaacb03a8
100 changed files with 1762 additions and 1762 deletions
  1. 2 2
      app/src/main/java/com/epson/iprint/apf/ApfAdapter.java
  2. 30 30
      app/src/main/java/com/epson/iprint/apf/ApfPreviewView.java
  3. 12 12
      app/src/main/java/com/epson/iprint/apf/ImageSizeConversionCache.java
  4. 13 13
      app/src/main/java/com/epson/iprint/shared/EpsoniPrintSharedActivity.java
  5. 30 30
      app/src/main/java/com/epson/iprint/shared/ExtSharedParam.java
  6. 2 2
      app/src/main/java/com/epson/iprint/shared/FileFormatErrorException.java
  7. 2 2
      app/src/main/java/com/epson/iprint/shared/ParametersErrorException.java
  8. 2 2
      app/src/main/java/com/epson/iprint/shared/SharedParam.java
  9. 34 34
      app/src/main/java/com/epson/iprint/shared/SharedParamPhoto.java
  10. 23 23
      app/src/main/java/com/epson/iprint/shared/SharedParamScan.java
  11. 14 14
      app/src/main/java/com/epson/iprint/shared/SharedParamStatus.java
  12. 2 2
      app/src/main/java/com/epson/iprint/storage/LocalProgressDialog.java
  13. 2 2
      app/src/main/java/com/epson/iprint/storage/OneButtonDialogFragment.java
  14. 6 6
      app/src/main/java/com/epson/iprint/storage/StorageActivity.java
  15. 9 9
      app/src/main/java/com/epson/iprint/storage/StorageItem.java
  16. 6 6
      app/src/main/java/com/epson/iprint/storage/StorageProcessActivity.java
  17. 53 53
      app/src/main/java/com/epson/iprint/storage/StorageProcessDownloadActivity.java
  18. 21 21
      app/src/main/java/com/epson/iprint/storage/StorageProcessUploadActivity.java
  19. 8 8
      app/src/main/java/com/epson/iprint/storage/StorageSecureStore.java
  20. 10 10
      app/src/main/java/com/epson/iprint/storage/StorageSignInActivity.java
  21. 11 11
      app/src/main/java/com/epson/iprint/storage/StorageWaitingActivity.java
  22. 40 40
      app/src/main/java/com/epson/iprint/storage/box/BoxNetClient.java
  23. 12 12
      app/src/main/java/com/epson/iprint/storage/box/BoxNetSignInActivity.java
  24. 17 17
      app/src/main/java/com/epson/iprint/storage/dropbox/DropboxV2Client.java
  25. 1 1
      app/src/main/java/com/epson/iprint/storage/dropbox/DropboxV2SignInActivity.java
  26. 8 8
      app/src/main/java/com/epson/iprint/storage/evernote/EvernoteClient.java
  27. 5 5
      app/src/main/java/com/epson/iprint/storage/evernote/EvernoteRequest.java
  28. 4 4
      app/src/main/java/com/epson/iprint/storage/gdrivev3/DownloadFile.java
  29. 20 20
      app/src/main/java/com/epson/iprint/storage/gdrivev3/DownloadTask.java
  30. 10 10
      app/src/main/java/com/epson/iprint/storage/gdrivev3/DownloaderWrapper.java
  31. 4 4
      app/src/main/java/com/epson/iprint/storage/gdrivev3/DriveListTask.java
  32. 7 7
      app/src/main/java/com/epson/iprint/storage/gdrivev3/DriveWriter.java
  33. 7 7
      app/src/main/java/com/epson/iprint/storage/gdrivev3/FileListAdapter.java
  34. 29 29
      app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleDownloadPresenter.java
  35. 18 18
      app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleDownloader.java
  36. 5 5
      app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleDriveFile.java
  37. 10 10
      app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleV3UploadClient.java
  38. 20 20
      app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleV3UploadSignInActivity.java
  39. 44 44
      app/src/main/java/com/epson/iprint/storage/gdrivev3/ListAndDownloadActivity.java
  40. 6 6
      app/src/main/java/com/epson/iprint/storage/gdrivev3/PlayServiceDialogManager.java
  41. 48 48
      app/src/main/java/com/epson/iprint/storage/onedrive/OneDriveClient.java
  42. 1 1
      app/src/main/java/com/epson/iprint/storage/onedrive/OneDriveSignInActivity.java
  43. 6 6
      app/src/main/java/com/epson/iprint/storage/onedrive/OneDriveStorageProcessUploadActivity.java
  44. 1 1
      app/src/main/java/com/epson/mobilephone/common/ble/BleScanWork.java
  45. 55 55
      app/src/main/java/epson/print/copy/ActivityBase.java
  46. 12 12
      app/src/main/java/epson/print/copy/Component/ecopycomponent/CopyPhotoSettingHandler.java
  47. 15 15
      app/src/main/java/epson/print/copy/Component/ecopycomponent/ECopyComponent.java
  48. 24 24
      app/src/main/java/epson/print/copy/Component/ecopycomponent/ECopyOptionContext.java
  49. 67 67
      app/src/main/java/epson/print/copy/Component/ecopycomponent/ECopyOptionItem.java
  50. 157 157
      app/src/main/java/epson/print/copy/Component/ecopycomponent/ECopyPreview.java
  51. 17 17
      app/src/main/java/epson/print/copy/Component/ecopycomponent/PreviewScanTask.java
  52. 10 10
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyGetOptionTask.java
  53. 11 11
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyPhotoGetOptionTask.java
  54. 23 23
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyPhotoSetOptionTask.java
  55. 37 37
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyPhotoTask.java
  56. 27 27
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopySetOptionTask.java
  57. 49 49
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyTask.java
  58. 8 8
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteDeviceTask.java
  59. 9 9
      app/src/main/java/epson/print/copy/Component/eremoteoperation/ERemoteCopy.java
  60. 48 48
      app/src/main/java/epson/print/copy/Component/eremoteoperation/ERemoteOperation.java
  61. 28 28
      app/src/main/java/epson/print/copy/CopyScaleActivity.java
  62. 16 16
      app/src/main/java/epson/print/copy/CopySettingActivity.java
  63. 2 2
      app/src/main/java/epson/print/copy/DisplayUtil.java
  64. 8 8
      app/src/main/java/epson/print/ecclient/EcClientLib.java
  65. 31 31
      app/src/main/java/epson/print/ecclient/EpsJobAttrib.java
  66. 23 23
      app/src/main/java/epson/print/ecclient/EpsonConnectAccess.java
  67. 31 31
      app/src/main/java/epson/print/ecclient/HttpApache.java
  68. 5 5
      app/src/main/java/epson/print/ecclient/HttpNonSsl.java
  69. 8 8
      app/src/main/java/epson/print/gdconv/ConvertProgressActivity.java
  70. 7 7
      app/src/main/java/epson/print/gdconv/ConvertTask.java
  71. 19 19
      app/src/main/java/epson/print/imgsel/Alt2ViewImageAdapter.java
  72. 6 6
      app/src/main/java/epson/print/imgsel/AltThumbnailCache.java
  73. 26 26
      app/src/main/java/epson/print/imgsel/BitmapCache.java
  74. 6 6
      app/src/main/java/epson/print/imgsel/FolderFindTask.java
  75. 2 2
      app/src/main/java/epson/print/imgsel/ImageFileInfo.java
  76. 8 8
      app/src/main/java/epson/print/imgsel/ImageFindTask.java
  77. 12 12
      app/src/main/java/epson/print/imgsel/ImageFolderAdapter.java
  78. 13 13
      app/src/main/java/epson/print/imgsel/ImageFolderInfo.java
  79. 18 18
      app/src/main/java/epson/print/imgsel/ImageFolderListFragment.java
  80. 69 69
      app/src/main/java/epson/print/imgsel/ImageGridFragment.java
  81. 12 12
      app/src/main/java/epson/print/imgsel/ImageResizer.java
  82. 8 8
      app/src/main/java/epson/print/imgsel/ImageSelectActivity.java
  83. 14 14
      app/src/main/java/epson/print/imgsel/ImageSelector.java
  84. 8 8
      app/src/main/java/epson/print/imgsel/ImageThumbnailTask.java
  85. 14 14
      app/src/main/java/epson/print/imgsel/ImageViewBaseFragment.java
  86. 16 16
      app/src/main/java/epson/print/imgsel/ImageViewMultiSelectFragment.java
  87. 18 18
      app/src/main/java/epson/print/imgsel/ImageViewPagerActivity.java
  88. 5 5
      app/src/main/java/epson/print/imgsel/ImageViewSingleFragment.java
  89. 1 1
      app/src/main/java/epson/print/imgsel/LocalAlertDialogFragment.java
  90. 20 20
      app/src/main/java/epson/print/inkrpln/InkReplenishSystem.java
  91. 6 6
      app/src/main/java/epson/print/inkrpln/InkRplnInfoClient.java
  92. 3 3
      app/src/main/java/epson/print/inkrpln/InkRplnProgressDialog.java
  93. 15 15
      app/src/main/java/epson/print/inkrpln/InkRplnProgressFragment.java
  94. 2 2
      app/src/main/java/epson/print/inkrpln/InkRplnRepository.java
  95. 15 15
      app/src/main/java/epson/print/inkrpln/JumpUrlFragment.java
  96. 8 8
      app/src/main/java/epson/print/inkrpln/LocalSSLSocketFactory.java
  97. 5 5
      app/src/main/java/epson/print/inkrpln/PrintSettingDependencyBuilder.java
  98. 19 19
      app/src/main/java/epson/print/pdf/AdobePdfContainer.java
  99. 7 7
      app/src/main/java/epson/print/pdf/AreaPdfRenderer.java
  100. 44 44
      app/src/main/java/epson/print/pdf/pdfRender.java

+ 2 - 2
app/src/main/java/com/epson/iprint/apf/ApfAdapter.java

@@ -32,7 +32,7 @@ public class ApfAdapter {
     protected Context mApplicationContext;
     protected Context mApplicationContext;
 
 
     public ApfAdapter(Context context) {
     public ApfAdapter(Context context) {
-        this.mApplicationContext = context.getApplicationContext();
+        mApplicationContext = context.getApplicationContext();
         ExternalFileUtils.getInstance(this.mApplicationContext).createTempFolder(this.mApfImageDir.getPath());
         ExternalFileUtils.getInstance(this.mApplicationContext).createTempFolder(this.mApfImageDir.getPath());
     }
     }
 
 
@@ -245,7 +245,7 @@ public class ApfAdapter {
             return null;
             return null;
         }
         }
         UUID nameUUIDFromBytes = UUID.nameUUIDFromBytes(str.getBytes());
         UUID nameUUIDFromBytes = UUID.nameUUIDFromBytes(str.getBytes());
-        File file = this.mApfImageDir;
+        File file = mApfImageDir;
         return new File(file, str2 + nameUUIDFromBytes.toString() + ".bmp").toString();
         return new File(file, str2 + nameUUIDFromBytes.toString() + ".bmp").toString();
     }
     }
 
 

+ 30 - 30
app/src/main/java/com/epson/iprint/apf/ApfPreviewView.java

@@ -26,14 +26,14 @@ public class ApfPreviewView implements PhotoPreview.PreviewBitmapMaker {
     private int mSharpnessValue;
     private int mSharpnessValue;
 
 
     public void setZoomControlHandler(Handler handler) {
     public void setZoomControlHandler(Handler handler) {
-        this.mEPPreviewImageView.setZoomControlHandler(handler);
+        mEPPreviewImageView.setZoomControlHandler(handler);
     }
     }
 
 
     public void init(Context context, PhotoPreview photoPreview) {
     public void init(Context context, PhotoPreview photoPreview) {
-        this.mApplicationContext = context.getApplicationContext();
-        this.mApfAdapter = new ApfAdapter(this.mApplicationContext);
-        this.mEPPreviewImageView = photoPreview;
-        this.mEPPreviewImageView.setPreviewBitmapMaker(this);
+        mApplicationContext = context.getApplicationContext();
+        mApfAdapter = new ApfAdapter(this.mApplicationContext);
+        mEPPreviewImageView = photoPreview;
+        mEPPreviewImageView.setPreviewBitmapMaker(this);
     }
     }
 
 
     public static void deleteWorkingDirectory(Context context) {
     public static void deleteWorkingDirectory(Context context) {
@@ -41,89 +41,89 @@ public class ApfPreviewView implements PhotoPreview.PreviewBitmapMaker {
     }
     }
 
 
     public void invalidate() {
     public void invalidate() {
-        this.mEPPreviewImageView.invalidate();
+        mEPPreviewImageView.invalidate();
     }
     }
 
 
     public void setIsPaperLandscape(boolean z, Activity activity) {
     public void setIsPaperLandscape(boolean z, Activity activity) {
-        this.mEPPreviewImageView.setIsPaperLandscape(z, activity);
+        mEPPreviewImageView.setIsPaperLandscape(z, activity);
     }
     }
 
 
     public boolean getIsPaperLandscape() {
     public boolean getIsPaperLandscape() {
-        return this.mEPPreviewImageView.getIsPaperLandscape();
+        return mEPPreviewImageView.getIsPaperLandscape();
     }
     }
 
 
     public void setDrawEndHandler(Handler handler) {
     public void setDrawEndHandler(Handler handler) {
-        this.mEPPreviewImageView.setDrawEndHandler(handler);
+        mEPPreviewImageView.setDrawEndHandler(handler);
     }
     }
 
 
     public void postInvalidate() {
     public void postInvalidate() {
-        this.mEPPreviewImageView.postInvalidate();
+        mEPPreviewImageView.postInvalidate();
     }
     }
 
 
     public void setPreviewImageView(PhotoPreview photoPreview) {
     public void setPreviewImageView(PhotoPreview photoPreview) {
-        this.mEPPreviewImageView = photoPreview;
+        mEPPreviewImageView = photoPreview;
     }
     }
 
 
     public void setApfLibParams(int i, int i2, int i3) {
     public void setApfLibParams(int i, int i2, int i3) {
-        this.mApfMode = i;
-        this.mSharpnessValue = i2;
-        this.mClearlyVividMode = i3;
+        mApfMode = i;
+        mSharpnessValue = i2;
+        mClearlyVividMode = i3;
     }
     }
 
 
     public int getApfMode() {
     public int getApfMode() {
-        return this.mApfMode;
+        return mApfMode;
     }
     }
 
 
     public int getSharpnessValue() {
     public int getSharpnessValue() {
-        return this.mSharpnessValue;
+        return mSharpnessValue;
     }
     }
 
 
     public int getClearlyVividMode() {
     public int getClearlyVividMode() {
-        return this.mClearlyVividMode;
+        return mClearlyVividMode;
     }
     }
 
 
     public void setImageList(@NonNull PhotoPreviewImageList photoPreviewImageList) {
     public void setImageList(@NonNull PhotoPreviewImageList photoPreviewImageList) {
-        this.mEPPreviewImageView.setImageList(photoPreviewImageList);
+        mEPPreviewImageView.setImageList(photoPreviewImageList);
     }
     }
 
 
     public EPImageList getImageList() {
     public EPImageList getImageList() {
-        return this.mEPPreviewImageView.getImageList();
+        return mEPPreviewImageView.getImageList();
     }
     }
 
 
     public void setLayout(int i, int i2) {
     public void setLayout(int i, int i2) {
-        this.mEPPreviewImageView.setLayout(i, i2);
+        mEPPreviewImageView.setLayout(i, i2);
     }
     }
 
 
     public boolean setPaper(int i) {
     public boolean setPaper(int i) {
-        return this.mEPPreviewImageView.setPaper(i);
+        return mEPPreviewImageView.setPaper(i);
     }
     }
 
 
     public void setColor(int i) {
     public void setColor(int i) {
-        this.mEPPreviewImageView.setColor(i);
+        mEPPreviewImageView.setColor(i);
     }
     }
 
 
     public void invalidateImageNo() {
     public void invalidateImageNo() {
-        this.mEPPreviewImageView.invalidateImageNo();
+        mEPPreviewImageView.invalidateImageNo();
     }
     }
 
 
     public void invalidatePreview() {
     public void invalidatePreview() {
-        this.mResizeCache.invalidateCache();
-        this.mEPPreviewImageView.invalidatePreview();
+        mResizeCache.invalidateCache();
+        mEPPreviewImageView.invalidatePreview();
     }
     }
 
 
     public boolean setImage(int i, int i2, Activity activity) throws OutOfMemoryError {
     public boolean setImage(int i, int i2, Activity activity) throws OutOfMemoryError {
-        return this.mEPPreviewImageView.setImage(i, i2, activity);
+        return mEPPreviewImageView.setImage(i, i2, activity);
     }
     }
 
 
     public Bitmap getPreviewBitmap(EPImage ePImage, int i, int i2, int i3, boolean z) {
     public Bitmap getPreviewBitmap(EPImage ePImage, int i, int i2, int i3, boolean z) {
         String filename;
         String filename;
-        if (this.mApfMode == 0 && this.mSharpnessValue == 0) {
+        if (this.mApfMode == 0 && mSharpnessValue == 0) {
             return null;
             return null;
         }
         }
-        String apfResult = this.mApfAdapter.getApfResult(ePImage.loadImageFileName, this.mApfMode, this.mSharpnessValue, this.mClearlyVividMode);
+        String apfResult = mApfAdapter.getApfResult(ePImage.loadImageFileName, mApfMode, mSharpnessValue, mClearlyVividMode);
         if (apfResult == null) {
         if (apfResult == null) {
             throw new OutOfMemoryError("in getPreviewBitmap()");
             throw new OutOfMemoryError("in getPreviewBitmap()");
-        } else if (z || (filename = this.mResizeCache.getFilename(apfResult, new ImageSizeConversionCache.ConvertCondition(ePImage.previewWidth, ePImage.previewHeight, i3))) == null) {
+        } else if (z || (filename = mResizeCache.getFilename(apfResult, new ImageSizeConversionCache.ConvertCondition(ePImage.previewWidth, ePImage.previewHeight, i3))) == null) {
             Bitmap bitmapConventionally = getBitmapConventionally(ePImage, apfResult, i, i2, i3);
             Bitmap bitmapConventionally = getBitmapConventionally(ePImage, apfResult, i, i2, i3);
             if (bitmapConventionally != null) {
             if (bitmapConventionally != null) {
                 return bitmapConventionally;
                 return bitmapConventionally;
@@ -158,7 +158,7 @@ public class ApfPreviewView implements PhotoPreview.PreviewBitmapMaker {
         Bitmap decodeFile = BitmapFactory.decodeFile(ePImage2.previewImageFileName);
         Bitmap decodeFile = BitmapFactory.decodeFile(ePImage2.previewImageFileName);
         File apfResizeCacheFile = getApfResizeCacheFile(file, str);
         File apfResizeCacheFile = getApfResizeCacheFile(file, str);
         if (file.renameTo(apfResizeCacheFile)) {
         if (file.renameTo(apfResizeCacheFile)) {
-            this.mResizeCache.setFilename(str, new ImageSizeConversionCache.ConvertCondition(ePImage.previewWidth, ePImage.previewHeight, i3), apfResizeCacheFile.toString());
+            mResizeCache.setFilename(str, new ImageSizeConversionCache.ConvertCondition(ePImage.previewWidth, ePImage.previewHeight, i3), apfResizeCacheFile.toString());
         }
         }
         return decodeFile;
         return decodeFile;
     }
     }

+ 12 - 12
app/src/main/java/com/epson/iprint/apf/ImageSizeConversionCache.java

@@ -10,7 +10,7 @@ class ImageSizeConversionCache {
     }
     }
 
 
     public String getFilename(String str, ConvertCondition convertCondition) {
     public String getFilename(String str, ConvertCondition convertCondition) {
-        CacheInfo cacheInfo = this.mHash.get(str);
+        CacheInfo cacheInfo = mHash.get(str);
         if (cacheInfo == null) {
         if (cacheInfo == null) {
             return null;
             return null;
         }
         }
@@ -24,16 +24,16 @@ class ImageSizeConversionCache {
                 file.delete();
                 file.delete();
             }
             }
         }
         }
-        this.mHash.remove(str);
+        mHash.remove(str);
         return null;
         return null;
     }
     }
 
 
     public void setFilename(String str, ConvertCondition convertCondition, String str2) {
     public void setFilename(String str, ConvertCondition convertCondition, String str2) {
-        this.mHash.put(str, new CacheInfo(convertCondition, str2));
+        mHash.put(str, new CacheInfo(convertCondition, str2));
     }
     }
 
 
     public void invalidateCache() {
     public void invalidateCache() {
-        this.mHash.clear();
+        mHash.clear();
     }
     }
 
 
     public static class CacheInfo {
     public static class CacheInfo {
@@ -41,16 +41,16 @@ class ImageSizeConversionCache {
         String mFileName;
         String mFileName;
 
 
         public CacheInfo(ConvertCondition convertCondition, String str) {
         public CacheInfo(ConvertCondition convertCondition, String str) {
-            this.mCacheCondition = convertCondition;
-            this.mFileName = str;
+            mCacheCondition = convertCondition;
+            mFileName = str;
         }
         }
 
 
         public String getFilename() {
         public String getFilename() {
-            return this.mFileName;
+            return mFileName;
         }
         }
 
 
         public boolean isValid(ConvertCondition convertCondition) {
         public boolean isValid(ConvertCondition convertCondition) {
-            return this.mCacheCondition.myEquals(convertCondition);
+            return mCacheCondition.myEquals(convertCondition);
         }
         }
     }
     }
 
 
@@ -60,13 +60,13 @@ class ImageSizeConversionCache {
         public int mWidth;
         public int mWidth;
 
 
         public ConvertCondition(int i, int i2, int i3) {
         public ConvertCondition(int i, int i2, int i3) {
-            this.mWidth = i;
-            this.mHeight = i2;
-            this.mColorValue = i3;
+            mWidth = i;
+            mHeight = i2;
+            mColorValue = i3;
         }
         }
 
 
         public boolean myEquals(ConvertCondition convertCondition) {
         public boolean myEquals(ConvertCondition convertCondition) {
-            return this.mWidth == convertCondition.mWidth && this.mHeight == convertCondition.mHeight && this.mColorValue == convertCondition.mColorValue;
+            return mWidth == convertCondition.mWidth && mHeight == convertCondition.mHeight && mColorValue == convertCondition.mColorValue;
         }
         }
     }
     }
 }
 }

+ 13 - 13
app/src/main/java/com/epson/iprint/shared/EpsoniPrintSharedActivity.java

@@ -81,8 +81,8 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
     protected void onCreate(Bundle bundle) {
     protected void onCreate(Bundle bundle) {
         EPLog.i(LOG_TAG, "onCreate");
         EPLog.i(LOG_TAG, "onCreate");
         super.onCreate(bundle);
         super.onCreate(bundle);
-        this.mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
-        this.mModelDialog.getDialogJob().observe(this, new Observer() {
+        mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
+        mModelDialog.getDialogJob().observe(this, new Observer() {
             public final void onChanged(Object obj) {
             public final void onChanged(Object obj) {
                 EpsoniPrintSharedActivity.lambda$onCreate$0(EpsoniPrintSharedActivity.this, (Deque) obj);
                 EpsoniPrintSharedActivity.lambda$onCreate$0(EpsoniPrintSharedActivity.this, (Deque) obj);
             }
             }
@@ -137,7 +137,7 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
                     if (!IprintLicenseInfo.isAgreedCurrentVersion(this)) {
                     if (!IprintLicenseInfo.isAgreedCurrentVersion(this)) {
                         finish();
                         finish();
                     }
                     }
-                    this.mHandler.sendEmptyMessage(0);
+                    mHandler.sendEmptyMessage(0);
                 }
                 }
             } catch (SharedDataException e) {
             } catch (SharedDataException e) {
                 e.printStackTrace();
                 e.printStackTrace();
@@ -167,12 +167,12 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
         } catch (InterruptedException unused) {
         } catch (InterruptedException unused) {
         }
         }
         EPLog.i(LOG_TAG, "run::1");
         EPLog.i(LOG_TAG, "run::1");
-        this.mHandler.sendEmptyMessage(1);
+        mHandler.sendEmptyMessage(1);
     }
     }
 
 
     private void setWait() {
     private void setWait() {
-        this.mModelDialog.doShow(DIALOG_WAIT);
-        this.thread = new Thread(new Runnable() {
+        mModelDialog.doShow(DIALOG_WAIT);
+        thread = new Thread(new Runnable() {
             public void run() {
             public void run() {
                 EpsoniPrintSharedActivity.this.backgroundJob();
                 EpsoniPrintSharedActivity.this.backgroundJob();
             }
             }
@@ -189,7 +189,7 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
-        this.thread.start();
+        thread.start();
     }
     }
 
 
     private void backgroundJob() {
     private void backgroundJob() {
@@ -253,7 +253,7 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
                 return;
                 return;
             }
             }
             startActivityForResult(intent2, i);
             startActivityForResult(intent2, i);
-            this.mHandler.sendEmptyMessageDelayed(1, 500);
+            mHandler.sendEmptyMessageDelayed(1, 500);
         } catch (SharedDataException e) {
         } catch (SharedDataException e) {
             e.printStackTrace();
             e.printStackTrace();
             setResult(1);
             setResult(1);
@@ -387,7 +387,7 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
                     }
                     }
                 case 100:
                 case 100:
                     if (i2 == -1) {
                     if (i2 == -1) {
-                        this.thread.start();
+                        thread.start();
                         break;
                         break;
                     } else {
                     } else {
                         setResult(0);
                         setResult(0);
@@ -424,12 +424,12 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
     }
     }
 
 
     private void CleanUp() {
     private void CleanUp() {
-        Thread thread2 = this.thread;
+        Thread thread2 = thread;
         if (thread2 != null && thread2.isAlive()) {
         if (thread2 != null && thread2.isAlive()) {
-            this.thread.interrupt();
-            this.thread = null;
+            thread.interrupt();
+            thread = null;
         }
         }
-        this.mModelDialog.doDismiss(DIALOG_WAIT);
+        mModelDialog.doDismiss(DIALOG_WAIT);
     }
     }
 
 
     private void InitTempFolder() throws IOException {
     private void InitTempFolder() throws IOException {

+ 30 - 30
app/src/main/java/com/epson/iprint/shared/ExtSharedParam.java

@@ -16,69 +16,69 @@ public class ExtSharedParam {
     private int scan_type = 0;
     private int scan_type = 0;
 
 
     public void setParam(Bundle bundle) {
     public void setParam(Bundle bundle) {
-        this.scan_type = bundle.getInt("SCAN_TYPE");
-        this.pixel_main = bundle.getInt("PIXEL_MAIN");
-        this.pixel_sub = bundle.getInt("PIXEL_SUB");
-        this.res_main = bundle.getInt("RES_MAIN");
-        this.res_sub = bundle.getInt("RES_SUB");
-        this.folder_name = bundle.getString("FOLDER_NAME");
-        this.file_name = bundle.getString("FILE_NAME");
-        this.scan_mode = bundle.getInt("SCAN_MODE");
-        this.package_name = bundle.getString(EpsoniPrintSharedActivity.PARAM_KEY_CALLER_PACKAGE_NAME);
-        this.isValid = true;
+        scan_type = bundle.getInt("SCAN_TYPE");
+        pixel_main = bundle.getInt("PIXEL_MAIN");
+        pixel_sub = bundle.getInt("PIXEL_SUB");
+        res_main = bundle.getInt("RES_MAIN");
+        res_sub = bundle.getInt("RES_SUB");
+        folder_name = bundle.getString("FOLDER_NAME");
+        file_name = bundle.getString("FILE_NAME");
+        scan_mode = bundle.getInt("SCAN_MODE");
+        package_name = bundle.getString(EpsoniPrintSharedActivity.PARAM_KEY_CALLER_PACKAGE_NAME);
+        isValid = true;
     }
     }
 
 
     public void setParam(Intent intent) {
     public void setParam(Intent intent) {
         Bundle extras = intent.getExtras();
         Bundle extras = intent.getExtras();
-        this.scan_type = extras.getInt("SCAN_TYPE");
-        this.pixel_main = extras.getInt("PIXEL_MAIN");
-        this.pixel_sub = extras.getInt("PIXEL_SUB");
-        this.res_main = extras.getInt("RES_MAIN");
-        this.res_sub = extras.getInt("RES_SUB");
-        this.folder_name = extras.getString("FOLDER_NAME");
-        this.file_name = extras.getString("FILE_NAME");
-        this.scan_mode = extras.getInt("SCAN_MODE");
-        this.package_name = extras.getString(EpsoniPrintSharedActivity.PARAM_KEY_CALLER_PACKAGE_NAME);
-        this.isValid = true;
+        scan_type = extras.getInt("SCAN_TYPE");
+        pixel_main = extras.getInt("PIXEL_MAIN");
+        pixel_sub = extras.getInt("PIXEL_SUB");
+        res_main = extras.getInt("RES_MAIN");
+        res_sub = extras.getInt("RES_SUB");
+        folder_name = extras.getString("FOLDER_NAME");
+        file_name = extras.getString("FILE_NAME");
+        scan_mode = extras.getInt("SCAN_MODE");
+        package_name = extras.getString(EpsoniPrintSharedActivity.PARAM_KEY_CALLER_PACKAGE_NAME);
+        isValid = true;
     }
     }
 
 
     public boolean isAvailable() {
     public boolean isAvailable() {
-        return this.isValid;
+        return isValid;
     }
     }
 
 
     public int getScan_type() {
     public int getScan_type() {
-        return this.scan_type;
+        return scan_type;
     }
     }
 
 
     public int getPixel_main() {
     public int getPixel_main() {
-        return this.pixel_main;
+        return pixel_main;
     }
     }
 
 
     public int getPixel_sub() {
     public int getPixel_sub() {
-        return this.pixel_sub;
+        return pixel_sub;
     }
     }
 
 
     public int getRes_main() {
     public int getRes_main() {
-        return this.res_main;
+        return res_main;
     }
     }
 
 
     public int getRes_sub() {
     public int getRes_sub() {
-        return this.res_sub;
+        return res_sub;
     }
     }
 
 
     public String getFolder_name() {
     public String getFolder_name() {
-        return this.folder_name;
+        return folder_name;
     }
     }
 
 
     public String getFile_name() {
     public String getFile_name() {
-        return this.file_name;
+        return file_name;
     }
     }
 
 
     public int getScan_mode() {
     public int getScan_mode() {
-        return this.scan_mode;
+        return scan_mode;
     }
     }
 
 
     public String getPackage_name() {
     public String getPackage_name() {
-        return this.package_name;
+        return package_name;
     }
     }
 }
 }

+ 2 - 2
app/src/main/java/com/epson/iprint/shared/FileFormatErrorException.java

@@ -17,10 +17,10 @@ class FileFormatErrorException extends SharedDataException {
     }
     }
 
 
     public String getFileName() {
     public String getFileName() {
-        return this.fileName;
+        return fileName;
     }
     }
 
 
     public void setFileName(String str) {
     public void setFileName(String str) {
-        this.fileName = str;
+        fileName = str;
     }
     }
 }
 }

+ 2 - 2
app/src/main/java/com/epson/iprint/shared/ParametersErrorException.java

@@ -17,10 +17,10 @@ class ParametersErrorException extends SharedDataException {
     }
     }
 
 
     public String getParaName() {
     public String getParaName() {
-        return this.ParaName;
+        return ParaName;
     }
     }
 
 
     public void setParaName(String str) {
     public void setParaName(String str) {
-        this.ParaName = str;
+        ParaName = str;
     }
     }
 }
 }

+ 2 - 2
app/src/main/java/com/epson/iprint/shared/SharedParam.java

@@ -14,10 +14,10 @@ abstract class SharedParam implements Serializable {
     }
     }
 
 
     public boolean isAvailable() {
     public boolean isAvailable() {
-        return this.isValid;
+        return isValid;
     }
     }
 
 
     public String getPackage_name() {
     public String getPackage_name() {
-        return this.package_name;
+        return package_name;
     }
     }
 }
 }

+ 34 - 34
app/src/main/java/com/epson/iprint/shared/SharedParamPhoto.java

@@ -30,34 +30,34 @@ public class SharedParamPhoto extends SharedParam implements Serializable {
     }
     }
 
 
     protected void setParam(Bundle bundle) throws SharedDataException {
     protected void setParam(Bundle bundle) throws SharedDataException {
-        this.file_type = bundle.getInt("FILE_TYPE", 2);
-        int i = this.file_type;
+        file_type = bundle.getInt("FILE_TYPE", 2);
+        int i = file_type;
         if (i < 0 || i > 4) {
         if (i < 0 || i > 4) {
             throw new ParametersErrorException("FILE_TYPE errorr");
             throw new ParametersErrorException("FILE_TYPE errorr");
         }
         }
-        this.folder_name = bundle.getString("FOLDER_NAME");
+        folder_name = bundle.getString("FOLDER_NAME");
         if (!this.folder_name.equals((Object) null)) {
         if (!this.folder_name.equals((Object) null)) {
-            this.arrayFilePath = bundle.getStringArrayList("FILE_NAME");
+            arrayFilePath = bundle.getStringArrayList("FILE_NAME");
             if (this.arrayFilePath.size() != 0) {
             if (this.arrayFilePath.size() != 0) {
-                this.print_mode = bundle.getInt("PRINT_MODE", 0);
-                int i2 = this.print_mode;
+                print_mode = bundle.getInt("PRINT_MODE", 0);
+                int i2 = print_mode;
                 if (i2 < 0 || i2 > 1) {
                 if (i2 < 0 || i2 > 1) {
                     throw new ParametersErrorException("PRINT_MODE error");
                     throw new ParametersErrorException("PRINT_MODE error");
                 }
                 }
-                this.media_type = bundle.getInt("MEDIA_TYPE", 0);
-                if (this.media_type == Constants.MediaName.EPS_MTID_PLAIN.getCode() || this.media_type == Constants.MediaName.EPS_MTID_PGPHOTO.getCode() || this.media_type == Constants.MediaName.EPS_MTID_HAGAKIRECL.getCode() || this.media_type == Constants.MediaName.EPS_MTID_HAGAKIINKJET.getCode()) {
-                    this.media_size = bundle.getInt("MEDIA_SIZE", 0);
-                    if (this.media_size == Constants.PaperName.EPS_MSID_A4.getCode() || this.media_size == Constants.PaperName.EPS_MSID_4X6.getCode() || this.media_size == Constants.PaperName.EPS_MSID_L.getCode() || this.media_size == Constants.PaperName.EPS_MSID_POSTCARD.getCode()) {
-                        this.color_mode = bundle.getInt("COLOR_MODE", 0);
-                        int i3 = this.color_mode;
+                media_type = bundle.getInt("MEDIA_TYPE", 0);
+                if (this.media_type == Constants.MediaName.EPS_MTID_PLAIN.getCode() || media_type == Constants.MediaName.EPS_MTID_PGPHOTO.getCode() || media_type == Constants.MediaName.EPS_MTID_HAGAKIRECL.getCode() || media_type == Constants.MediaName.EPS_MTID_HAGAKIINKJET.getCode()) {
+                    media_size = bundle.getInt("MEDIA_SIZE", 0);
+                    if (this.media_size == Constants.PaperName.EPS_MSID_A4.getCode() || media_size == Constants.PaperName.EPS_MSID_4X6.getCode() || media_size == Constants.PaperName.EPS_MSID_L.getCode() || media_size == Constants.PaperName.EPS_MSID_POSTCARD.getCode()) {
+                        color_mode = bundle.getInt("COLOR_MODE", 0);
+                        int i3 = color_mode;
                         if (i3 == 0 || i3 == 1) {
                         if (i3 == 0 || i3 == 1) {
-                            this.layout_type = bundle.getInt("LAYOUT_TYPE", 2);
-                            int i4 = this.layout_type;
+                            layout_type = bundle.getInt("LAYOUT_TYPE", 2);
+                            int i4 = layout_type;
                             if (i4 == 1 || i4 == 2) {
                             if (i4 == 1 || i4 == 2) {
-                                this.package_name = bundle.getString(EpsoniPrintSharedActivity.PARAM_KEY_CALLER_PACKAGE_NAME);
+                                package_name = bundle.getString(EpsoniPrintSharedActivity.PARAM_KEY_CALLER_PACKAGE_NAME);
                                 if (!this.package_name.equals((Object) null)) {
                                 if (!this.package_name.equals((Object) null)) {
                                     setFullPathName();
                                     setFullPathName();
-                                    this.isValid = true;
+                                    isValid = true;
                                     return;
                                     return;
                                 }
                                 }
                                 throw new ParametersErrorException("PACKAGE_NAME error");
                                 throw new ParametersErrorException("PACKAGE_NAME error");
@@ -76,66 +76,66 @@ public class SharedParamPhoto extends SharedParam implements Serializable {
     }
     }
 
 
     private void setFullPathName() {
     private void setFullPathName() {
-        this.arrayFileFullPath = new ArrayList<>();
-        for (int i = 0; i < this.arrayFilePath.size(); i++) {
-            ArrayList<String> arrayList = this.arrayFileFullPath;
-            arrayList.add(this.folder_name + CommonDefine.SLASH + this.arrayFilePath.get(i));
+        arrayFileFullPath = new ArrayList<>();
+        for (int i = 0; i < arrayFilePath.size(); i++) {
+            ArrayList<String> arrayList = arrayFileFullPath;
+            arrayList.add(this.folder_name + CommonDefine.SLASH + arrayFilePath.get(i));
         }
         }
     }
     }
 
 
     public int getFile_type() {
     public int getFile_type() {
-        return this.file_type;
+        return file_type;
     }
     }
 
 
     public boolean isTIFF() {
     public boolean isTIFF() {
-        return this.file_type == 4;
+        return file_type == 4;
     }
     }
 
 
     public boolean isFileTypeValid() {
     public boolean isFileTypeValid() {
-        return this.file_type > 0;
+        return file_type > 0;
     }
     }
 
 
     public String getFolder_name() {
     public String getFolder_name() {
-        return this.folder_name;
+        return folder_name;
     }
     }
 
 
     public ArrayList<String> getArrayFilePath() {
     public ArrayList<String> getArrayFilePath() {
-        return this.arrayFilePath;
+        return arrayFilePath;
     }
     }
 
 
     public ArrayList<String> getArrayFileFullPath() {
     public ArrayList<String> getArrayFileFullPath() {
-        return this.arrayFileFullPath;
+        return arrayFileFullPath;
     }
     }
 
 
     public void setArrayFileFullPath(String str) {
     public void setArrayFileFullPath(String str) {
-        this.arrayFileFullPath.add(str);
+        arrayFileFullPath.add(str);
     }
     }
 
 
     public void setArrayFileFullPath(int i, String str) {
     public void setArrayFileFullPath(int i, String str) {
-        this.arrayFileFullPath.set(i, str);
+        arrayFileFullPath.set(i, str);
     }
     }
 
 
     public void clearArrayFileFullPath() {
     public void clearArrayFileFullPath() {
-        this.arrayFileFullPath.clear();
+        arrayFileFullPath.clear();
     }
     }
 
 
     public int getPrint_mode() {
     public int getPrint_mode() {
-        return this.print_mode;
+        return print_mode;
     }
     }
 
 
     public int getMedia_type() {
     public int getMedia_type() {
-        return this.media_type;
+        return media_type;
     }
     }
 
 
     public int getMedia_size() {
     public int getMedia_size() {
-        return this.media_size;
+        return media_size;
     }
     }
 
 
     public int getColor_mode() {
     public int getColor_mode() {
-        return this.color_mode;
+        return color_mode;
     }
     }
 
 
     public int getLayout_type() {
     public int getLayout_type() {
-        return this.layout_type;
+        return layout_type;
     }
     }
 }
 }

+ 23 - 23
app/src/main/java/com/epson/iprint/shared/SharedParamScan.java

@@ -26,68 +26,68 @@ public class SharedParamScan extends SharedParam implements Serializable {
     }
     }
 
 
     protected void setParam(Bundle bundle) throws SharedDataException {
     protected void setParam(Bundle bundle) throws SharedDataException {
-        this.scan_type = bundle.getInt("SCAN_TYPE");
-        int i = this.scan_type;
+        scan_type = bundle.getInt("SCAN_TYPE");
+        int i = scan_type;
         if (i < 1 || i > 3) {
         if (i < 1 || i > 3) {
             throw new ParametersErrorException("SCAN_TYPE errorr");
             throw new ParametersErrorException("SCAN_TYPE errorr");
         }
         }
-        this.pixel_main = bundle.getInt("PIXEL_MAIN");
+        pixel_main = bundle.getInt("PIXEL_MAIN");
         if (this.pixel_main >= 0) {
         if (this.pixel_main >= 0) {
-            this.pixel_sub = bundle.getInt("PIXEL_SUB");
-            this.res_main = bundle.getInt("RES_MAIN");
-            this.res_sub = bundle.getInt("RES_SUB");
-            this.folder_name = bundle.getString("FOLDER_NAME");
-            this.file_name = bundle.getString("FILE_NAME");
-            this.scan_mode = bundle.getInt("SCAN_MODE");
-            this.package_name = bundle.getString(EpsoniPrintSharedActivity.PARAM_KEY_CALLER_PACKAGE_NAME);
-            this.arrayOutFilePath = new ArrayList<>();
-            this.isValid = true;
+            pixel_sub = bundle.getInt("PIXEL_SUB");
+            res_main = bundle.getInt("RES_MAIN");
+            res_sub = bundle.getInt("RES_SUB");
+            folder_name = bundle.getString("FOLDER_NAME");
+            file_name = bundle.getString("FILE_NAME");
+            scan_mode = bundle.getInt("SCAN_MODE");
+            package_name = bundle.getString(EpsoniPrintSharedActivity.PARAM_KEY_CALLER_PACKAGE_NAME);
+            arrayOutFilePath = new ArrayList<>();
+            isValid = true;
             return;
             return;
         }
         }
         throw new ParametersErrorException("PIXEL_MAIN errorr");
         throw new ParametersErrorException("PIXEL_MAIN errorr");
     }
     }
 
 
     public int getScan_type() {
     public int getScan_type() {
-        return this.scan_type;
+        return scan_type;
     }
     }
 
 
     public int getPixel_main() {
     public int getPixel_main() {
-        return this.pixel_main;
+        return pixel_main;
     }
     }
 
 
     public int getPixel_sub() {
     public int getPixel_sub() {
-        return this.pixel_sub;
+        return pixel_sub;
     }
     }
 
 
     public int getRes_main() {
     public int getRes_main() {
-        return this.res_main;
+        return res_main;
     }
     }
 
 
     public int getRes_sub() {
     public int getRes_sub() {
-        return this.res_sub;
+        return res_sub;
     }
     }
 
 
     public String getFolder_name() {
     public String getFolder_name() {
-        return this.folder_name;
+        return folder_name;
     }
     }
 
 
     public String getFile_name() {
     public String getFile_name() {
-        return this.file_name;
+        return file_name;
     }
     }
 
 
     public int getScan_mode() {
     public int getScan_mode() {
-        return this.scan_mode;
+        return scan_mode;
     }
     }
 
 
     public ArrayList<String> getArrayOutFilePath() {
     public ArrayList<String> getArrayOutFilePath() {
-        return this.arrayOutFilePath;
+        return arrayOutFilePath;
     }
     }
 
 
     public void setArrayOutFilePath(String str) {
     public void setArrayOutFilePath(String str) {
-        this.arrayOutFilePath.add(str);
+        arrayOutFilePath.add(str);
     }
     }
 
 
     public void clearArrayOutFilePath() {
     public void clearArrayOutFilePath() {
-        this.arrayOutFilePath.clear();
+        arrayOutFilePath.clear();
     }
     }
 }
 }

+ 14 - 14
app/src/main/java/com/epson/iprint/shared/SharedParamStatus.java

@@ -25,53 +25,53 @@ public class SharedParamStatus extends SharedParam implements Serializable {
     }
     }
 
 
     public void setPrinter_name(String str) {
     public void setPrinter_name(String str) {
-        this.mcsModelName = str;
+        mcsModelName = str;
     }
     }
 
 
     public void setPrinter_status(int i) {
     public void setPrinter_status(int i) {
-        this.miReturnStatus = i;
+        miReturnStatus = i;
     }
     }
 
 
     public String getPrinter_name() {
     public String getPrinter_name() {
-        return this.mcsModelName;
+        return mcsModelName;
     }
     }
 
 
     public int getPrinter_status() {
     public int getPrinter_status() {
-        return this.miReturnStatus;
+        return miReturnStatus;
     }
     }
 
 
     public ArrayList<String> getArrayOutInkName() {
     public ArrayList<String> getArrayOutInkName() {
-        return this.arrayOutInkName;
+        return arrayOutInkName;
     }
     }
 
 
     public void setArrayOutInkName(ArrayList<String> arrayList) {
     public void setArrayOutInkName(ArrayList<String> arrayList) {
-        this.arrayOutInkName = arrayList;
+        arrayOutInkName = arrayList;
     }
     }
 
 
     public void clearArrayOutInkName() {
     public void clearArrayOutInkName() {
-        this.arrayOutInkName.clear();
+        arrayOutInkName.clear();
     }
     }
 
 
     public ArrayList<Integer> getArrayOutInkRemain() {
     public ArrayList<Integer> getArrayOutInkRemain() {
-        return this.arrayOutInkRemain;
+        return arrayOutInkRemain;
     }
     }
 
 
     public void setArrayOutInkRemain(ArrayList<Integer> arrayList) {
     public void setArrayOutInkRemain(ArrayList<Integer> arrayList) {
-        this.arrayOutInkRemain = arrayList;
+        arrayOutInkRemain = arrayList;
     }
     }
 
 
     public void clearArrayOutInkRemain() {
     public void clearArrayOutInkRemain() {
-        this.arrayOutInkRemain.clear();
+        arrayOutInkRemain.clear();
     }
     }
 
 
     public ArrayList<Integer> getExternInkStatus() {
     public ArrayList<Integer> getExternInkStatus() {
-        ArrayList<Integer> arrayList = this.mEscprLibInkStatus;
+        ArrayList<Integer> arrayList = mEscprLibInkStatus;
         if (arrayList == null) {
         if (arrayList == null) {
             return null;
             return null;
         }
         }
         ArrayList<Integer> arrayList2 = new ArrayList<>(arrayList.size());
         ArrayList<Integer> arrayList2 = new ArrayList<>(arrayList.size());
-        for (int i = 0; i < this.mEscprLibInkStatus.size(); i++) {
-            int intValue = this.mEscprLibInkStatus.get(i).intValue();
+        for (int i = 0; i < mEscprLibInkStatus.size(); i++) {
+            int intValue = mEscprLibInkStatus.get(i).intValue();
             if (intValue != -3) {
             if (intValue != -3) {
                 switch (intValue) {
                 switch (intValue) {
                     case -1:
                     case -1:
@@ -101,6 +101,6 @@ public class SharedParamStatus extends SharedParam implements Serializable {
     }
     }
 
 
     public void setEscprlibInkStatus(ArrayList<Integer> arrayList) {
     public void setEscprlibInkStatus(ArrayList<Integer> arrayList) {
-        this.mEscprLibInkStatus = arrayList;
+        mEscprLibInkStatus = arrayList;
     }
     }
 }
 }

+ 2 - 2
app/src/main/java/com/epson/iprint/storage/LocalProgressDialog.java

@@ -38,7 +38,7 @@ public class LocalProgressDialog extends DialogFragment {
         Bundle arguments = getArguments();
         Bundle arguments = getArguments();
         boolean z = arguments.getBoolean(PARAM_CANCELABLE, false);
         boolean z = arguments.getBoolean(PARAM_CANCELABLE, false);
         int i = arguments.getInt(PARAM_MESSAGE_ID, 0);
         int i = arguments.getInt(PARAM_MESSAGE_ID, 0);
-        this.mCancelConfirmDialogTag = arguments.getString(PARAM_CANCEL_CONFIRM_DIALOG_TAG);
+        mCancelConfirmDialogTag = arguments.getString(PARAM_CANCEL_CONFIRM_DIALOG_TAG);
         View inflate = layoutInflater.inflate(R.layout.my_progress, viewGroup, false);
         View inflate = layoutInflater.inflate(R.layout.my_progress, viewGroup, false);
         Button button = (Button) inflate.findViewById(R.id.cancelButton);
         Button button = (Button) inflate.findViewById(R.id.cancelButton);
         button.setOnClickListener(new View.OnClickListener() {
         button.setOnClickListener(new View.OnClickListener() {
@@ -83,7 +83,7 @@ public class LocalProgressDialog extends DialogFragment {
         if (this.mCancelConfirmDialogTag != null) {
         if (this.mCancelConfirmDialogTag != null) {
             FragmentManager fragmentManager = getFragmentManager();
             FragmentManager fragmentManager = getFragmentManager();
             if (fragmentManager != null) {
             if (fragmentManager != null) {
-                ConfirmCancelDialog.newInstance(R.string.str_msg_scan_cancel).show(fragmentManager, this.mCancelConfirmDialogTag);
+                ConfirmCancelDialog.newInstance(R.string.str_msg_scan_cancel).show(fragmentManager, mCancelConfirmDialogTag);
                 return;
                 return;
             }
             }
             return;
             return;

+ 2 - 2
app/src/main/java/com/epson/iprint/storage/OneButtonDialogFragment.java

@@ -29,8 +29,8 @@ public class OneButtonDialogFragment extends DialogFragment {
     public void onCreate(Bundle bundle) {
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         super.onCreate(bundle);
         Bundle arguments = getArguments();
         Bundle arguments = getArguments();
-        this.mMessageId = arguments.getInt(PARAM_MESSAGE_RESOURCE_ID);
-        this.mDialogId = arguments.getString(PARAM_DIALOG_ID);
+        mMessageId = arguments.getInt(PARAM_MESSAGE_RESOURCE_ID);
+        mDialogId = arguments.getString(PARAM_DIALOG_ID);
         setCancelable(false);
         setCancelable(false);
     }
     }
 
 

+ 6 - 6
app/src/main/java/com/epson/iprint/storage/StorageActivity.java

@@ -57,7 +57,7 @@ class StorageActivity extends ActivityIACommon {
 
 
         private void show(String str, CancelRequestCallback cancelRequestCallback, boolean z) {
         private void show(String str, CancelRequestCallback cancelRequestCallback, boolean z) {
             Intent intent = new Intent(StorageActivity.this, StorageWaitingActivity.class);
             Intent intent = new Intent(StorageActivity.this, StorageWaitingActivity.class);
-            intent.putExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, this.mRequestCode);
+            intent.putExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, mRequestCode);
             if (str != null) {
             if (str != null) {
                 intent.putExtra(StorageWaitingActivity.EXTRA_MESSAGE, str);
                 intent.putExtra(StorageWaitingActivity.EXTRA_MESSAGE, str);
             }
             }
@@ -77,14 +77,14 @@ class StorageActivity extends ActivityIACommon {
 
 
         private void changeMessage(String str) {
         private void changeMessage(String str) {
             Intent intent = new Intent(StorageWaitingActivity.CHANGE_ACTION);
             Intent intent = new Intent(StorageWaitingActivity.CHANGE_ACTION);
-            intent.putExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, this.mRequestCode);
+            intent.putExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, mRequestCode);
             intent.putExtra(StorageWaitingActivity.EXTRA_MESSAGE, str);
             intent.putExtra(StorageWaitingActivity.EXTRA_MESSAGE, str);
             StorageActivity.this.sendBroadcast(intent);
             StorageActivity.this.sendBroadcast(intent);
         }
         }
 
 
         private void registerCancelCallback(CancelRequestCallback cancelRequestCallback) {
         private void registerCancelCallback(CancelRequestCallback cancelRequestCallback) {
             Intent intent = new Intent(StorageWaitingActivity.REGISTER_ACTION);
             Intent intent = new Intent(StorageWaitingActivity.REGISTER_ACTION);
-            intent.putExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, this.mRequestCode);
+            intent.putExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, mRequestCode);
             intent.putExtra(StorageWaitingActivity.EXTRA_CANCEL_ENABLED, true);
             intent.putExtra(StorageWaitingActivity.EXTRA_CANCEL_ENABLED, true);
             registerCancelRequestReceiver(cancelRequestCallback);
             registerCancelRequestReceiver(cancelRequestCallback);
             StorageActivity.this.sendBroadcast(intent);
             StorageActivity.this.sendBroadcast(intent);
@@ -92,17 +92,17 @@ class StorageActivity extends ActivityIACommon {
 
 
         public void dismiss() {
         public void dismiss() {
             Intent intent = new Intent(StorageWaitingActivity.DISMISS_ACTION);
             Intent intent = new Intent(StorageWaitingActivity.DISMISS_ACTION);
-            intent.putExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, this.mRequestCode);
+            intent.putExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, mRequestCode);
             StorageActivity.this.sendBroadcast(intent);
             StorageActivity.this.sendBroadcast(intent);
             setCancelReceiver((BroadcastReceiver) null);
             setCancelReceiver((BroadcastReceiver) null);
         }
         }
 
 
         private void setCancelReceiver(BroadcastReceiver broadcastReceiver) {
         private void setCancelReceiver(BroadcastReceiver broadcastReceiver) {
-            BroadcastReceiver broadcastReceiver2 = this.mCancelReceiver;
+            BroadcastReceiver broadcastReceiver2 = mCancelReceiver;
             if (broadcastReceiver2 != null) {
             if (broadcastReceiver2 != null) {
                 StorageActivity.this.unregisterReceiver(broadcastReceiver2);
                 StorageActivity.this.unregisterReceiver(broadcastReceiver2);
             }
             }
-            this.mCancelReceiver = broadcastReceiver;
+            mCancelReceiver = broadcastReceiver;
         }
         }
 
 
         private void registerCancelRequestReceiver(final CancelRequestCallback cancelRequestCallback) {
         private void registerCancelRequestReceiver(final CancelRequestCallback cancelRequestCallback) {

+ 9 - 9
app/src/main/java/com/epson/iprint/storage/StorageItem.java

@@ -35,20 +35,20 @@ public class StorageItem {
     }
     }
 
 
     public StorageItem(String str) {
     public StorageItem(String str) {
-        this.name = str;
+        name = str;
     }
     }
 
 
     public StorageItem(String str, String str2, ItemType itemType) {
     public StorageItem(String str, String str2, ItemType itemType) {
-        this.name = str;
-        this.path = str2;
-        this.type = itemType;
+        name = str;
+        path = str2;
+        type = itemType;
     }
     }
 
 
     public StorageItem(String str, String str2, ItemType itemType, Object obj) {
     public StorageItem(String str, String str2, ItemType itemType, Object obj) {
-        this.name = str;
-        this.path = str2;
-        this.type = itemType;
-        this.userInfo = obj;
+        name = str;
+        path = str2;
+        type = itemType;
+        userInfo = obj;
     }
     }
 
 
     private String getDownloadLocalPath(Context context) {
     private String getDownloadLocalPath(Context context) {
@@ -56,7 +56,7 @@ public class StorageItem {
         if (!file.exists()) {
         if (!file.exists()) {
             file.mkdirs();
             file.mkdirs();
         }
         }
-        return new File(file.getAbsolutePath(), this.name).getPath();
+        return new File(file.getAbsolutePath(), name).getPath();
     }
     }
 
 
     public static class NameComparator implements Comparator<StorageItem> {
     public static class NameComparator implements Comparator<StorageItem> {

+ 6 - 6
app/src/main/java/com/epson/iprint/storage/StorageProcessActivity.java

@@ -69,22 +69,22 @@ public abstract class StorageProcessActivity extends StorageActivity {
     }
     }
 
 
     public StorageServiceClient getStorageClient() {
     public StorageServiceClient getStorageClient() {
-        return this.mStorageServiceClient;
+        return mStorageServiceClient;
     }
     }
 
 
     private void onSignIn() {
     private void onSignIn() {
-        startActivity(StorageSignInActivity.getStartIntent(this, this.mServerName, this.mStorageServiceClient.getStorageServiceName(this)));
+        startActivity(StorageSignInActivity.getStartIntent(this, mServerName, mStorageServiceClient.getStorageServiceName(this)));
     }
     }
 
 
     private void onSignOut() {
     private void onSignOut() {
-        this.mStorageServiceClient.revokeSignedInData(this);
+        mStorageServiceClient.revokeSignedInData(this);
         updateSignInStatus();
         updateSignInStatus();
     }
     }
 
 
     private void init() {
     private void init() {
         String stringExtra = getIntent().getStringExtra(StorageServiceNameKey);
         String stringExtra = getIntent().getStringExtra(StorageServiceNameKey);
-        this.mServerName = stringExtra;
-        this.mStorageServiceClient = StorageServiceClient.getClient(stringExtra);
+        mServerName = stringExtra;
+        mStorageServiceClient = StorageServiceClient.getClient(stringExtra);
     }
     }
 
 
     private void updateSignInRequest(SignInStatus signInStatus) {
     private void updateSignInRequest(SignInStatus signInStatus) {
@@ -113,7 +113,7 @@ public abstract class StorageProcessActivity extends StorageActivity {
     }
     }
 
 
     private void setSignInButtonEnabled(boolean z) {
     private void setSignInButtonEnabled(boolean z) {
-        this.bEnableSighIn = z;
+        bEnableSighIn = z;
         invalidateOptionsMenu();
         invalidateOptionsMenu();
     }
     }
 
 

+ 53 - 53
app/src/main/java/com/epson/iprint/storage/StorageProcessDownloadActivity.java

@@ -52,27 +52,27 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         super.onCreate(bundle);
         super.onCreate(bundle);
         setContentView((int) R.layout.folder_content_layout);
         setContentView((int) R.layout.folder_content_layout);
         setActionBar(getStorageClient().getStorageServiceName(this), true);
         setActionBar(getStorageClient().getStorageServiceName(this), true);
-        this.mEnumerator = getStorageClient().getEnumerator(this);
-        this.mFolderStack = new Stack<>();
-        this.mListView = (ListView) findViewById(16908298);
-        this.mListView.setOnItemClickListener(new StorageItemClickListener());
-        this.mListView.setCacheColorHint(0);
+        mEnumerator = getStorageClient().getEnumerator(this);
+        mFolderStack = new Stack<>();
+        mListView = (ListView) findViewById(16908298);
+        mListView.setOnItemClickListener(new StorageItemClickListener());
+        mListView.setCacheColorHint(0);
         try {
         try {
-            this.mPrintLog = (PrintLog) getIntent().getSerializableExtra("print_log");
+            mPrintLog = (PrintLog) getIntent().getSerializableExtra("print_log");
         } catch (ClassCastException unused) {
         } catch (ClassCastException unused) {
         }
         }
         if (this.mPrintLog == null) {
         if (this.mPrintLog == null) {
-            this.mPrintLog = new PrintLog();
+            mPrintLog = new PrintLog();
         }
         }
     }
     }
 
 
     public void onBackPressed() {
     public void onBackPressed() {
-        StorageItemAdapter storageItemAdapter = (StorageItemAdapter) this.mListView.getAdapter();
+        StorageItemAdapter storageItemAdapter = (StorageItemAdapter) mListView.getAdapter();
         if (storageItemAdapter == null) {
         if (storageItemAdapter == null) {
             finish();
             finish();
         } else if (storageItemAdapter.areAllItemsEnabled()) {
         } else if (storageItemAdapter.areAllItemsEnabled()) {
             if (this.mFolderStack.size() > 1) {
             if (this.mFolderStack.size() > 1) {
-                this.mFolderStack.pop();
+                mFolderStack.pop();
                 if (isConnected()) {
                 if (isConnected()) {
                     new EnumerateTask(this.mFolderStack.peek()).executeOnExecutor(new Void[0]);
                     new EnumerateTask(this.mFolderStack.peek()).executeOnExecutor(new Void[0]);
                 } else {
                 } else {
@@ -86,12 +86,12 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
 
 
     private void onSignInStatus(StorageProcessActivity.SignInStatus signInStatus) {
     private void onSignInStatus(StorageProcessActivity.SignInStatus signInStatus) {
         if (signInStatus == StorageProcessActivity.SignInStatus.SIGNED_IN) {
         if (signInStatus == StorageProcessActivity.SignInStatus.SIGNED_IN) {
-            this.mListView.setVisibility(0);
+            mListView.setVisibility(0);
             return;
             return;
         }
         }
-        this.mListView.setVisibility(4);
-        this.mListView.setAdapter((ListAdapter) null);
-        StorageServiceClient.Enumerator enumerator = this.mEnumerator;
+        mListView.setVisibility(4);
+        mListView.setAdapter((ListAdapter) null);
+        StorageServiceClient.Enumerator enumerator = mEnumerator;
         if (enumerator != null) {
         if (enumerator != null) {
             enumerator.cleanUpResources();
             enumerator.cleanUpResources();
         }
         }
@@ -100,8 +100,8 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
     protected void onStop() {
     protected void onStop() {
         super.onStop();
         super.onStop();
         if (this.mIsDownloading && Build.VERSION.SDK_INT >= 29) {
         if (this.mIsDownloading && Build.VERSION.SDK_INT >= 29) {
-            this.mIsDownloadInterruption = true;
-            this.task.cancel(false);
+            mIsDownloadInterruption = true;
+            task.cancel(false);
         }
         }
     }
     }
 
 
@@ -110,7 +110,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         if (this.mIsDownloadInterruption && !this.mIsDownloading) {
         if (this.mIsDownloadInterruption && !this.mIsDownloading) {
             itemClick(this.mPosition);
             itemClick(this.mPosition);
         }
         }
-        this.mIsDownloadInterruption = false;
+        mIsDownloadInterruption = false;
     }
     }
 
 
     private void onUpdateProcessView() {
     private void onUpdateProcessView() {
@@ -119,8 +119,8 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         }
         }
         if (isConnected()) {
         if (isConnected()) {
             StorageItem rootItem = getEnumerator().getRootItem();
             StorageItem rootItem = getEnumerator().getRootItem();
-            this.mFolderStack = new Stack<>();
-            this.mFolderStack.push(rootItem);
+            mFolderStack = new Stack<>();
+            mFolderStack.push(rootItem);
             new EnumerateTask(rootItem).executeOnExecutor(new Void[0]);
             new EnumerateTask(rootItem).executeOnExecutor(new Void[0]);
             return;
             return;
         }
         }
@@ -133,7 +133,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
             if (fetchDownloadedFilePath != null) {
             if (fetchDownloadedFilePath != null) {
                 new File(fetchDownloadedFilePath).delete();
                 new File(fetchDownloadedFilePath).delete();
             }
             }
-            this.mIsDownloadInterruption = false;
+            mIsDownloadInterruption = false;
         }
         }
     }
     }
 
 
@@ -147,14 +147,14 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         }
         }
 
 
         protected Void doInBackground(Void... voidArr) {
         protected Void doInBackground(Void... voidArr) {
-            final StorageServiceClient.Downloader downloader = StorageProcessDownloadActivity.this.getStorageClient().getDownloader(StorageProcessDownloadActivity.this, this.item, this.localPath);
+            final StorageServiceClient.Downloader downloader = StorageProcessDownloadActivity.this.getStorageClient().getDownloader(StorageProcessDownloadActivity.this, item, localPath);
             C09241 r0 = downloader.isCancelable() ? new StorageActivity.CancelRequestCallback() {
             C09241 r0 = downloader.isCancelable() ? new StorageActivity.CancelRequestCallback() {
                 public void onCancelRequest(Intent intent) {
                 public void onCancelRequest(Intent intent) {
                     downloader.cancel();
                     downloader.cancel();
                 }
                 }
             } : null;
             } : null;
-            this.progress = new StorageActivity.OverlayProgress();
-            this.progress.show(StorageProcessDownloadActivity.this.getString(R.string.downloading_notification), r0);
+            progress = new StorageActivity.OverlayProgress();
+            progress.show(StorageProcessDownloadActivity.this.getString(R.string.downloading_notification), r0);
             downloader.start(new StorageServiceClient.DownloadCompletion() {
             downloader.start(new StorageServiceClient.DownloadCompletion() {
                 public void onDownloadComplete(StorageItem storageItem, String str, StorageServiceClient.ProcessError processError) {
                 public void onDownloadComplete(StorageItem storageItem, String str, StorageServiceClient.ProcessError processError) {
                     if (str != null) {
                     if (str != null) {
@@ -170,7 +170,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
             StorageServiceClient.ProcessError error;
             StorageServiceClient.ProcessError error;
 
 
             DownloadedRun(StorageServiceClient.ProcessError processError) {
             DownloadedRun(StorageServiceClient.ProcessError processError) {
-                this.error = processError;
+                error = processError;
             }
             }
 
 
             public void run() {
             public void run() {
@@ -192,8 +192,8 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         }
         }
 
 
         DownloadTask(StorageItem storageItem) {
         DownloadTask(StorageItem storageItem) {
-            this.item = storageItem;
-            this.localPath = StorageProcessDownloadActivity.this.getStorageClient().getDownloadLocalPath(StorageProcessDownloadActivity.this, storageItem);
+            item = storageItem;
+            localPath = StorageProcessDownloadActivity.this.getStorageClient().getDownloadLocalPath(StorageProcessDownloadActivity.this, storageItem);
         }
         }
     }
     }
 
 
@@ -286,16 +286,16 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         protected Void doInBackground(Void... voidArr) {
         protected Void doInBackground(Void... voidArr) {
             boolean isNeedSignin = StorageProcessDownloadActivity.this.getStorageClient().isNeedSignin();
             boolean isNeedSignin = StorageProcessDownloadActivity.this.getStorageClient().isNeedSignin();
             if (!isNeedSignin) {
             if (!isNeedSignin) {
-                this.progress.show();
+                progress.show();
             }
             }
             if (this.item.type == StorageItem.ItemType.LOADMORE) {
             if (this.item.type == StorageItem.ItemType.LOADMORE) {
-                StorageProcessDownloadActivity.this.getEnumerator().enumerate(this.item, this.onLoadedMore);
+                StorageProcessDownloadActivity.this.getEnumerator().enumerate(this.item, onLoadedMore);
                 return null;
                 return null;
             } else if (!isNeedSignin) {
             } else if (!isNeedSignin) {
-                StorageProcessDownloadActivity.this.getEnumerator().enumerate(this.item, this.onEnumerated);
+                StorageProcessDownloadActivity.this.getEnumerator().enumerate(this.item, onEnumerated);
                 return null;
                 return null;
             } else {
             } else {
-                StorageProcessDownloadActivity.this.getEnumerator().enumerate(this.item, this.onEnumerated, new StorageServiceClient.SigninCompletion() {
+                StorageProcessDownloadActivity.this.getEnumerator().enumerate(this.item, onEnumerated, new StorageServiceClient.SigninCompletion() {
                     public void onSigninCompletion() {
                     public void onSigninCompletion() {
                         EnumerateTask.this.progress.show((String) null, (StorageActivity.CancelRequestCallback) null, false);
                         EnumerateTask.this.progress.show((String) null, (StorageActivity.CancelRequestCallback) null, false);
                     }
                     }
@@ -305,7 +305,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         }
         }
 
 
         EnumerateTask(StorageItem storageItem) {
         EnumerateTask(StorageItem storageItem) {
-            this.item = storageItem;
+            item = storageItem;
         }
         }
     }
     }
 
 
@@ -320,24 +320,24 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
     }
     }
 
 
     private void itemClick(int i) {
     private void itemClick(int i) {
-        this.mIsDownloading = true;
+        mIsDownloading = true;
         if (isConnected()) {
         if (isConnected()) {
-            this.task = null;
-            StorageItem storageItem = (StorageItem) this.mListView.getItemAtPosition(i);
+            task = null;
+            StorageItem storageItem = (StorageItem) mListView.getItemAtPosition(i);
             if (storageItem.type == StorageItem.ItemType.DIRECTORY) {
             if (storageItem.type == StorageItem.ItemType.DIRECTORY) {
                 if (storageItem.name.equals("..")) {
                 if (storageItem.name.equals("..")) {
-                    this.mFolderStack.pop();
-                } else if (!storageItem.path.equals(((StorageItem) this.mFolderStack.lastElement()).path)) {
-                    this.mFolderStack.push(storageItem);
+                    mFolderStack.pop();
+                } else if (!storageItem.path.equals(((StorageItem) mFolderStack.lastElement()).path)) {
+                    mFolderStack.push(storageItem);
                 }
                 }
-                this.task = new EnumerateTask(storageItem);
+                task = new EnumerateTask(storageItem);
                 int i2 = storageItem.mLoggerInfo;
                 int i2 = storageItem.mLoggerInfo;
             } else if (storageItem.type == StorageItem.ItemType.LOADMORE) {
             } else if (storageItem.type == StorageItem.ItemType.LOADMORE) {
-                this.task = new EnumerateTask(storageItem);
+                task = new EnumerateTask(storageItem);
             } else {
             } else {
-                this.task = new DownloadTask(storageItem);
+                task = new DownloadTask(storageItem);
             }
             }
-            AsyncTaskExecutor<Void, Void, Void> asyncTaskExecutor = this.task;
+            AsyncTaskExecutor<Void, Void, Void> asyncTaskExecutor = task;
             if (asyncTaskExecutor != null) {
             if (asyncTaskExecutor != null) {
                 asyncTaskExecutor.executeOnExecutor(new Void[0]);
                 asyncTaskExecutor.executeOnExecutor(new Void[0]);
                 return;
                 return;
@@ -364,10 +364,10 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
 
 
         @NonNull
         @NonNull
         public View getView(int i, View view, @NonNull ViewGroup viewGroup) {
         public View getView(int i, View view, @NonNull ViewGroup viewGroup) {
-            StorageItem storageItem = this.storageItems.get(i);
-            View view2 = this.viewCache.get(storageItem);
+            StorageItem storageItem = storageItems.get(i);
+            View view2 = viewCache.get(storageItem);
             if (view2 == null) {
             if (view2 == null) {
-                view2 = this.layoutInflater.inflate(R.layout.file_list_item, (ViewGroup) null);
+                view2 = layoutInflater.inflate(R.layout.file_list_item, (ViewGroup) null);
                 switch (storageItem.type) {
                 switch (storageItem.type) {
                     case DIRECTORY:
                     case DIRECTORY:
                         if (!storageItem.name.equals("..")) {
                         if (!storageItem.name.equals("..")) {
@@ -392,16 +392,16 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
                         StorageProcessDownloadActivity.this.getEnumerator().setThumbnailInBackground(storageItem, getIconView(view2));
                         StorageProcessDownloadActivity.this.getEnumerator().setThumbnailInBackground(storageItem, getIconView(view2));
                         break;
                         break;
                 }
                 }
-                this.viewCache.put(storageItem, view2);
+                viewCache.put(storageItem, view2);
             }
             }
             return view2;
             return view2;
         }
         }
 
 
         StorageItemAdapter(List<StorageItem> list) {
         StorageItemAdapter(List<StorageItem> list) {
             super(StorageProcessDownloadActivity.this.getBaseContext(), R.layout.file_list_item, list);
             super(StorageProcessDownloadActivity.this.getBaseContext(), R.layout.file_list_item, list);
-            this.layoutInflater = (LayoutInflater) StorageProcessDownloadActivity.this.getBaseContext().getSystemService(Service.LAYOUT_INFLATER_SERVICE);
-            this.storageItems = list;
-            this.viewCache = new HashMap<>();
+            layoutInflater = (LayoutInflater) StorageProcessDownloadActivity.this.getBaseContext().getSystemService(Service.LAYOUT_INFLATER_SERVICE);
+            storageItems = list;
+            viewCache = new HashMap<>();
         }
         }
 
 
         private void setViewComponents(View view, String str, int i, int i2) {
         private void setViewComponents(View view, String str, int i, int i2) {
@@ -423,13 +423,13 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         }
         }
 
 
         private void setTaskingStatus(boolean z) {
         private void setTaskingStatus(boolean z) {
-            this.taskRunningNow = z;
+            taskRunningNow = z;
         }
         }
 
 
         private void addLoaedMoreItems(List<StorageItem> list) {
         private void addLoaedMoreItems(List<StorageItem> list) {
-            List<StorageItem> list2 = this.storageItems;
+            List<StorageItem> list2 = storageItems;
             list2.remove(list2.size() - 1);
             list2.remove(list2.size() - 1);
-            this.storageItems.addAll(list);
+            storageItems.addAll(list);
         }
         }
 
 
         private ImageView getIconView(View view) {
         private ImageView getIconView(View view) {
@@ -438,7 +438,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
     }
     }
 
 
     private void taskInvoked(boolean z) {
     private void taskInvoked(boolean z) {
-        StorageItemAdapter storageItemAdapter = (StorageItemAdapter) this.mListView.getAdapter();
+        StorageItemAdapter storageItemAdapter = (StorageItemAdapter) mListView.getAdapter();
         if (storageItemAdapter != null) {
         if (storageItemAdapter != null) {
             storageItemAdapter.setTaskingStatus(z);
             storageItemAdapter.setTaskingStatus(z);
         }
         }
@@ -459,9 +459,9 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
 
 
     private StorageServiceClient.Enumerator getEnumerator() {
     private StorageServiceClient.Enumerator getEnumerator() {
         if (this.mEnumerator == null) {
         if (this.mEnumerator == null) {
-            this.mEnumerator = getStorageClient().getEnumerator(this);
+            mEnumerator = getStorageClient().getEnumerator(this);
         }
         }
-        return this.mEnumerator;
+        return mEnumerator;
     }
     }
 
 
     @NonNull
     @NonNull

+ 21 - 21
app/src/main/java/com/epson/iprint/storage/StorageProcessUploadActivity.java

@@ -65,12 +65,12 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
                 StorageProcessUploadActivity.this.setEnabledSaveButton(i == 0);
                 StorageProcessUploadActivity.this.setEnabledSaveButton(i == 0);
             }
             }
         });
         });
-        this.mUploadFilename = generateUploadFilename(0);
+        mUploadFilename = generateUploadFilename(0);
         if (!(bundle == null || (string = bundle.getString("Upload.Editing.Filename")) == null)) {
         if (!(bundle == null || (string = bundle.getString("Upload.Editing.Filename")) == null)) {
-            this.mUploadFilename = string;
+            mUploadFilename = string;
         }
         }
         setFilename(this.mUploadFilename);
         setFilename(this.mUploadFilename);
-        this.mUploadFileLocalPathList = getIntent().getStringArrayListExtra(StorageProcessActivity.EXTRA_UPLOADFILE_LIST);
+        mUploadFileLocalPathList = getIntent().getStringArrayListExtra(StorageProcessActivity.EXTRA_UPLOADFILE_LIST);
         if (getStorageClient() instanceof GoogleV3UploadClient) {
         if (getStorageClient() instanceof GoogleV3UploadClient) {
             startActivity(GoogleV3UploadSignInActivity.getPlayServiceCheckIntent(this));
             startActivity(GoogleV3UploadSignInActivity.getPlayServiceCheckIntent(this));
         }
         }
@@ -78,13 +78,13 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
 
 
     protected void onSaveInstanceState(Bundle bundle) {
     protected void onSaveInstanceState(Bundle bundle) {
         super.onSaveInstanceState(bundle);
         super.onSaveInstanceState(bundle);
-        this.mUploadFilename = getFilename();
-        bundle.putString("Upload.Editing.Filename", this.mUploadFilename);
+        mUploadFilename = getFilename();
+        bundle.putString("Upload.Editing.Filename", mUploadFilename);
     }
     }
 
 
     protected void onRestoreInstanceState(Bundle bundle) {
     protected void onRestoreInstanceState(Bundle bundle) {
         super.onRestoreInstanceState(bundle);
         super.onRestoreInstanceState(bundle);
-        this.mUploadFilename = bundle.getString("Upload.Editing.Filename");
+        mUploadFilename = bundle.getString("Upload.Editing.Filename");
     }
     }
 
 
     private void onSignInStatus(StorageProcessActivity.SignInStatus signInStatus) {
     private void onSignInStatus(StorageProcessActivity.SignInStatus signInStatus) {
@@ -117,23 +117,23 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
             });
             });
             String str = "";
             String str = "";
             if (StorageServiceClient.UploadFileType.PDF.equals(this.fileType)) {
             if (StorageServiceClient.UploadFileType.PDF.equals(this.fileType)) {
-                String str2 = new File(this.localPaths.get(0)).getParent() + CommonDefine.SLASH + this.uploadFilename + CommonDefine.FileType_PDF;
-                new libHaru().createPDF((ArrayList) this.localPaths, str2);
-                this.localPaths.clear();
-                this.localPaths.add(str2);
+                String str2 = new File(this.localPaths.get(0)).getParent() + CommonDefine.SLASH + uploadFilename + CommonDefine.FileType_PDF;
+                new libHaru().createPDF((ArrayList) localPaths, str2);
+                localPaths.clear();
+                localPaths.add(str2);
                 str = CommonDefine.FileType_PDF;
                 str = CommonDefine.FileType_PDF;
             } else if (StorageServiceClient.UploadFileType.JPEG.equals(this.fileType)) {
             } else if (StorageServiceClient.UploadFileType.JPEG.equals(this.fileType)) {
                 str = ".jpg";
                 str = ".jpg";
             }
             }
             boolean z = !this.uploadFilename.equals(StorageProcessUploadActivity.this.generateUploadFilename(0));
             boolean z = !this.uploadFilename.equals(StorageProcessUploadActivity.this.generateUploadFilename(0));
-            int size = this.localPaths.size();
+            int size = localPaths.size();
             int i = 0;
             int i = 0;
             while (true) {
             while (true) {
                 if (i >= size) {
                 if (i >= size) {
                     break;
                     break;
                 }
                 }
-                String str3 = this.localPaths.get(i);
-                String str4 = this.uploadFilename + str;
+                String str3 = localPaths.get(i);
+                String str4 = uploadFilename + str;
                 if (size > 1) {
                 if (size > 1) {
                     if (z) {
                     if (z) {
                         str4 = String.format("%s%03d%s", new Object[]{this.uploadFilename, Integer.valueOf(i + 1), str});
                         str4 = String.format("%s%03d%s", new Object[]{this.uploadFilename, Integer.valueOf(i + 1), str});
@@ -146,10 +146,10 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
                 final Condition newCondition = reentrantLock.newCondition();
                 final Condition newCondition = reentrantLock.newCondition();
                 try {
                 try {
                     reentrantLock.lock();
                     reentrantLock.lock();
-                    this.uploaded = false;
-                    this.taskError = StorageServiceClient.ProcessError.NONE;
-                    this.uploader = StorageProcessUploadActivity.this.getStorageClient().getUploader(StorageProcessUploadActivity.this, this.fileType, str3, str4);
-                    this.uploader.start(new StorageServiceClient.UploadCompletion() {
+                    uploaded = false;
+                    taskError = StorageServiceClient.ProcessError.NONE;
+                    uploader = StorageProcessUploadActivity.this.getStorageClient().getUploader(StorageProcessUploadActivity.this, fileType, str3, str4);
+                    uploader.start(new StorageServiceClient.UploadCompletion() {
                         public void onUploadComplete(String str, String str2, StorageServiceClient.ProcessError processError) {
                         public void onUploadComplete(String str, String str2, StorageServiceClient.ProcessError processError) {
                             try {
                             try {
                                 reentrantLock.lock();
                                 reentrantLock.lock();
@@ -168,20 +168,20 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
                     while (!this.uploaded) {
                     while (!this.uploaded) {
                         newCondition.await();
                         newCondition.await();
                     }
                     }
-                    if (!this.canceled && this.taskError == StorageServiceClient.ProcessError.NONE) {
+                    if (!this.canceled && taskError == StorageServiceClient.ProcessError.NONE) {
                         reentrantLock.unlock();
                         reentrantLock.unlock();
                         i++;
                         i++;
                     }
                     }
                 } catch (Exception e) {
                 } catch (Exception e) {
                     e.printStackTrace();
                     e.printStackTrace();
-                    this.taskError = StorageServiceClient.ProcessError.ERROR;
+                    taskError = StorageServiceClient.ProcessError.ERROR;
                 } catch (Throwable th) {
                 } catch (Throwable th) {
                     reentrantLock.unlock();
                     reentrantLock.unlock();
                     throw th;
                     throw th;
                 }
                 }
             }
             }
             if (this.canceled) {
             if (this.canceled) {
-                this.taskError = StorageServiceClient.ProcessError.CANCELED;
+                taskError = StorageServiceClient.ProcessError.CANCELED;
             }
             }
             reentrantLock.unlock();
             reentrantLock.unlock();
             StorageProcessUploadActivity.this.runOnUiThread(new Runnable() {
             StorageProcessUploadActivity.this.runOnUiThread(new Runnable() {
@@ -207,7 +207,7 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
         if (signInStatus == StorageProcessActivity.SignInStatus.SIGNED_IN) {
         if (signInStatus == StorageProcessActivity.SignInStatus.SIGNED_IN) {
             viewGroup.setVisibility(0);
             viewGroup.setVisibility(0);
             ((RadioGroup) findViewById(R.id.file_type_for_upload)).check(R.id.pdf_type);
             ((RadioGroup) findViewById(R.id.file_type_for_upload)).check(R.id.pdf_type);
-            List<String> list = this.mUploadFileLocalPathList;
+            List<String> list = mUploadFileLocalPathList;
             if (list != null && list.size() > 0) {
             if (list != null && list.size() > 0) {
                 setFilename(this.mUploadFilename);
                 setFilename(this.mUploadFilename);
             }
             }

+ 8 - 8
app/src/main/java/com/epson/iprint/storage/StorageSecureStore.java

@@ -56,7 +56,7 @@ public class StorageSecureStore {
     }
     }
 
 
     public String fetch(String str) {
     public String fetch(String str) {
-        return this.mKeyValueMap.get(str);
+        return mKeyValueMap.get(str);
     }
     }
 
 
     public boolean revoke(String str) {
     public boolean revoke(String str) {
@@ -114,7 +114,7 @@ public class StorageSecureStore {
     }
     }
 
 
     StorageSecureStore(Context context) {
     StorageSecureStore(Context context) {
-        this.mContext = context;
+        mContext = context;
         reloadCache();
         reloadCache();
     }
     }
 
 
@@ -124,7 +124,7 @@ public class StorageSecureStore {
 
 
     private void reloadCache() {
     private void reloadCache() {
         KeyValueDatabase keyValueDatabase = new KeyValueDatabase(this.mContext);
         KeyValueDatabase keyValueDatabase = new KeyValueDatabase(this.mContext);
-        this.mKeyValueMap = keyValueDatabase.select();
+        mKeyValueMap = keyValueDatabase.select();
         keyValueDatabase.close();
         keyValueDatabase.close();
     }
     }
 
 
@@ -138,9 +138,9 @@ public class StorageSecureStore {
         DatabaseHelper mSqlHelper = null;
         DatabaseHelper mSqlHelper = null;
 
 
         KeyValueDatabase(Context context) {
         KeyValueDatabase(Context context) {
-            this.mSqlHelper = new DatabaseHelper(context, "storage.data", (SQLiteDatabase.CursorFactory) null, 1);
-            this.mSqlDB = this.mSqlHelper.getWritableDatabase();
-            this.mSecretText = getClass().getName();
+            mSqlHelper = new DatabaseHelper(context, "storage.data", (SQLiteDatabase.CursorFactory) null, 1);
+            mSqlDB = mSqlHelper.getWritableDatabase();
+            mSecretText = getClass().getName();
         }
         }
 
 
         /* access modifiers changed from: package-private */
         /* access modifiers changed from: package-private */
@@ -225,11 +225,11 @@ public class StorageSecureStore {
             hashMap = new HashMap();
             hashMap = new HashMap();
             Cursor cursor = 0;
             Cursor cursor = 0;
             try {
             try {
-                cursor = this.mSqlDB.rawQuery("SELECT * FROM keyvalue_tbl;", cursor);
+                cursor = mSqlDB.rawQuery("SELECT * FROM keyvalue_tbl;", cursor);
                 for (int i = 0; i < cursor.getCount(); i++) {
                 for (int i = 0; i < cursor.getCount(); i++) {
                     cursor.moveToPosition(i);
                     cursor.moveToPosition(i);
                     String string = cursor.getString(0);
                     String string = cursor.getString(0);
-                    byte[] decodeAes = StorageSecureStore.this.decodeAes(cursor.getBlob(1), this.mSecretText);
+                    byte[] decodeAes = StorageSecureStore.this.decodeAes(cursor.getBlob(1), mSecretText);
                     if (decodeAes != null) {
                     if (decodeAes != null) {
                         hashMap.put(string, new String(decodeAes));
                         hashMap.put(string, new String(decodeAes));
                     }
                     }

+ 10 - 10
app/src/main/java/com/epson/iprint/storage/StorageSignInActivity.java

@@ -74,16 +74,16 @@ public abstract class StorageSignInActivity extends StorageActivity {
     }
     }
 
 
     protected void onDestroy() {
     protected void onDestroy() {
-        StorageActivity.OverlayProgress overlayProgress = this.mProgressUntilOnDestroy;
+        StorageActivity.OverlayProgress overlayProgress = mProgressUntilOnDestroy;
         if (overlayProgress != null) {
         if (overlayProgress != null) {
             overlayProgress.dismiss();
             overlayProgress.dismiss();
-            this.mProgressUntilOnDestroy = null;
+            mProgressUntilOnDestroy = null;
         }
         }
         super.onDestroy();
         super.onDestroy();
     }
     }
 
 
     protected void onInitBasicSignIn(BasicSignIn basicSignIn) {
     protected void onInitBasicSignIn(BasicSignIn basicSignIn) {
-        this.mBasicSignIn = basicSignIn;
+        mBasicSignIn = basicSignIn;
         setContentView((int) R.layout.login_screen_layout);
         setContentView((int) R.layout.login_screen_layout);
         setActionBar(getIntent().getStringExtra(EXTRA_SERVER_NAME), true);
         setActionBar(getIntent().getStringExtra(EXTRA_SERVER_NAME), true);
         setInputMaxLength((EditText) findViewById(R.id.login_username_content), getMaxLengthUsername());
         setInputMaxLength((EditText) findViewById(R.id.login_username_content), getMaxLengthUsername());
@@ -106,23 +106,23 @@ public abstract class StorageSignInActivity extends StorageActivity {
         StorageActivity.OverlayProgress progress;
         StorageActivity.OverlayProgress progress;
 
 
         BasicSignInTask() {
         BasicSignInTask() {
-            this.mUserName = ((EditText) StorageSignInActivity.this.findViewById(R.id.login_username_content)).getText().toString();
-            this.mPassword = ((EditText) StorageSignInActivity.this.findViewById(R.id.login_password_content)).getText().toString();
+            mUserName = ((EditText) StorageSignInActivity.this.findViewById(R.id.login_username_content)).getText().toString();
+            mPassword = ((EditText) StorageSignInActivity.this.findViewById(R.id.login_password_content)).getText().toString();
         }
         }
 
 
         protected Boolean doInBackground(Void... voidArr) {
         protected Boolean doInBackground(Void... voidArr) {
-            this.progress = new StorageActivity.OverlayProgress();
-            this.progress.show();
-            return Boolean.valueOf(StorageSignInActivity.this.mBasicSignIn.signInBackground(this.mUserName, this.mPassword));
+            progress = new StorageActivity.OverlayProgress();
+            progress.show();
+            return Boolean.valueOf(StorageSignInActivity.this.mBasicSignIn.signInBackground(this.mUserName, mPassword));
         }
         }
 
 
         protected void onPostExecute(Boolean bool) {
         protected void onPostExecute(Boolean bool) {
             if (!bool.booleanValue()) {
             if (!bool.booleanValue()) {
                 StorageSignInActivity.this.showLoginError();
                 StorageSignInActivity.this.showLoginError();
-                this.progress.dismiss();
+                progress.dismiss();
                 return;
                 return;
             }
             }
-            this.progress.dismiss();
+            progress.dismiss();
             StorageSignInActivity.this.finish();
             StorageSignInActivity.this.finish();
         }
         }
     }
     }

+ 11 - 11
app/src/main/java/com/epson/iprint/storage/StorageWaitingActivity.java

@@ -47,8 +47,8 @@ public class StorageWaitingActivity extends Activity {
     }
     }
 
 
     private void registerBroadcastReceiver(Intent intent) {
     private void registerBroadcastReceiver(Intent intent) {
-        this.mRequestCode = intent.getIntExtra(EXTRA_REQUEST_CODE, 0);
-        this.mBroadcastReceiver = new BroadcastReceiver() {
+        mRequestCode = intent.getIntExtra(EXTRA_REQUEST_CODE, 0);
+        mBroadcastReceiver = new BroadcastReceiver() {
             public void onReceive(Context context, Intent intent) {
             public void onReceive(Context context, Intent intent) {
                 String action = intent.getAction();
                 String action = intent.getAction();
                 if (StorageWaitingActivity.this.mRequestCode == intent.getIntExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, 0)) {
                 if (StorageWaitingActivity.this.mRequestCode == intent.getIntExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, 0)) {
@@ -93,29 +93,29 @@ public class StorageWaitingActivity extends Activity {
     }
     }
 
 
     private void setCancelRequest(Intent intent) {
     private void setCancelRequest(Intent intent) {
-        this.mCancelButton = (Button) findViewById(R.id.cancelButton);
-        this.mCancelButton.setText(getString(R.string.str_cancel));
+        mCancelButton = (Button) findViewById(R.id.cancelButton);
+        mCancelButton.setText(getString(R.string.str_cancel));
         if (intent.getBooleanExtra(EXTRA_CANCEL_ENABLED, false)) {
         if (intent.getBooleanExtra(EXTRA_CANCEL_ENABLED, false)) {
-            this.mCancelButton.setOnClickListener(new View.OnClickListener() {
+            mCancelButton.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                 public void onClick(View view) {
                     StorageWaitingActivity.this.createCancelDialog().show();
                     StorageWaitingActivity.this.createCancelDialog().show();
                 }
                 }
             });
             });
-            this.mCancelButton.setVisibility(0);
+            mCancelButton.setVisibility(0);
             return;
             return;
         }
         }
-        this.mCancelButton.setVisibility(8);
+        mCancelButton.setVisibility(8);
     }
     }
 
 
     private void setMessage(Intent intent) {
     private void setMessage(Intent intent) {
-        this.mMessageText = (TextView) findViewById(R.id.messageText);
+        mMessageText = (TextView) findViewById(R.id.messageText);
         String stringExtra = intent.getStringExtra(EXTRA_MESSAGE);
         String stringExtra = intent.getStringExtra(EXTRA_MESSAGE);
         if (stringExtra != null) {
         if (stringExtra != null) {
-            this.mMessageText.setText(stringExtra);
-            this.mMessageText.setVisibility(0);
+            mMessageText.setText(stringExtra);
+            mMessageText.setVisibility(0);
             return;
             return;
         }
         }
-        this.mMessageText.setVisibility(8);
+        mMessageText.setVisibility(8);
     }
     }
 
 
     protected void onResume() {
     protected void onResume() {

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

@@ -96,16 +96,16 @@ public class BoxNetClient extends StorageServiceClient {
             public void start(StorageServiceClient.DownloadCompletion downloadCompletion) {
             public void start(StorageServiceClient.DownloadCompletion downloadCompletion) {
                 if (downloadCompletion != null) {
                 if (downloadCompletion != null) {
                     synchronized (this) {
                     synchronized (this) {
-                        this.mDownloadThread = new DownloadThread(downloadCompletion, storageItem, str);
+                        mDownloadThread = new DownloadThread(downloadCompletion, storageItem, str);
                     }
                     }
-                    this.mDownloadThread.start();
+                    mDownloadThread.start();
                 }
                 }
             }
             }
 
 
             public void cancel() {
             public void cancel() {
                 synchronized (this) {
                 synchronized (this) {
                     if (this.mDownloadThread != null) {
                     if (this.mDownloadThread != null) {
-                        this.mDownloadThread.cancel();
+                        mDownloadThread.cancel();
                     }
                     }
                 }
                 }
             }
             }
@@ -133,7 +133,7 @@ public class BoxNetClient extends StorageServiceClient {
     }
     }
 
 
     public boolean isSignedIn(Context context) {
     public boolean isSignedIn(Context context) {
-        if (context == null || this.mBoxSession == null || BoxAuthentication.getInstance().getLastAuthenticatedUserId(context) == null) {
+        if (context == null || mBoxSession == null || BoxAuthentication.getInstance().getLastAuthenticatedUserId(context) == null) {
             return false;
             return false;
         }
         }
         return true;
         return true;
@@ -150,21 +150,21 @@ public class BoxNetClient extends StorageServiceClient {
 
 
     public void boxLogout() {
     public void boxLogout() {
         try {
         try {
-            this.mBoxSession.logout().get();
+            mBoxSession.logout().get();
         } catch (InterruptedException | ExecutionException unused) {
         } catch (InterruptedException | ExecutionException unused) {
         }
         }
     }
     }
 
 
     public void initSession() {
     public void initSession() {
-        this.mBoxSession = new BoxSession((Context) IprintApplication.getInstance());
+        mBoxSession = new BoxSession((Context) IprintApplication.getInstance());
     }
     }
 
 
     public void setSessionAuthListener(@Nullable BoxAuthentication.AuthListener authListener) {
     public void setSessionAuthListener(@Nullable BoxAuthentication.AuthListener authListener) {
-        this.mBoxSession.setSessionAuthListener(authListener);
+        mBoxSession.setSessionAuthListener(authListener);
     }
     }
 
 
     public void authenticate() {
     public void authenticate() {
-        BoxSession boxSession = this.mBoxSession;
+        BoxSession boxSession = mBoxSession;
         if (boxSession != null) {
         if (boxSession != null) {
             boxSession.authenticate(IprintApplication.getInstance());
             boxSession.authenticate(IprintApplication.getInstance());
             return;
             return;
@@ -174,16 +174,16 @@ public class BoxNetClient extends StorageServiceClient {
 
 
     public void setLoginStatus(boolean z) {
     public void setLoginStatus(boolean z) {
         if (z) {
         if (z) {
-            BoxSession boxSession = this.mBoxSession;
+            BoxSession boxSession = mBoxSession;
             if (boxSession != null) {
             if (boxSession != null) {
-                this.mBoxApiFolder = new BoxApiFolder(boxSession);
-                this.mBoxApiFile = new BoxApiFile(this.mBoxSession);
+                mBoxApiFolder = new BoxApiFolder(boxSession);
+                mBoxApiFile = new BoxApiFile(this.mBoxSession);
                 return;
                 return;
             }
             }
             return;
             return;
         }
         }
-        this.mBoxApiFolder = null;
-        this.mBoxApiFile = null;
+        mBoxApiFolder = null;
+        mBoxApiFile = null;
     }
     }
 
 
     /* JADX WARNING: Code restructure failed: missing block: B:11:?, code lost:
     /* JADX WARNING: Code restructure failed: missing block: B:11:?, code lost:
@@ -338,7 +338,7 @@ public class BoxNetClient extends StorageServiceClient {
 
 
     @Nullable
     @Nullable
     private String searchRootFolder(@NonNull String str) throws BoxException {
     private String searchRootFolder(@NonNull String str) throws BoxException {
-        Iterator it = ((BoxIteratorItems) this.mBoxApiFolder.getItemsRequest(BoxConstants.ROOT_FOLDER_ID).send()).iterator();
+        Iterator it = ((BoxIteratorItems) mBoxApiFolder.getItemsRequest(BoxConstants.ROOT_FOLDER_ID).send()).iterator();
         while (it.hasNext()) {
         while (it.hasNext()) {
             BoxItem boxItem = (BoxItem) it.next();
             BoxItem boxItem = (BoxItem) it.next();
             if (str.equals(boxItem.getName()) && BoxFolder.TYPE.equals(boxItem.getType())) {
             if (str.equals(boxItem.getName()) && BoxFolder.TYPE.equals(boxItem.getType())) {
@@ -350,7 +350,7 @@ public class BoxNetClient extends StorageServiceClient {
 
 
     @Nullable
     @Nullable
     private BoxFolder createFolder(@NonNull String str) throws BoxException {
     private BoxFolder createFolder(@NonNull String str) throws BoxException {
-        return (BoxFolder) this.mBoxApiFolder.getCreateRequest(BoxConstants.ROOT_FOLDER_ID, str).send();
+        return (BoxFolder) mBoxApiFolder.getCreateRequest(BoxConstants.ROOT_FOLDER_ID, str).send();
     }
     }
 
 
     private void uploadOrUpdate(@NonNull File file, @NonNull String str, @NonNull String str2) throws IOException, BoxException {
     private void uploadOrUpdate(@NonNull File file, @NonNull String str, @NonNull String str2) throws IOException, BoxException {
@@ -374,7 +374,7 @@ public class BoxNetClient extends StorageServiceClient {
     public ArrayList<StorageItem> listFolder(@NonNull String str) throws BoxException {
     public ArrayList<StorageItem> listFolder(@NonNull String str) throws BoxException {
         if (this.mBoxApiFolder != null) {
         if (this.mBoxApiFolder != null) {
             ArrayList<StorageItem> arrayList = new ArrayList<>();
             ArrayList<StorageItem> arrayList = new ArrayList<>();
-            Iterator it = ((BoxIteratorItems) this.mBoxApiFolder.getItemsRequest(str).send()).iterator();
+            Iterator it = ((BoxIteratorItems) mBoxApiFolder.getItemsRequest(str).send()).iterator();
             while (it.hasNext()) {
             while (it.hasNext()) {
                 BoxItem boxItem = (BoxItem) it.next();
                 BoxItem boxItem = (BoxItem) it.next();
                 String name = boxItem.getName();
                 String name = boxItem.getName();
@@ -396,7 +396,7 @@ public class BoxNetClient extends StorageServiceClient {
         if (this.mBoxApiFile != null) {
         if (this.mBoxApiFile != null) {
             File file = new File(str2);
             File file = new File(str2);
             file.createNewFile();
             file.createNewFile();
-            this.mBoxApiFile.getDownloadRequest(file, str).send();
+            mBoxApiFile.getDownloadRequest(file, str).send();
             return;
             return;
         }
         }
         throw new IllegalStateException();
         throw new IllegalStateException();
@@ -409,16 +409,16 @@ public class BoxNetClient extends StorageServiceClient {
 
 
         private ListThread(@NonNull BoxNetClient boxNetClient, @NonNull StorageServiceClient.EnumerateCompletion enumerateCompletion, @NonNull String str) {
         private ListThread(@NonNull BoxNetClient boxNetClient, @NonNull StorageServiceClient.EnumerateCompletion enumerateCompletion, @NonNull String str) {
             super("list-box");
             super("list-box");
-            this.mBoxClient = boxNetClient;
-            this.mCompleteListener = enumerateCompletion;
-            this.mBaseFolderId = str;
+            mBoxClient = boxNetClient;
+            mCompleteListener = enumerateCompletion;
+            mBaseFolderId = str;
         }
         }
 
 
         public void run() {
         public void run() {
             try {
             try {
-                this.mCompleteListener.onEnumerateComplete(this.mBoxClient.listFolder(this.mBaseFolderId), StorageServiceClient.ProcessError.NONE);
+                mCompleteListener.onEnumerateComplete(this.mBoxClient.listFolder(this.mBaseFolderId), StorageServiceClient.ProcessError.NONE);
             } catch (BoxException unused) {
             } catch (BoxException unused) {
-                this.mCompleteListener.onEnumerateComplete((List<StorageItem>) null, StorageServiceClient.ProcessError.ERROR);
+                mCompleteListener.onEnumerateComplete((List<StorageItem>) null, StorageServiceClient.ProcessError.ERROR);
             }
             }
         }
         }
     }
     }
@@ -432,32 +432,32 @@ public class BoxNetClient extends StorageServiceClient {
 
 
         private DownloadThread(@NonNull BoxNetClient boxNetClient, @NonNull StorageServiceClient.DownloadCompletion downloadCompletion, @NonNull StorageItem storageItem, @NonNull String str) {
         private DownloadThread(@NonNull BoxNetClient boxNetClient, @NonNull StorageServiceClient.DownloadCompletion downloadCompletion, @NonNull StorageItem storageItem, @NonNull String str) {
             super("download-box");
             super("download-box");
-            this.mBoxClient = boxNetClient;
-            this.mDownloadEndListener = downloadCompletion;
-            this.mOnlineStorageItem = storageItem;
-            this.mLocalPath = str;
-            this.mCanceled = false;
+            mBoxClient = boxNetClient;
+            mDownloadEndListener = downloadCompletion;
+            mOnlineStorageItem = storageItem;
+            mLocalPath = str;
+            mCanceled = false;
         }
         }
 
 
         public void run() {
         public void run() {
             try {
             try {
-                this.mBoxClient.downloadFile(this.mOnlineStorageItem.path, this.mLocalPath);
+                mBoxClient.downloadFile(this.mOnlineStorageItem.path, mLocalPath);
                 if (this.mCanceled) {
                 if (this.mCanceled) {
-                    this.mDownloadEndListener.onDownloadComplete((StorageItem) null, (String) null, StorageServiceClient.ProcessError.CANCELED);
+                    mDownloadEndListener.onDownloadComplete((StorageItem) null, (String) null, StorageServiceClient.ProcessError.CANCELED);
                 } else {
                 } else {
-                    this.mDownloadEndListener.onDownloadComplete(this.mOnlineStorageItem, this.mLocalPath, StorageServiceClient.ProcessError.NONE);
+                    mDownloadEndListener.onDownloadComplete(this.mOnlineStorageItem, mLocalPath, StorageServiceClient.ProcessError.NONE);
                 }
                 }
             } catch (BoxException | IOException unused) {
             } catch (BoxException | IOException unused) {
                 if (this.mCanceled) {
                 if (this.mCanceled) {
-                    this.mDownloadEndListener.onDownloadComplete((StorageItem) null, (String) null, StorageServiceClient.ProcessError.CANCELED);
+                    mDownloadEndListener.onDownloadComplete((StorageItem) null, (String) null, StorageServiceClient.ProcessError.CANCELED);
                 } else {
                 } else {
-                    this.mDownloadEndListener.onDownloadComplete((StorageItem) null, (String) null, StorageServiceClient.ProcessError.ERROR);
+                    mDownloadEndListener.onDownloadComplete((StorageItem) null, (String) null, StorageServiceClient.ProcessError.ERROR);
                 }
                 }
             }
             }
         }
         }
 
 
         public void cancel() {
         public void cancel() {
-            this.mCanceled = true;
+            mCanceled = true;
         }
         }
     }
     }
 
 
@@ -469,18 +469,18 @@ public class BoxNetClient extends StorageServiceClient {
 
 
         private UploadThread(@NonNull BoxNetClient boxNetClient, @NonNull StorageServiceClient.UploadCompletion uploadCompletion, @NonNull String str, @NonNull String str2) {
         private UploadThread(@NonNull BoxNetClient boxNetClient, @NonNull StorageServiceClient.UploadCompletion uploadCompletion, @NonNull String str, @NonNull String str2) {
             super("upload-box");
             super("upload-box");
-            this.mBoxClient = boxNetClient;
-            this.mUploadEndListener = uploadCompletion;
-            this.mOrigLocalFilePath = str;
-            this.mUploadOnlineName = str2;
+            mBoxClient = boxNetClient;
+            mUploadEndListener = uploadCompletion;
+            mOrigLocalFilePath = str;
+            mUploadOnlineName = str2;
         }
         }
 
 
         public void run() {
         public void run() {
             try {
             try {
-                this.mBoxClient.uploadFileToFolder(new File(this.mOrigLocalFilePath), "Epson iPrint", this.mUploadOnlineName);
-                this.mUploadEndListener.onUploadComplete(this.mOrigLocalFilePath, this.mUploadOnlineName, StorageServiceClient.ProcessError.NONE);
+                mBoxClient.uploadFileToFolder(new File(this.mOrigLocalFilePath), "Epson iPrint", mUploadOnlineName);
+                mUploadEndListener.onUploadComplete(this.mOrigLocalFilePath, mUploadOnlineName, StorageServiceClient.ProcessError.NONE);
             } catch (BoxException | IOException unused) {
             } catch (BoxException | IOException unused) {
-                this.mUploadEndListener.onUploadComplete((String) null, (String) null, StorageServiceClient.ProcessError.ERROR);
+                mUploadEndListener.onUploadComplete((String) null, (String) null, StorageServiceClient.ProcessError.ERROR);
             }
             }
         }
         }
     }
     }

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

@@ -34,18 +34,18 @@ public class BoxNetSignInActivity extends StorageSignInActivity implements BoxAu
 
 
     protected void onCreate(Bundle bundle) {
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         super.onCreate(bundle);
-        this.mModeLogout = getMode(getIntent());
+        mModeLogout = getMode(getIntent());
         if (this.mModeLogout) {
         if (this.mModeLogout) {
             setContentView((int) R.layout.storage_progress);
             setContentView((int) R.layout.storage_progress);
             findViewById(R.id.messageText).setVisibility(8);
             findViewById(R.id.messageText).setVisibility(8);
             findViewById(R.id.cancelButton).setVisibility(8);
             findViewById(R.id.cancelButton).setVisibility(8);
         }
         }
-        this.mBoxClient = BoxNetClient.getInstance();
-        this.mBoxClient.setSessionAuthListener(this);
+        mBoxClient = BoxNetClient.getInstance();
+        mBoxClient.setSessionAuthListener(this);
         if (this.mModeLogout) {
         if (this.mModeLogout) {
             startLogoutTask();
             startLogoutTask();
         } else {
         } else {
-            this.mBoxClient.authenticate();
+            mBoxClient.authenticate();
         }
         }
     }
     }
 
 
@@ -60,26 +60,26 @@ public class BoxNetSignInActivity extends StorageSignInActivity implements BoxAu
         if (this.mBoxClient == null) {
         if (this.mBoxClient == null) {
             finish();
             finish();
         }
         }
-        new LogoutTask(this, this.mBoxClient).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
+        new LogoutTask(this, mBoxClient).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
     }
     }
 
 
     public void onRefreshed(BoxAuthentication.BoxAuthenticationInfo boxAuthenticationInfo) {
     public void onRefreshed(BoxAuthentication.BoxAuthenticationInfo boxAuthenticationInfo) {
-        this.mBoxClient.setLoginStatus(true);
+        mBoxClient.setLoginStatus(true);
         finish();
         finish();
     }
     }
 
 
     public void onAuthCreated(BoxAuthentication.BoxAuthenticationInfo boxAuthenticationInfo) {
     public void onAuthCreated(BoxAuthentication.BoxAuthenticationInfo boxAuthenticationInfo) {
-        this.mBoxClient.setLoginStatus(true);
+        mBoxClient.setLoginStatus(true);
         finish();
         finish();
     }
     }
 
 
     public void onAuthFailure(BoxAuthentication.BoxAuthenticationInfo boxAuthenticationInfo, Exception exc) {
     public void onAuthFailure(BoxAuthentication.BoxAuthenticationInfo boxAuthenticationInfo, Exception exc) {
-        this.mBoxClient.setLoginStatus(false);
+        mBoxClient.setLoginStatus(false);
         showLoginErrorAndFinish();
         showLoginErrorAndFinish();
     }
     }
 
 
     public void onLoggedOut(BoxAuthentication.BoxAuthenticationInfo boxAuthenticationInfo, Exception exc) {
     public void onLoggedOut(BoxAuthentication.BoxAuthenticationInfo boxAuthenticationInfo, Exception exc) {
-        this.mBoxClient.setLoginStatus(false);
+        mBoxClient.setLoginStatus(false);
         finish();
         finish();
     }
     }
 
 
@@ -88,12 +88,12 @@ public class BoxNetSignInActivity extends StorageSignInActivity implements BoxAu
         private final BoxNetClient mBoxNetClient;
         private final BoxNetClient mBoxNetClient;
 
 
         LogoutTask(Activity activity, @NonNull BoxNetClient boxNetClient) {
         LogoutTask(Activity activity, @NonNull BoxNetClient boxNetClient) {
-            this.mActivityReference = new WeakReference<>(activity);
-            this.mBoxNetClient = boxNetClient;
+            mActivityReference = new WeakReference<>(activity);
+            mBoxNetClient = boxNetClient;
         }
         }
 
 
         protected Void doInBackground(Void... voidArr) {
         protected Void doInBackground(Void... voidArr) {
-            this.mBoxNetClient.boxLogout();
+            mBoxNetClient.boxLogout();
             return null;
             return null;
         }
         }
     }
     }

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

@@ -150,12 +150,12 @@ public class DropboxV2Client extends StorageServiceClient {
 
 
         DropboxDownloader(Context context, StorageItem storageItem, String str) {
         DropboxDownloader(Context context, StorageItem storageItem, String str) {
             super();
             super();
-            this.mStorageItem = storageItem;
-            this.mWriteFilename = str;
+            mStorageItem = storageItem;
+            mWriteFilename = str;
         }
         }
 
 
         public void start(StorageServiceClient.DownloadCompletion downloadCompletion) {
         public void start(StorageServiceClient.DownloadCompletion downloadCompletion) {
-            new DownloadTask(downloadCompletion).execute(new Object[]{this.mStorageItem, this.mWriteFilename});
+            new DownloadTask(downloadCompletion).execute(new Object[]{this.mStorageItem, mWriteFilename});
         }
         }
     }
     }
 
 
@@ -163,7 +163,7 @@ public class DropboxV2Client extends StorageServiceClient {
         private StorageServiceClient.DownloadCompletion mDownloadCompletion;
         private StorageServiceClient.DownloadCompletion mDownloadCompletion;
 
 
         DownloadTask(@NonNull StorageServiceClient.DownloadCompletion downloadCompletion) {
         DownloadTask(@NonNull StorageServiceClient.DownloadCompletion downloadCompletion) {
-            this.mDownloadCompletion = downloadCompletion;
+            mDownloadCompletion = downloadCompletion;
         }
         }
 
 
         protected Void doInBackground(Object... objArr) {
         protected Void doInBackground(Object... objArr) {
@@ -182,13 +182,13 @@ public class DropboxV2Client extends StorageServiceClient {
                             str = objArr[1];
                             str = objArr[1];
                             try {
                             try {
                                 client.files().download(fileMetadata.getPathLower(), fileMetadata.getRev()).download(new FileOutputStream(new File(str)));
                                 client.files().download(fileMetadata.getPathLower(), fileMetadata.getRev()).download(new FileOutputStream(new File(str)));
-                                this.mDownloadCompletion.onDownloadComplete(storageItem, str, StorageServiceClient.ProcessError.NONE);
+                                mDownloadCompletion.onDownloadComplete(storageItem, str, StorageServiceClient.ProcessError.NONE);
                                 return null;
                                 return null;
                             } catch (DbxException | IOException unused) {
                             } catch (DbxException | IOException unused) {
-                                this.mDownloadCompletion.onDownloadComplete(storageItem, str, StorageServiceClient.ProcessError.ERROR);
+                                mDownloadCompletion.onDownloadComplete(storageItem, str, StorageServiceClient.ProcessError.ERROR);
                                 return null;
                                 return null;
                             } catch (IllegalArgumentException | IllegalStateException unused2) {
                             } catch (IllegalArgumentException | IllegalStateException unused2) {
-                                this.mDownloadCompletion.onDownloadComplete(storageItem, str, StorageServiceClient.ProcessError.ERROR);
+                                mDownloadCompletion.onDownloadComplete(storageItem, str, StorageServiceClient.ProcessError.ERROR);
                                 return null;
                                 return null;
                             }
                             }
                         } else {
                         } else {
@@ -199,22 +199,22 @@ public class DropboxV2Client extends StorageServiceClient {
                     }
                     }
                 } catch (DbxException | IOException unused3) {
                 } catch (DbxException | IOException unused3) {
                     str = null;
                     str = null;
-                    this.mDownloadCompletion.onDownloadComplete(storageItem, str, StorageServiceClient.ProcessError.ERROR);
+                    mDownloadCompletion.onDownloadComplete(storageItem, str, StorageServiceClient.ProcessError.ERROR);
                     return null;
                     return null;
                 } catch (IllegalArgumentException | IllegalStateException unused4) {
                 } catch (IllegalArgumentException | IllegalStateException unused4) {
                     str = null;
                     str = null;
-                    this.mDownloadCompletion.onDownloadComplete(storageItem, str, StorageServiceClient.ProcessError.ERROR);
+                    mDownloadCompletion.onDownloadComplete(storageItem, str, StorageServiceClient.ProcessError.ERROR);
                     return null;
                     return null;
                 }
                 }
             } catch (DbxException | IOException unused5) {
             } catch (DbxException | IOException unused5) {
                 str = null;
                 str = null;
                 storageItem = null;
                 storageItem = null;
-                this.mDownloadCompletion.onDownloadComplete(storageItem, str, StorageServiceClient.ProcessError.ERROR);
+                mDownloadCompletion.onDownloadComplete(storageItem, str, StorageServiceClient.ProcessError.ERROR);
                 return null;
                 return null;
             } catch (IllegalArgumentException | IllegalStateException unused6) {
             } catch (IllegalArgumentException | IllegalStateException unused6) {
                 str = null;
                 str = null;
                 storageItem = null;
                 storageItem = null;
-                this.mDownloadCompletion.onDownloadComplete(storageItem, str, StorageServiceClient.ProcessError.ERROR);
+                mDownloadCompletion.onDownloadComplete(storageItem, str, StorageServiceClient.ProcessError.ERROR);
                 return null;
                 return null;
             }
             }
         }
         }
@@ -230,12 +230,12 @@ public class DropboxV2Client extends StorageServiceClient {
 
 
         V2Uploader(Context context, StorageServiceClient.UploadFileType uploadFileType, String str, String str2) {
         V2Uploader(Context context, StorageServiceClient.UploadFileType uploadFileType, String str, String str2) {
             super();
             super();
-            this.mOrgFilePath = str;
-            this.mUploadPath = str2;
+            mOrgFilePath = str;
+            mUploadPath = str2;
         }
         }
 
 
         public void start(StorageServiceClient.UploadCompletion uploadCompletion) {
         public void start(StorageServiceClient.UploadCompletion uploadCompletion) {
-            AsyncTask.THREAD_POOL_EXECUTOR.execute(new LocalUploader(this.mOrgFilePath, this.mUploadPath, uploadCompletion));
+            AsyncTask.THREAD_POOL_EXECUTOR.execute(new LocalUploader(this.mOrgFilePath, mUploadPath, uploadCompletion));
         }
         }
     }
     }
 
 
@@ -245,9 +245,9 @@ public class DropboxV2Client extends StorageServiceClient {
         private String mUploadFilename;
         private String mUploadFilename;
 
 
         LocalUploader(String str, String str2, @NonNull StorageServiceClient.UploadCompletion uploadCompletion) {
         LocalUploader(String str, String str2, @NonNull StorageServiceClient.UploadCompletion uploadCompletion) {
-            this.mOrgFilePath = str;
-            this.mUploadFilename = str2;
-            this.mNotifier = uploadCompletion;
+            mOrgFilePath = str;
+            mUploadFilename = str2;
+            mNotifier = uploadCompletion;
         }
         }
 
 
         /* JADX WARNING: Can't wrap try/catch for region: R(5:23|22|25|26|(0)(0)) */
         /* JADX WARNING: Can't wrap try/catch for region: R(5:23|22|25|26|(0)(0)) */

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

@@ -28,7 +28,7 @@ public class DropboxV2SignInActivity extends StorageSignInActivity {
         super.onResume();
         super.onResume();
         if (!this.mAuthActivityStarted) {
         if (!this.mAuthActivityStarted) {
             startAuthActivity();
             startAuthActivity();
-            this.mAuthActivityStarted = true;
+            mAuthActivityStarted = true;
             return;
             return;
         }
         }
         new Task().executeOnExecutor(AsyncTask.SERIAL_EXECUTOR, new Void[0]);
         new Task().executeOnExecutor(AsyncTask.SERIAL_EXECUTOR, new Void[0]);

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

@@ -56,7 +56,7 @@ public class EvernoteClient extends StorageServiceClient {
         return new StorageServiceClient.Uploader() {
         return new StorageServiceClient.Uploader() {
             EvernoteRequest request = new EvernoteRequest(context);
             EvernoteRequest request = new EvernoteRequest(context);
             StorageServiceClient.UploadCompletion uploaded;
             StorageServiceClient.UploadCompletion uploaded;
-            EvernoteRequest.UploadHandler uploader = this.request.getUploadHandler();
+            EvernoteRequest.UploadHandler uploader = request.getUploadHandler();
 
 
             public boolean isCancelable() {
             public boolean isCancelable() {
                 return false;
                 return false;
@@ -87,12 +87,12 @@ public class EvernoteClient extends StorageServiceClient {
             }
             }
 
 
             public void start(StorageServiceClient.UploadCompletion uploadCompletion) {
             public void start(StorageServiceClient.UploadCompletion uploadCompletion) {
-                this.uploaded = uploadCompletion;
+                uploaded = uploadCompletion;
                 new UploadTask().executeOnExecutor(new Void[0]);
                 new UploadTask().executeOnExecutor(new Void[0]);
             }
             }
 
 
             public void cancel() {
             public void cancel() {
-                this.uploader.cancel();
+                uploader.cancel();
             }
             }
         };
         };
     }
     }
@@ -100,7 +100,7 @@ public class EvernoteClient extends StorageServiceClient {
     public StorageServiceClient.Downloader getDownloader(final Context context, final StorageItem storageItem, final String str) {
     public StorageServiceClient.Downloader getDownloader(final Context context, final StorageItem storageItem, final String str) {
         return new StorageServiceClient.Downloader() {
         return new StorageServiceClient.Downloader() {
             StorageServiceClient.DownloadCompletion downloaded;
             StorageServiceClient.DownloadCompletion downloaded;
-            EvernoteRequest.DownloadHandler downloader = this.request.getDownloadHandler();
+            EvernoteRequest.DownloadHandler downloader = request.getDownloadHandler();
             EvernoteRequest request = new EvernoteRequest(context);
             EvernoteRequest request = new EvernoteRequest(context);
 
 
             public boolean isCancelable() {
             public boolean isCancelable() {
@@ -128,12 +128,12 @@ public class EvernoteClient extends StorageServiceClient {
             }
             }
 
 
             public void start(StorageServiceClient.DownloadCompletion downloadCompletion) {
             public void start(StorageServiceClient.DownloadCompletion downloadCompletion) {
-                this.downloaded = downloadCompletion;
+                downloaded = downloadCompletion;
                 new DownloadTask().execute(new Void[0]);
                 new DownloadTask().execute(new Void[0]);
             }
             }
 
 
             public void cancel() {
             public void cancel() {
-                this.downloader.cancel();
+                downloader.cancel();
             }
             }
         };
         };
     }
     }
@@ -182,11 +182,11 @@ public class EvernoteClient extends StorageServiceClient {
             }
             }
 
 
             public StorageItem getRootItem() {
             public StorageItem getRootItem() {
-                return this.request.getFeedItem();
+                return request.getFeedItem();
             }
             }
 
 
             public void enumerate(StorageItem storageItem, StorageServiceClient.EnumerateCompletion enumerateCompletion) {
             public void enumerate(StorageItem storageItem, StorageServiceClient.EnumerateCompletion enumerateCompletion) {
-                this.enumerated = enumerateCompletion;
+                enumerated = enumerateCompletion;
                 new EnumerateTask().execute(new StorageItem[]{storageItem});
                 new EnumerateTask().execute(new StorageItem[]{storageItem});
             }
             }
         };
         };

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

@@ -44,7 +44,7 @@ public class EvernoteRequest {
     private Context mContext = null;
     private Context mContext = null;
 
 
     public EvernoteRequest(Context context) {
     public EvernoteRequest(Context context) {
-        this.mContext = context;
+        mContext = context;
     }
     }
 
 
     public StorageItem getFeedItem() {
     public StorageItem getFeedItem() {
@@ -158,11 +158,11 @@ public class EvernoteRequest {
             note.setResources(vector);
             note.setResources(vector);
             note.setContent("<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE en-note SYSTEM \"http://xml.evernote.com/pub/enml2.dtd\"><en-note><p>Epson iPrint scan data:</p><en-media type=\"" + resource.getMime() + "\" hash=\"" + EvernoteRequest.bytesToHex(resource.getData().getBodyHash()) + "\"/>" + "</en-note>");
             note.setContent("<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE en-note SYSTEM \"http://xml.evernote.com/pub/enml2.dtd\"><en-note><p>Epson iPrint scan data:</p><en-media type=\"" + resource.getMime() + "\" hash=\"" + EvernoteRequest.bytesToHex(resource.getData().getBodyHash()) + "\"/>" + "</en-note>");
             evernoteSession.getEvernoteClientFactory().getNoteStoreClient().createNote(note);
             evernoteSession.getEvernoteClientFactory().getNoteStoreClient().createNote(note);
-            return this.canceled ? StorageServiceClient.ProcessError.CANCELED : StorageServiceClient.ProcessError.NONE;
+            return canceled ? StorageServiceClient.ProcessError.CANCELED : StorageServiceClient.ProcessError.NONE;
         }
         }
 
 
         private void cancel() {
         private void cancel() {
-            this.canceled = true;
+            canceled = true;
             EPLog.d(EvernoteRequest.TAG, "Upload Canceled!!");
             EPLog.d(EvernoteRequest.TAG, "Upload Canceled!!");
         }
         }
     }
     }
@@ -184,7 +184,7 @@ public class EvernoteRequest {
                     fileOutputStream.close();
                     fileOutputStream.close();
                 } catch (IOException unused) {
                 } catch (IOException unused) {
                 }
                 }
-                return this.canceled ? StorageServiceClient.ProcessError.CANCELED : StorageServiceClient.ProcessError.NONE;
+                return canceled ? StorageServiceClient.ProcessError.CANCELED : StorageServiceClient.ProcessError.NONE;
             } catch (IOException e) {
             } catch (IOException e) {
                 throw e;
                 throw e;
             } catch (Throwable th) {
             } catch (Throwable th) {
@@ -197,7 +197,7 @@ public class EvernoteRequest {
         }
         }
 
 
         private void cancel() {
         private void cancel() {
-            this.canceled = true;
+            canceled = true;
         }
         }
     }
     }
 
 

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

@@ -19,16 +19,16 @@ public class DownloadFile implements OnlineFile {
     }
     }
 
 
     public DownloadFile(String str, String str2) {
     public DownloadFile(String str, String str2) {
-        this.mName = str;
-        this.mMimeType = str2;
+        mName = str;
+        mMimeType = str2;
     }
     }
 
 
     public String getName() {
     public String getName() {
-        return this.mName;
+        return mName;
     }
     }
 
 
     @Nullable
     @Nullable
     public String getMimeType() {
     public String getMimeType() {
-        return this.mMimeType;
+        return mMimeType;
     }
     }
 }
 }

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

@@ -26,10 +26,10 @@ public class DownloadTask extends AsyncTask<OnlineFile, Void, OnlineFile> implem
     }
     }
 
 
     DownloadTask(@NonNull Context context, @NonNull GoogleDownloader googleDownloader, @NonNull DownloadCompleteListener downloadCompleteListener) {
     DownloadTask(@NonNull Context context, @NonNull GoogleDownloader googleDownloader, @NonNull DownloadCompleteListener downloadCompleteListener) {
-        this.mApplicationContext = context;
-        this.mMyDrive = googleDownloader;
-        this.mDownloadCompleteListener = downloadCompleteListener;
-        this.mDownloadFile = null;
+        mApplicationContext = context;
+        mMyDrive = googleDownloader;
+        mDownloadCompleteListener = downloadCompleteListener;
+        mDownloadFile = null;
     }
     }
 
 
     protected OnlineFile doInBackground(OnlineFile... onlineFileArr) {
     protected OnlineFile doInBackground(OnlineFile... onlineFileArr) {
@@ -40,20 +40,20 @@ public class DownloadTask extends AsyncTask<OnlineFile, Void, OnlineFile> implem
         try {
         try {
             if (!(googleDriveFile instanceof GoogleDriveFile) || !googleDriveFile.isGoogleDocuments()) {
             if (!(googleDriveFile instanceof GoogleDriveFile) || !googleDriveFile.isGoogleDocuments()) {
                 File outFile = getOutFile(this.mApplicationContext, getExtensionFromMimeType((OnlineFile) googleDriveFile));
                 File outFile = getOutFile(this.mApplicationContext, getExtensionFromMimeType((OnlineFile) googleDriveFile));
-                this.mDownloadFile = outFile;
+                mDownloadFile = outFile;
                 if (outFile == null) {
                 if (outFile == null) {
                     return null;
                     return null;
                 }
                 }
-                return this.mMyDrive.downloadFile(googleDriveFile, outFile, this);
+                return mMyDrive.downloadFile(googleDriveFile, outFile, this);
             }
             }
             File outFile2 = getOutFile(this.mApplicationContext, CommonDefine.FileType_PDF);
             File outFile2 = getOutFile(this.mApplicationContext, CommonDefine.FileType_PDF);
-            this.mDownloadFile = outFile2;
+            mDownloadFile = outFile2;
             if (outFile2 == null) {
             if (outFile2 == null) {
                 return null;
                 return null;
             }
             }
-            return this.mMyDrive.downloadPdf(googleDriveFile, outFile2);
+            return mMyDrive.downloadPdf(googleDriveFile, outFile2);
         } catch (Exception e) {
         } catch (Exception e) {
-            this.mThreadException = e;
+            mThreadException = e;
             return null;
             return null;
         }
         }
     }
     }
@@ -76,33 +76,33 @@ public class DownloadTask extends AsyncTask<OnlineFile, Void, OnlineFile> implem
 
 
     protected void onPostExecute(OnlineFile onlineFile) {
     protected void onPostExecute(OnlineFile onlineFile) {
         if (this.mDownloadCancelled) {
         if (this.mDownloadCancelled) {
-            this.mDownloadCompleteListener.onDownloadComplete(false, (String) null);
+            mDownloadCompleteListener.onDownloadComplete(false, (String) null);
         }
         }
         if (onlineFile != null) {
         if (onlineFile != null) {
             String name = onlineFile.getName();
             String name = onlineFile.getName();
             if (name != null) {
             if (name != null) {
-                this.mDownloadCompleteListener.onDownloadComplete(false, name);
+                mDownloadCompleteListener.onDownloadComplete(false, name);
             } else {
             } else {
-                this.mDownloadCompleteListener.onDownloadComplete(true, (String) null);
+                mDownloadCompleteListener.onDownloadComplete(true, (String) null);
             }
             }
         } else {
         } else {
-            Exception exc = this.mThreadException;
+            Exception exc = mThreadException;
             deleteDownloadFile();
             deleteDownloadFile();
-            this.mDownloadCompleteListener.onDownloadComplete(true, (String) null);
+            mDownloadCompleteListener.onDownloadComplete(true, (String) null);
         }
         }
     }
     }
 
 
     protected void onCancelled() {
     protected void onCancelled() {
         deleteDownloadFile();
         deleteDownloadFile();
-        this.mDownloadCompleteListener.onDownloadComplete(false, (String) null);
+        mDownloadCompleteListener.onDownloadComplete(false, (String) null);
     }
     }
 
 
     public boolean canceled() {
     public boolean canceled() {
-        return this.mDownloadCancelled;
+        return mDownloadCancelled;
     }
     }
 
 
     public void cancelTask() {
     public void cancelTask() {
-        this.mDownloadCancelled = true;
+        mDownloadCancelled = true;
         cancel(true);
         cancel(true);
     }
     }
 
 
@@ -132,9 +132,9 @@ public class DownloadTask extends AsyncTask<OnlineFile, Void, OnlineFile> implem
     }
     }
 
 
     public void deleteDownloadFile() {
     public void deleteDownloadFile() {
-        if (this.mDownloadFile != null && this.mDownloadFile.exists()) {
-            this.mDownloadFile.delete();
-            this.mDownloadFile = null;
+        if (this.mDownloadFile != null && mDownloadFile.exists()) {
+            mDownloadFile.delete();
+            mDownloadFile = null;
         }
         }
     }
     }
 }
 }

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

@@ -8,29 +8,29 @@ public class DownloaderWrapper {
     private GoogleDownloader mGoogleDownloader;
     private GoogleDownloader mGoogleDownloader;
 
 
     public boolean createDownloader(@NonNull ActivityWrapper activityWrapper, @NonNull GoogleSignInAccount googleSignInAccount) {
     public boolean createDownloader(@NonNull ActivityWrapper activityWrapper, @NonNull GoogleSignInAccount googleSignInAccount) {
-        this.mGoogleDownloader = GoogleDownloader.createGoogleDownloader(activityWrapper.getActivity(), googleSignInAccount);
-        return this.mGoogleDownloader != null;
+        mGoogleDownloader = GoogleDownloader.createGoogleDownloader(activityWrapper.getActivity(), googleSignInAccount);
+        return mGoogleDownloader != null;
     }
     }
 
 
     public void invalidateDownloader() {
     public void invalidateDownloader() {
-        this.mGoogleDownloader = null;
+        mGoogleDownloader = null;
     }
     }
 
 
     public boolean isDownloadValid() {
     public boolean isDownloadValid() {
-        return this.mGoogleDownloader != null;
+        return mGoogleDownloader != null;
     }
     }
 
 
     public void startDownload(@NonNull ActivityWrapper activityWrapper, @NonNull OnlineFile onlineFile, @NonNull DownloadTask.DownloadCompleteListener downloadCompleteListener) {
     public void startDownload(@NonNull ActivityWrapper activityWrapper, @NonNull OnlineFile onlineFile, @NonNull DownloadTask.DownloadCompleteListener downloadCompleteListener) {
-        GoogleDownloader googleDownloader = this.mGoogleDownloader;
+        GoogleDownloader googleDownloader = mGoogleDownloader;
         if (googleDownloader != null) {
         if (googleDownloader != null) {
-            this.mDownloadTask = googleDownloader.startDownload(activityWrapper, onlineFile, downloadCompleteListener);
+            mDownloadTask = googleDownloader.startDownload(activityWrapper, onlineFile, downloadCompleteListener);
             return;
             return;
         }
         }
         throw new IllegalStateException();
         throw new IllegalStateException();
     }
     }
 
 
     public void startListTask(@Nullable OnlineFile onlineFile, @NonNull DriveListTask.ListTaskCompleteListener listTaskCompleteListener) {
     public void startListTask(@Nullable OnlineFile onlineFile, @NonNull DriveListTask.ListTaskCompleteListener listTaskCompleteListener) {
-        GoogleDownloader googleDownloader = this.mGoogleDownloader;
+        GoogleDownloader googleDownloader = mGoogleDownloader;
         if (googleDownloader != null) {
         if (googleDownloader != null) {
             googleDownloader.startListTask(onlineFile, listTaskCompleteListener);
             googleDownloader.startListTask(onlineFile, listTaskCompleteListener);
             return;
             return;
@@ -39,18 +39,18 @@ public class DownloaderWrapper {
     }
     }
 
 
     public boolean isRootFolder() {
     public boolean isRootFolder() {
-        return this.mGoogleDownloader.isRootFolder();
+        return mGoogleDownloader.isRootFolder();
     }
     }
 
 
     public void cancelDownload() {
     public void cancelDownload() {
-        DownloadTask downloadTask = this.mDownloadTask;
+        DownloadTask downloadTask = mDownloadTask;
         if (downloadTask != null) {
         if (downloadTask != null) {
             downloadTask.cancelTask();
             downloadTask.cancelTask();
         }
         }
     }
     }
 
 
     public void onDownloadPreviewEnd() {
     public void onDownloadPreviewEnd() {
-        DownloadTask downloadTask = this.mDownloadTask;
+        DownloadTask downloadTask = mDownloadTask;
         if (downloadTask != null) {
         if (downloadTask != null) {
             downloadTask.deleteDownloadFile();
             downloadTask.deleteDownloadFile();
         }
         }

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

@@ -15,8 +15,8 @@ public class DriveListTask extends AsyncTask<OnlineFile, Void, ArrayList<OnlineF
     }
     }
 
 
     DriveListTask(@NonNull GoogleDownloader googleDownloader, @NonNull ListTaskCompleteListener listTaskCompleteListener) {
     DriveListTask(@NonNull GoogleDownloader googleDownloader, @NonNull ListTaskCompleteListener listTaskCompleteListener) {
-        this.mMyDrive = googleDownloader;
-        this.mListTaskCompleteListener = listTaskCompleteListener;
+        mMyDrive = googleDownloader;
+        mListTaskCompleteListener = listTaskCompleteListener;
     }
     }
 
 
     protected ArrayList<OnlineFile> doInBackground(OnlineFile... onlineFileArr) {
     protected ArrayList<OnlineFile> doInBackground(OnlineFile... onlineFileArr) {
@@ -24,13 +24,13 @@ public class DriveListTask extends AsyncTask<OnlineFile, Void, ArrayList<OnlineF
             return filterFiles(this.mMyDrive.listFile(onlineFileArr != null ? onlineFileArr[0] : null));
             return filterFiles(this.mMyDrive.listFile(onlineFileArr != null ? onlineFileArr[0] : null));
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
-            this.mException = e;
+            mException = e;
             return null;
             return null;
         }
         }
     }
     }
 
 
     protected void onPostExecute(ArrayList<OnlineFile> arrayList) {
     protected void onPostExecute(ArrayList<OnlineFile> arrayList) {
-        this.mListTaskCompleteListener.listComplete(arrayList);
+        mListTaskCompleteListener.listComplete(arrayList);
     }
     }
 
 
     @NonNull
     @NonNull

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

@@ -36,7 +36,7 @@ public class DriveWriter {
     }
     }
 
 
     public DriveWriter(@NonNull Drive drive) {
     public DriveWriter(@NonNull Drive drive) {
-        this.mDrive = drive;
+        mDrive = drive;
     }
     }
 
 
     public void uploadFileToRoot(@NonNull String str, @NonNull String str2, @NonNull String str3) throws IOException {
     public void uploadFileToRoot(@NonNull String str, @NonNull String str2, @NonNull String str3) throws IOException {
@@ -44,7 +44,7 @@ public class DriveWriter {
     }
     }
 
 
     public String uploadFile(@NonNull String str, @NonNull String str2, @NonNull String str3, @NonNull String str4) throws IOException {
     public String uploadFile(@NonNull String str, @NonNull String str2, @NonNull String str3, @NonNull String str4) throws IOException {
-        return ((File) this.mDrive.files().create(new File().setParents(Collections.singletonList(str4)).setMimeType(str3).setName(str2), new FileContent(str3, new java.io.File(str))).setFields("id, parents, mimeType").execute()).getId();
+        return ((File) mDrive.files().create(new File().setParents(Collections.singletonList(str4)).setMimeType(str3).setName(str2), new FileContent(str3, new java.io.File(str))).setFields("id, parents, mimeType").execute()).getId();
     }
     }
 
 
     @NonNull
     @NonNull
@@ -55,7 +55,7 @@ public class DriveWriter {
         if (str2 == null) {
         if (str2 == null) {
             return Arrays.asList(new String[]{ROOT_ID});
             return Arrays.asList(new String[]{ROOT_ID});
         }
         }
-        List<File> files = ((FileList) this.mDrive.files().list().setQ(String.format(Locale.US, "name = '%s' and '%s' in parents and trashed = false and mimeType contains '%s'", new Object[]{str2, str, GoogleDriveMimeType.MIME_TYPE_GOOGLE_FOLDER})).execute()).getFiles();
+        List<File> files = ((FileList) mDrive.files().list().setQ(String.format(Locale.US, "name = '%s' and '%s' in parents and trashed = false and mimeType contains '%s'", new Object[]{str2, str, GoogleDriveMimeType.MIME_TYPE_GOOGLE_FOLDER})).execute()).getFiles();
         ArrayList arrayList = new ArrayList();
         ArrayList arrayList = new ArrayList();
         for (File id : files) {
         for (File id : files) {
             arrayList.add(id.getId());
             arrayList.add(id.getId());
@@ -64,7 +64,7 @@ public class DriveWriter {
     }
     }
 
 
     public String createFolderInRoot(@NonNull String str) throws IOException {
     public String createFolderInRoot(@NonNull String str) throws IOException {
-        return ((File) this.mDrive.files().create(new File().setName(str).setMimeType(GoogleDriveMimeType.MIME_TYPE_GOOGLE_FOLDER)).setFields("id").execute()).getId();
+        return ((File) mDrive.files().create(new File().setName(str).setMimeType(GoogleDriveMimeType.MIME_TYPE_GOOGLE_FOLDER)).setFields("id").execute()).getId();
     }
     }
 
 
     public void convertFileToPdf(@NonNull String str, @NonNull String str2, @Nullable String str3, @NonNull java.io.File file, ConvertStatusNotifier convertStatusNotifier) throws IOException {
     public void convertFileToPdf(@NonNull String str, @NonNull String str2, @Nullable String str3, @NonNull java.io.File file, ConvertStatusNotifier convertStatusNotifier) throws IOException {
@@ -73,15 +73,15 @@ public class DriveWriter {
         }
         }
         String googleDocsConvertMimeType = getGoogleDocsConvertMimeType(str2);
         String googleDocsConvertMimeType = getGoogleDocsConvertMimeType(str2);
         if (googleDocsConvertMimeType != null) {
         if (googleDocsConvertMimeType != null) {
-            File file2 = (File) this.mDrive.files().create(new File().setParents(Collections.singletonList(str3)).setMimeType(googleDocsConvertMimeType).setName("iprint_convert_tmp.tmp"), new FileContent(str2, new java.io.File(str))).setFields("id, parents").execute();
+            File file2 = (File) mDrive.files().create(new File().setParents(Collections.singletonList(str3)).setMimeType(googleDocsConvertMimeType).setName("iprint_convert_tmp.tmp"), new FileContent(str2, new java.io.File(str))).setFields("id, parents").execute();
             if (convertStatusNotifier != null) {
             if (convertStatusNotifier != null) {
                 convertStatusNotifier.changeStatus(ConvertStatus.DOWNLOAD);
                 convertStatusNotifier.changeStatus(ConvertStatus.DOWNLOAD);
             }
             }
             String id = file2.getId();
             String id = file2.getId();
             try {
             try {
-                this.mDrive.files().export(id, "application/pdf").executeMediaAndDownloadTo(new FileOutputStream(file));
+                mDrive.files().export(id, "application/pdf").executeMediaAndDownloadTo(new FileOutputStream(file));
             } finally {
             } finally {
-                this.mDrive.files().delete(id).execute();
+                mDrive.files().delete(id).execute();
             }
             }
         } else {
         } else {
             throw new ConvertMimeTypeException("mime type <" + str2 + "> not supported");
             throw new ConvertMimeTypeException("mime type <" + str2 + "> not supported");

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

@@ -25,17 +25,17 @@ public class FileListAdapter extends BaseAdapter {
     }
     }
 
 
     public FileListAdapter(@NonNull Context context) {
     public FileListAdapter(@NonNull Context context) {
-        this.mLayoutInflater = LayoutInflater.from(context);
+        mLayoutInflater = LayoutInflater.from(context);
     }
     }
 
 
     @UiThread
     @UiThread
     public void setDriveFile(ArrayList<OnlineFile> arrayList) {
     public void setDriveFile(ArrayList<OnlineFile> arrayList) {
-        this.mDriveFiles = arrayList;
+        mDriveFiles = arrayList;
         notifyDataSetChanged();
         notifyDataSetChanged();
     }
     }
 
 
     public int getCount() {
     public int getCount() {
-        ArrayList<OnlineFile> arrayList = this.mDriveFiles;
+        ArrayList<OnlineFile> arrayList = mDriveFiles;
         if (arrayList == null) {
         if (arrayList == null) {
             return 0;
             return 0;
         }
         }
@@ -43,15 +43,15 @@ public class FileListAdapter extends BaseAdapter {
     }
     }
 
 
     public OnlineFile getDriveItem(int i) {
     public OnlineFile getDriveItem(int i) {
-        return this.mDriveFiles.get(i);
+        return mDriveFiles.get(i);
     }
     }
 
 
     public View getView(int i, View view, ViewGroup viewGroup) {
     public View getView(int i, View view, ViewGroup viewGroup) {
         int i2;
         int i2;
         if (view == null) {
         if (view == null) {
-            view = this.mLayoutInflater.inflate(R.layout.file_list_item, viewGroup, false);
+            view = mLayoutInflater.inflate(R.layout.file_list_item, viewGroup, false);
         }
         }
-        OnlineFile onlineFile = this.mDriveFiles.get(i);
+        OnlineFile onlineFile = mDriveFiles.get(i);
         String name = onlineFile.getName();
         String name = onlineFile.getName();
         int i3 = R.drawable.file;
         int i3 = R.drawable.file;
         if (onlineFile.isFolder()) {
         if (onlineFile.isFolder()) {
@@ -75,7 +75,7 @@ public class FileListAdapter extends BaseAdapter {
     }
     }
 
 
     public void clearItems() {
     public void clearItems() {
-        ArrayList<OnlineFile> arrayList = this.mDriveFiles;
+        ArrayList<OnlineFile> arrayList = mDriveFiles;
         if (arrayList != null) {
         if (arrayList != null) {
             arrayList.clear();
             arrayList.clear();
         }
         }

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

@@ -34,19 +34,19 @@ public class GoogleDownloadPresenter implements GoogleDownloadContract.UserActio
     }
     }
 
 
     public GoogleDownloadPresenter(@NonNull IprintGoogleSignIn iprintGoogleSignIn, @NonNull PlayServiceDialogManager playServiceDialogManager, @NonNull DownloaderWrapper downloaderWrapper, @NonNull Network network, @NonNull GoogleDownloadContract.View view) {
     public GoogleDownloadPresenter(@NonNull IprintGoogleSignIn iprintGoogleSignIn, @NonNull PlayServiceDialogManager playServiceDialogManager, @NonNull DownloaderWrapper downloaderWrapper, @NonNull Network network, @NonNull GoogleDownloadContract.View view) {
-        this.mIprintGoogleSignIn = iprintGoogleSignIn;
-        this.mPlayServiceDialogManager = playServiceDialogManager;
-        this.mGoogleDownloader = downloaderWrapper;
-        this.mMisc = network;
-        this.mDownloadViewReference = new WeakReference<>(view);
-        this.mSignInStatus = SignInState.SIGN_OUT;
-        this.mStartListDone = false;
-        this.mTaskRunning = TaskState.STOP;
+        mIprintGoogleSignIn = iprintGoogleSignIn;
+        mPlayServiceDialogManager = playServiceDialogManager;
+        mGoogleDownloader = downloaderWrapper;
+        mMisc = network;
+        mDownloadViewReference = new WeakReference<>(view);
+        mSignInStatus = SignInState.SIGN_OUT;
+        mStartListDone = false;
+        mTaskRunning = TaskState.STOP;
     }
     }
 
 
     @Nullable
     @Nullable
     private GoogleDownloadContract.View getDownloadView() {
     private GoogleDownloadContract.View getDownloadView() {
-        return (GoogleDownloadContract.View) this.mDownloadViewReference.get();
+        return (GoogleDownloadContract.View) mDownloadViewReference.get();
     }
     }
 
 
     public void initView() {
     public void initView() {
@@ -61,15 +61,15 @@ public class GoogleDownloadPresenter implements GoogleDownloadContract.UserActio
     public void activityOnResume() {
     public void activityOnResume() {
         GoogleDownloadContract.View downloadView = getDownloadView();
         GoogleDownloadContract.View downloadView = getDownloadView();
         if (downloadView != null) {
         if (downloadView != null) {
-            this.mMisc.selectSimpleAp(downloadView.getActivityWrapper(), false);
+            mMisc.selectSimpleAp(downloadView.getActivityWrapper(), false);
             if (!this.mMisc.isOnline(downloadView.getActivityWrapper())) {
             if (!this.mMisc.isOnline(downloadView.getActivityWrapper())) {
                 downloadView.showOfflineErrorDialog();
                 downloadView.showOfflineErrorDialog();
-            } else if (!this.mPlayServiceDialogManager.checkPlayService(downloadView.getActivityWrapper(), this) && this.mTaskRunning == TaskState.STOP) {
+            } else if (!this.mPlayServiceDialogManager.checkPlayService(downloadView.getActivityWrapper(), this) && mTaskRunning == TaskState.STOP) {
                 downloadView.setSignInButtonEnabled(true);
                 downloadView.setSignInButtonEnabled(true);
                 if (this.mIprintGoogleSignIn.isSignInValid(downloadView.getActivityWrapper().getActivity(), IprintGoogleSignIn.OperationType.DOWNLOAD)) {
                 if (this.mIprintGoogleSignIn.isSignInValid(downloadView.getActivityWrapper().getActivity(), IprintGoogleSignIn.OperationType.DOWNLOAD)) {
                     changeSignInStatus(downloadView, SignInState.SIGN_IN);
                     changeSignInStatus(downloadView, SignInState.SIGN_IN);
                     if (!this.mStartListDone) {
                     if (!this.mStartListDone) {
-                        start1stListTask(downloadView, this.mIprintGoogleSignIn.getSignInAccount(downloadView.getActivityWrapper().getActivity()));
+                        start1stListTask(downloadView, mIprintGoogleSignIn.getSignInAccount(downloadView.getActivityWrapper().getActivity()));
                         return;
                         return;
                     }
                     }
                     return;
                     return;
@@ -80,11 +80,11 @@ public class GoogleDownloadPresenter implements GoogleDownloadContract.UserActio
     }
     }
 
 
     public void activityOnPause() {
     public void activityOnPause() {
-        this.mPlayServiceDialogManager.onActivityPaused();
+        mPlayServiceDialogManager.onActivityPaused();
     }
     }
 
 
     public boolean isDownloading() {
     public boolean isDownloading() {
-        return this.mIsDownloading;
+        return mIsDownloading;
     }
     }
 
 
     public void playServiceInstallCancel() {
     public void playServiceInstallCancel() {
@@ -100,9 +100,9 @@ public class GoogleDownloadPresenter implements GoogleDownloadContract.UserActio
         if (downloadView != null) {
         if (downloadView != null) {
             downloadView.setSignInButtonEnabled(false);
             downloadView.setSignInButtonEnabled(false);
             if (this.mSignInStatus == SignInState.SIGN_IN) {
             if (this.mSignInStatus == SignInState.SIGN_IN) {
-                this.mIprintGoogleSignIn.disconnectAccount(downloadView.getActivityWrapper(), this);
+                mIprintGoogleSignIn.disconnectAccount(downloadView.getActivityWrapper(), this);
             } else {
             } else {
-                this.mIprintGoogleSignIn.startSignIn(this, downloadView.getActivityWrapper(), IprintGoogleSignIn.OperationType.DOWNLOAD);
+                mIprintGoogleSignIn.startSignIn(this, downloadView.getActivityWrapper(), IprintGoogleSignIn.OperationType.DOWNLOAD);
             }
             }
         }
         }
     }
     }
@@ -127,14 +127,14 @@ public class GoogleDownloadPresenter implements GoogleDownloadContract.UserActio
     public void onAddScopeCompleted(boolean z) {
     public void onAddScopeCompleted(boolean z) {
         GoogleDownloadContract.View downloadView = getDownloadView();
         GoogleDownloadContract.View downloadView = getDownloadView();
         if (downloadView != null) {
         if (downloadView != null) {
-            onSignInComplete(z, z ? this.mIprintGoogleSignIn.getSignInAccount(downloadView.getActivityWrapper().getActivity()) : null);
+            onSignInComplete(z, z ? mIprintGoogleSignIn.getSignInAccount(downloadView.getActivityWrapper().getActivity()) : null);
         }
         }
     }
     }
 
 
     public void onDisconnectCompleted() {
     public void onDisconnectCompleted() {
         GoogleDownloadContract.View downloadView = getDownloadView();
         GoogleDownloadContract.View downloadView = getDownloadView();
         if (downloadView != null) {
         if (downloadView != null) {
-            this.mGoogleDownloader.invalidateDownloader();
+            mGoogleDownloader.invalidateDownloader();
             changeSignInStatus(downloadView, SignInState.SIGN_OUT);
             changeSignInStatus(downloadView, SignInState.SIGN_OUT);
             downloadView.setSignInButtonEnabled(true);
             downloadView.setSignInButtonEnabled(true);
             downloadView.clearListItems();
             downloadView.clearListItems();
@@ -143,7 +143,7 @@ public class GoogleDownloadPresenter implements GoogleDownloadContract.UserActio
 
 
     private void start1stListTask(GoogleDownloadContract.View view, @Nullable GoogleSignInAccount googleSignInAccount) {
     private void start1stListTask(GoogleDownloadContract.View view, @Nullable GoogleSignInAccount googleSignInAccount) {
         if (googleSignInAccount != null) {
         if (googleSignInAccount != null) {
-            this.mGoogleDownloader.createDownloader(view.getActivityWrapper(), googleSignInAccount);
+            mGoogleDownloader.createDownloader(view.getActivityWrapper(), googleSignInAccount);
             startListTask((OnlineFile) null);
             startListTask((OnlineFile) null);
             return;
             return;
         }
         }
@@ -154,13 +154,13 @@ public class GoogleDownloadPresenter implements GoogleDownloadContract.UserActio
         GoogleDownloadContract.View downloadView = getDownloadView();
         GoogleDownloadContract.View downloadView = getDownloadView();
         if (downloadView != null) {
         if (downloadView != null) {
             onTaskStart(downloadView, TaskType.FILE_LIST);
             onTaskStart(downloadView, TaskType.FILE_LIST);
-            this.mStartListDone = true;
-            this.mGoogleDownloader.startListTask(onlineFile, this);
+            mStartListDone = true;
+            mGoogleDownloader.startListTask(onlineFile, this);
         }
         }
     }
     }
 
 
     private void changeSignInStatus(GoogleDownloadContract.View view, SignInState signInState) {
     private void changeSignInStatus(GoogleDownloadContract.View view, SignInState signInState) {
-        this.mSignInStatus = signInState;
+        mSignInStatus = signInState;
         view.changeSignInOutButton(signInState == SignInState.SIGN_IN ? 1 : 0);
         view.changeSignInOutButton(signInState == SignInState.SIGN_IN ? 1 : 0);
     }
     }
 
 
@@ -181,8 +181,8 @@ public class GoogleDownloadPresenter implements GoogleDownloadContract.UserActio
                 startListTask(onlineFile);
                 startListTask(onlineFile);
             } else {
             } else {
                 onTaskStart(downloadView, TaskType.DOWNLOAD);
                 onTaskStart(downloadView, TaskType.DOWNLOAD);
-                this.mIsDownloading = true;
-                this.mGoogleDownloader.startDownload(downloadView.getActivityWrapper(), onlineFile, this);
+                mIsDownloading = true;
+                mGoogleDownloader.startDownload(downloadView.getActivityWrapper(), onlineFile, this);
             }
             }
         }
         }
     }
     }
@@ -203,16 +203,16 @@ public class GoogleDownloadPresenter implements GoogleDownloadContract.UserActio
     }
     }
 
 
     public void cancelDownload() {
     public void cancelDownload() {
-        this.mGoogleDownloader.cancelDownload();
+        mGoogleDownloader.cancelDownload();
     }
     }
 
 
     public void onPreviewActivityEnd() {
     public void onPreviewActivityEnd() {
-        this.mGoogleDownloader.onDownloadPreviewEnd();
+        mGoogleDownloader.onDownloadPreviewEnd();
     }
     }
 
 
     public void onDownloadComplete(boolean z, @Nullable String str) {
     public void onDownloadComplete(boolean z, @Nullable String str) {
         GoogleDownloadContract.View downloadView = getDownloadView();
         GoogleDownloadContract.View downloadView = getDownloadView();
-        this.mIsDownloading = false;
+        mIsDownloading = false;
         if (downloadView != null) {
         if (downloadView != null) {
             onTaskEnd(downloadView);
             onTaskEnd(downloadView);
             if (str != null) {
             if (str != null) {
@@ -224,13 +224,13 @@ public class GoogleDownloadPresenter implements GoogleDownloadContract.UserActio
     }
     }
 
 
     private void onTaskEnd(GoogleDownloadContract.View view) {
     private void onTaskEnd(GoogleDownloadContract.View view) {
-        this.mTaskRunning = TaskState.STOP;
+        mTaskRunning = TaskState.STOP;
         view.dismissProgress();
         view.dismissProgress();
         view.setSignInButtonEnabled(true);
         view.setSignInButtonEnabled(true);
     }
     }
 
 
     private void onTaskStart(GoogleDownloadContract.View view, TaskType taskType) {
     private void onTaskStart(GoogleDownloadContract.View view, TaskType taskType) {
-        this.mTaskRunning = TaskState.RUNNING;
+        mTaskRunning = TaskState.RUNNING;
         if (taskType == TaskType.DOWNLOAD) {
         if (taskType == TaskType.DOWNLOAD) {
             view.showDownloadProgress();
             view.showDownloadProgress();
         } else {
         } else {

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

@@ -32,7 +32,7 @@ public class GoogleDownloader {
     }
     }
 
 
     private GoogleDownloader(@NonNull Drive drive) {
     private GoogleDownloader(@NonNull Drive drive) {
-        this.mDrive = drive;
+        mDrive = drive;
     }
     }
 
 
     public DownloadTask startDownload(@NonNull ActivityWrapper activityWrapper, @NonNull OnlineFile onlineFile, @NonNull DownloadTask.DownloadCompleteListener downloadCompleteListener) {
     public DownloadTask startDownload(@NonNull ActivityWrapper activityWrapper, @NonNull OnlineFile onlineFile, @NonNull DownloadTask.DownloadCompleteListener downloadCompleteListener) {
@@ -46,7 +46,7 @@ public class GoogleDownloader {
     }
     }
 
 
     public boolean isRootFolder() {
     public boolean isRootFolder() {
-        return this.mFolderManager.isRootFolder();
+        return mFolderManager.isRootFolder();
     }
     }
 
 
     @Nullable
     @Nullable
@@ -56,7 +56,7 @@ public class GoogleDownloader {
         if (id != null) {
         if (id != null) {
             FileOutputStream fileOutputStream = new FileOutputStream(file);
             FileOutputStream fileOutputStream = new FileOutputStream(file);
             try {
             try {
-                this.mDrive.files().export(id, "application/pdf").executeMediaAndDownloadTo(fileOutputStream);
+                mDrive.files().export(id, "application/pdf").executeMediaAndDownloadTo(fileOutputStream);
                 fileOutputStream.close();
                 fileOutputStream.close();
                 return new DownloadFile(file.getPath(), "application/pdf");
                 return new DownloadFile(file.getPath(), "application/pdf");
             } catch (Throwable th2) {
             } catch (Throwable th2) {
@@ -198,9 +198,9 @@ public class GoogleDownloader {
 
 
     @NonNull
     @NonNull
     public ArrayList<OnlineFile> listFile(@Nullable OnlineFile onlineFile) throws IOException {
     public ArrayList<OnlineFile> listFile(@Nullable OnlineFile onlineFile) throws IOException {
-        Drive.Files files = this.mDrive.files();
-        this.mFolderManager.changeCurrentFolder(onlineFile);
-        String currentFolderId = this.mFolderManager.getCurrentFolderId();
+        Drive.Files files = mDrive.files();
+        mFolderManager.changeCurrentFolder(onlineFile);
+        String currentFolderId = mFolderManager.getCurrentFolderId();
         ArrayList<OnlineFile> arrayList = new ArrayList<>();
         ArrayList<OnlineFile> arrayList = new ArrayList<>();
         String str = null;
         String str = null;
         do {
         do {
@@ -220,7 +220,7 @@ public class GoogleDownloader {
     private InputStream getFileInputStream(@NonNull OnlineFile onlineFile) throws IOException {
     private InputStream getFileInputStream(@NonNull OnlineFile onlineFile) throws IOException {
         String id = onlineFile.getId();
         String id = onlineFile.getId();
         if (id != null) {
         if (id != null) {
-            return this.mDrive.files().get(id).executeMediaAsInputStream();
+            return mDrive.files().get(id).executeMediaAsInputStream();
         }
         }
         throw new IOException("getId() return null");
         throw new IOException("getId() return null");
     }
     }
@@ -240,35 +240,35 @@ public class GoogleDownloader {
                 gotoParent();
                 gotoParent();
                 return;
                 return;
             }
             }
-            OnlineFile onlineFile2 = this.mCurrentFolder;
+            OnlineFile onlineFile2 = mCurrentFolder;
             if (onlineFile2 != null) {
             if (onlineFile2 != null) {
-                this.mParentDirList.push(onlineFile2);
+                mParentDirList.push(onlineFile2);
             }
             }
-            this.mCurrentFolder = onlineFile;
+            mCurrentFolder = onlineFile;
         }
         }
 
 
         private void gotoRoot() {
         private void gotoRoot() {
-            this.mParentDirList.clear();
-            this.mCurrentFolder = null;
+            mParentDirList.clear();
+            mCurrentFolder = null;
         }
         }
 
 
         private void gotoParent() {
         private void gotoParent() {
             if (this.mParentDirList.isEmpty()) {
             if (this.mParentDirList.isEmpty()) {
-                this.mCurrentFolder = null;
+                mCurrentFolder = null;
                 gotoRoot();
                 gotoRoot();
                 return;
                 return;
             }
             }
-            OnlineFile pop = this.mParentDirList.pop();
+            OnlineFile pop = mParentDirList.pop();
             if (pop == null) {
             if (pop == null) {
                 gotoRoot();
                 gotoRoot();
                 return;
                 return;
             }
             }
-            this.mCurrentFolder = pop;
-            this.mCurrentFolder.getId();
+            mCurrentFolder = pop;
+            mCurrentFolder.getId();
         }
         }
 
 
         private String getCurrentFolderId() {
         private String getCurrentFolderId() {
-            OnlineFile onlineFile = this.mCurrentFolder;
+            OnlineFile onlineFile = mCurrentFolder;
             if (onlineFile == null) {
             if (onlineFile == null) {
                 return GoogleDownloader.ROOT_ID;
                 return GoogleDownloader.ROOT_ID;
             }
             }
@@ -276,7 +276,7 @@ public class GoogleDownloader {
         }
         }
 
 
         private boolean isRootFolder() {
         private boolean isRootFolder() {
-            return this.mCurrentFolder == null;
+            return mCurrentFolder == null;
         }
         }
     }
     }
 }
 }

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

@@ -11,11 +11,11 @@ public class GoogleDriveFile implements OnlineFile {
     private final File mDriveFile;
     private final File mDriveFile;
 
 
     public GoogleDriveFile(@NonNull File file) {
     public GoogleDriveFile(@NonNull File file) {
-        this.mDriveFile = file;
+        mDriveFile = file;
     }
     }
 
 
     public String getName() {
     public String getName() {
-        return this.mDriveFile.getName();
+        return mDriveFile.getName();
     }
     }
 
 
     public boolean isFolder() {
     public boolean isFolder() {
@@ -24,11 +24,11 @@ public class GoogleDriveFile implements OnlineFile {
 
 
     @Nullable
     @Nullable
     public String getId() {
     public String getId() {
-        return this.mDriveFile.getId();
+        return mDriveFile.getId();
     }
     }
 
 
     public String getMimeType() {
     public String getMimeType() {
-        return this.mDriveFile.getMimeType();
+        return mDriveFile.getMimeType();
     }
     }
 
 
     public boolean isDisplayFile() {
     public boolean isDisplayFile() {
@@ -58,7 +58,7 @@ public class GoogleDriveFile implements OnlineFile {
     }
     }
 
 
     private boolean localGetTrashed() {
     private boolean localGetTrashed() {
-        Boolean trashed = this.mDriveFile.getTrashed();
+        Boolean trashed = mDriveFile.getTrashed();
         return trashed != null && trashed.booleanValue();
         return trashed != null && trashed.booleanValue();
     }
     }
 
 

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

@@ -47,7 +47,7 @@ public class GoogleV3UploadClient extends StorageServiceClient {
         if (!isCheckSignIn()) {
         if (!isCheckSignIn()) {
             return false;
             return false;
         }
         }
-        return this.mIprintGoogleSignIn.isSignInValid(context, IprintGoogleSignIn.OperationType.UPLOAD);
+        return mIprintGoogleSignIn.isSignInValid(context, IprintGoogleSignIn.OperationType.UPLOAD);
     }
     }
 
 
     public boolean revokeSignedInData(Activity activity) {
     public boolean revokeSignedInData(Activity activity) {
@@ -69,8 +69,8 @@ public class GoogleV3UploadClient extends StorageServiceClient {
 
 
         public GoogleV3Uploader(Context context, @NonNull UploadInfo uploadInfo) {
         public GoogleV3Uploader(Context context, @NonNull UploadInfo uploadInfo) {
             super();
             super();
-            this.mContext = context.getApplicationContext();
-            this.mUploadInfo = uploadInfo;
+            mContext = context.getApplicationContext();
+            mUploadInfo = uploadInfo;
         }
         }
 
 
         public void start(StorageServiceClient.UploadCompletion uploadCompletion) {
         public void start(StorageServiceClient.UploadCompletion uploadCompletion) {
@@ -83,13 +83,13 @@ public class GoogleV3UploadClient extends StorageServiceClient {
         private final StorageServiceClient.UploadCompletion mUploadNotifier;
         private final StorageServiceClient.UploadCompletion mUploadNotifier;
 
 
         UploadTask(Context context, StorageServiceClient.UploadCompletion uploadCompletion) {
         UploadTask(Context context, StorageServiceClient.UploadCompletion uploadCompletion) {
-            this.mContext = context;
-            this.mUploadNotifier = uploadCompletion;
+            mContext = context;
+            mUploadNotifier = uploadCompletion;
         }
         }
 
 
         protected Void doInBackground(UploadInfo... uploadInfoArr) {
         protected Void doInBackground(UploadInfo... uploadInfoArr) {
             if (uploadInfoArr == null || uploadInfoArr[0] == null) {
             if (uploadInfoArr == null || uploadInfoArr[0] == null) {
-                this.mUploadNotifier.onUploadComplete((String) null, (String) null, StorageServiceClient.ProcessError.ERROR);
+                mUploadNotifier.onUploadComplete((String) null, (String) null, StorageServiceClient.ProcessError.ERROR);
                 return null;
                 return null;
             }
             }
             UploadInfo uploadInfo = uploadInfoArr[0];
             UploadInfo uploadInfo = uploadInfoArr[0];
@@ -105,7 +105,7 @@ public class GoogleV3UploadClient extends StorageServiceClient {
         }
         }
 
 
         private void notifyUploadEnd(UploadInfo uploadInfo, StorageServiceClient.ProcessError processError) {
         private void notifyUploadEnd(UploadInfo uploadInfo, StorageServiceClient.ProcessError processError) {
-            StorageServiceClient.UploadCompletion uploadCompletion = this.mUploadNotifier;
+            StorageServiceClient.UploadCompletion uploadCompletion = mUploadNotifier;
             if (uploadCompletion != null) {
             if (uploadCompletion != null) {
                 uploadCompletion.onUploadComplete(uploadInfo.originalLocalPath, uploadInfo.uploadFilename, processError);
                 uploadCompletion.onUploadComplete(uploadInfo.originalLocalPath, uploadInfo.uploadFilename, processError);
             }
             }
@@ -118,9 +118,9 @@ public class GoogleV3UploadClient extends StorageServiceClient {
         String uploadFilename;
         String uploadFilename;
 
 
         public UploadInfo(@NonNull StorageServiceClient.UploadFileType uploadFileType, @NonNull String str, @NonNull String str2) {
         public UploadInfo(@NonNull StorageServiceClient.UploadFileType uploadFileType, @NonNull String str, @NonNull String str2) {
-            this.fileType = uploadFileType;
-            this.originalLocalPath = str;
-            this.uploadFilename = str2;
+            fileType = uploadFileType;
+            originalLocalPath = str;
+            uploadFilename = str2;
         }
         }
     }
     }
 }
 }

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

@@ -63,20 +63,20 @@ public class GoogleV3UploadSignInActivity extends AppCompatActivity implements A
 
 
     protected void onCreate(Bundle bundle) {
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         super.onCreate(bundle);
-        this.mPlayServiceDialogManager = new PlayServiceDialogManager();
-        this.mMisc = new Network();
-        this.mIprintGoogleSignIn = new IprintGoogleSignIn();
-        this.mWaitSingInProcess = false;
-        this.mActivityForeground = false;
-        this.mForegroundRunnableList = new LinkedList<>();
+        mPlayServiceDialogManager = new PlayServiceDialogManager();
+        mMisc = new Network();
+        mIprintGoogleSignIn = new IprintGoogleSignIn();
+        mWaitSingInProcess = false;
+        mActivityForeground = false;
+        mForegroundRunnableList = new LinkedList<>();
         Intent intent = getIntent();
         Intent intent = getIntent();
-        this.mStartForDisconnect = intent.getBooleanExtra(PARAM_KEY_FOR_DISCONNECT, false);
-        this.mCheckServiceOnly = intent.getBooleanExtra(PARAM_KEY_CHECK_SERVICE_ONLY, false);
+        mStartForDisconnect = intent.getBooleanExtra(PARAM_KEY_FOR_DISCONNECT, false);
+        mCheckServiceOnly = intent.getBooleanExtra(PARAM_KEY_CHECK_SERVICE_ONLY, false);
     }
     }
 
 
     private void showErrorDialog(final int i, final String str) {
     private void showErrorDialog(final int i, final String str) {
         if (!this.mActivityForeground) {
         if (!this.mActivityForeground) {
-            this.mForegroundRunnableList.addLast(new Runnable() {
+            mForegroundRunnableList.addLast(new Runnable() {
                 public void run() {
                 public void run() {
                     GoogleV3UploadSignInActivity.this.showErrorDialog(i, str);
                     GoogleV3UploadSignInActivity.this.showErrorDialog(i, str);
                 }
                 }
@@ -88,8 +88,8 @@ public class GoogleV3UploadSignInActivity extends AppCompatActivity implements A
 
 
     protected void onPostResume() {
     protected void onPostResume() {
         super.onPostResume();
         super.onPostResume();
-        this.mMisc.selectSimpleAp(this, false);
-        this.mActivityForeground = true;
+        mMisc.selectSimpleAp(this, false);
+        mActivityForeground = true;
         processForegroundList();
         processForegroundList();
         if (!this.mMisc.isOnline(this)) {
         if (!this.mMisc.isOnline(this)) {
             showErrorDialog(R.string.network_error_mes, DIALOG_TAG_OFFLINE_ERROR);
             showErrorDialog(R.string.network_error_mes, DIALOG_TAG_OFFLINE_ERROR);
@@ -97,18 +97,18 @@ public class GoogleV3UploadSignInActivity extends AppCompatActivity implements A
             if (this.mCheckServiceOnly) {
             if (this.mCheckServiceOnly) {
                 finishWithResult(true);
                 finishWithResult(true);
             } else if (!this.mWaitSingInProcess) {
             } else if (!this.mWaitSingInProcess) {
-                this.mWaitSingInProcess = true;
+                mWaitSingInProcess = true;
                 if (this.mStartForDisconnect) {
                 if (this.mStartForDisconnect) {
-                    this.mIprintGoogleSignIn.disconnectAccount(this, this);
+                    mIprintGoogleSignIn.disconnectAccount(this, this);
                 } else {
                 } else {
-                    this.mIprintGoogleSignIn.startSignIn(this, this, IprintGoogleSignIn.OperationType.UPLOAD);
+                    mIprintGoogleSignIn.startSignIn(this, this, IprintGoogleSignIn.OperationType.UPLOAD);
                 }
                 }
             }
             }
         }
         }
     }
     }
 
 
     private void processForegroundList() {
     private void processForegroundList() {
-        Iterator it = this.mForegroundRunnableList.iterator();
+        Iterator it = mForegroundRunnableList.iterator();
         while (it.hasNext()) {
         while (it.hasNext()) {
             it.remove();
             it.remove();
             ((Runnable) it.next()).run();
             ((Runnable) it.next()).run();
@@ -117,12 +117,12 @@ public class GoogleV3UploadSignInActivity extends AppCompatActivity implements A
 
 
     protected void onPause() {
     protected void onPause() {
         super.onPause();
         super.onPause();
-        this.mPlayServiceDialogManager.onActivityPaused();
-        this.mActivityForeground = false;
+        mPlayServiceDialogManager.onActivityPaused();
+        mActivityForeground = false;
     }
     }
 
 
     public void requestSignIn(@NonNull Intent intent, @NonNull IprintGoogleSignIn.StartActivityResultCallback startActivityResultCallback) {
     public void requestSignIn(@NonNull Intent intent, @NonNull IprintGoogleSignIn.StartActivityResultCallback startActivityResultCallback) {
-        this.mSignInStartActivityCallback = startActivityResultCallback;
+        mSignInStartActivityCallback = startActivityResultCallback;
         startActivityForResult(intent, 10);
         startActivityForResult(intent, 10);
     }
     }
 
 
@@ -162,10 +162,10 @@ public class GoogleV3UploadSignInActivity extends AppCompatActivity implements A
     protected void onActivityResult(int i, int i2, Intent intent) {
     protected void onActivityResult(int i, int i2, Intent intent) {
         switch (i) {
         switch (i) {
             case 10:
             case 10:
-                IprintGoogleSignIn.StartActivityResultCallback startActivityResultCallback = this.mSignInStartActivityCallback;
+                IprintGoogleSignIn.StartActivityResultCallback startActivityResultCallback = mSignInStartActivityCallback;
                 if (startActivityResultCallback != null) {
                 if (startActivityResultCallback != null) {
                     startActivityResultCallback.onActivityResult(i2, intent);
                     startActivityResultCallback.onActivityResult(i2, intent);
-                    this.mSignInStartActivityCallback = null;
+                    mSignInStartActivityCallback = null;
                     return;
                     return;
                 }
                 }
                 return;
                 return;

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

@@ -70,27 +70,27 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         super.onCreate(bundle);
         super.onCreate(bundle);
         setContentView((int) R.layout.activity_list_and_download);
         setContentView((int) R.layout.activity_list_and_download);
         setActionBar(getString(R.string.google_drive), true);
         setActionBar(getString(R.string.google_drive), true);
-        this.mGoogleDownloadPresenter = Injection.provideDownloadPresenter(this);
-        this.mSignInOutButtonEnabled = true;
-        this.mForegroundRunnableList = new LinkedList<>();
-        this.mListView = (ListView) findViewById(16908298);
-        this.mListView.setCacheColorHint(0);
-        this.mFileListAdapter = new FileListAdapter(getApplicationContext());
-        this.mListView.setAdapter(this.mFileListAdapter);
-        this.mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+        mGoogleDownloadPresenter = Injection.provideDownloadPresenter(this);
+        mSignInOutButtonEnabled = true;
+        mForegroundRunnableList = new LinkedList<>();
+        mListView = (ListView) findViewById(16908298);
+        mListView.setCacheColorHint(0);
+        mFileListAdapter = new FileListAdapter(getApplicationContext());
+        mListView.setAdapter(this.mFileListAdapter);
+        mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
                 int unused = ListAndDownloadActivity.this.mPosition = i;
                 int unused = ListAndDownloadActivity.this.mPosition = i;
                 ListAndDownloadActivity.this.localOnItemClick(i);
                 ListAndDownloadActivity.this.localOnItemClick(i);
             }
             }
         });
         });
-        this.mSignInMessage = (TextView) findViewById(16908292);
-        this.mSignInMessage.setText(R.string.sign_in_request);
-        this.mSignInMessage.setTypeface((Typeface) null, 1);
-        this.mSignInMessage.setTextSize(18.0f);
+        mSignInMessage = (TextView) findViewById(16908292);
+        mSignInMessage.setText(R.string.sign_in_request);
+        mSignInMessage.setTypeface((Typeface) null, 1);
+        mSignInMessage.setTextSize(18.0f);
         if (bundle != null) {
         if (bundle != null) {
             clearFragments();
             clearFragments();
         }
         }
-        this.mGoogleDownloadPresenter.initView();
+        mGoogleDownloadPresenter.initView();
     }
     }
 
 
     private void clearFragments() {
     private void clearFragments() {
@@ -106,7 +106,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
 
 
     private void dismissDialog(@NonNull final String str) {
     private void dismissDialog(@NonNull final String str) {
         if (!this.mActivityForeground) {
         if (!this.mActivityForeground) {
-            this.mForegroundRunnableList.addLast(new Runnable() {
+            mForegroundRunnableList.addLast(new Runnable() {
                 public void run() {
                 public void run() {
                     ListAndDownloadActivity.this.dismissDialog(str);
                     ListAndDownloadActivity.this.dismissDialog(str);
                 }
                 }
@@ -120,19 +120,19 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
     }
     }
 
 
     private void localOnItemClick(int i) {
     private void localOnItemClick(int i) {
-        OnlineFile driveItem = this.mFileListAdapter.getDriveItem(i);
+        OnlineFile driveItem = mFileListAdapter.getDriveItem(i);
         if (driveItem != null) {
         if (driveItem != null) {
-            this.mGoogleDownloadPresenter.itemSelected(driveItem);
+            mGoogleDownloadPresenter.itemSelected(driveItem);
         }
         }
     }
     }
 
 
     public boolean onOptionsItemSelected(MenuItem menuItem) {
     public boolean onOptionsItemSelected(MenuItem menuItem) {
         switch (menuItem.getItemId()) {
         switch (menuItem.getItemId()) {
             case R.id.menu_signin /*2131231253*/:
             case R.id.menu_signin /*2131231253*/:
-                this.mGoogleDownloadPresenter.signInOrDisconnectClicked();
+                mGoogleDownloadPresenter.signInOrDisconnectClicked();
                 return true;
                 return true;
             case R.id.menu_signout /*2131231254*/:
             case R.id.menu_signout /*2131231254*/:
-                this.mGoogleDownloadPresenter.signInOrDisconnectClicked();
+                mGoogleDownloadPresenter.signInOrDisconnectClicked();
                 return true;
                 return true;
             default:
             default:
                 return super.onOptionsItemSelected(menuItem);
                 return super.onOptionsItemSelected(menuItem);
@@ -154,20 +154,20 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
     protected void onActivityResult(int i, int i2, Intent intent) {
     protected void onActivityResult(int i, int i2, Intent intent) {
         switch (i) {
         switch (i) {
             case 10:
             case 10:
-                IprintGoogleSignIn.StartActivityResultCallback startActivityResultCallback = this.mSignInStartActivityCallback;
+                IprintGoogleSignIn.StartActivityResultCallback startActivityResultCallback = mSignInStartActivityCallback;
                 if (startActivityResultCallback != null) {
                 if (startActivityResultCallback != null) {
                     startActivityResultCallback.onActivityResult(i2, intent);
                     startActivityResultCallback.onActivityResult(i2, intent);
-                    this.mSignInStartActivityCallback = null;
+                    mSignInStartActivityCallback = null;
                     return;
                     return;
                 }
                 }
                 return;
                 return;
             case 11:
             case 11:
                 return;
                 return;
             case 12:
             case 12:
-                this.mGoogleDownloadPresenter.onPreviewActivityEnd();
+                mGoogleDownloadPresenter.onPreviewActivityEnd();
                 return;
                 return;
             case 13:
             case 13:
-                this.mGoogleDownloadPresenter.onAddScopeCompleted(i2 == -1);
+                mGoogleDownloadPresenter.onAddScopeCompleted(i2 == -1);
                 return;
                 return;
             default:
             default:
                 return;
                 return;
@@ -176,13 +176,13 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
 
 
     protected void onPostResume() {
     protected void onPostResume() {
         super.onPostResume();
         super.onPostResume();
-        this.mActivityForeground = true;
+        mActivityForeground = true;
         processForegroundList();
         processForegroundList();
-        this.mGoogleDownloadPresenter.activityOnResume();
+        mGoogleDownloadPresenter.activityOnResume();
     }
     }
 
 
     private void processForegroundList() {
     private void processForegroundList() {
-        Iterator it = this.mForegroundRunnableList.iterator();
+        Iterator it = mForegroundRunnableList.iterator();
         while (it.hasNext()) {
         while (it.hasNext()) {
             it.remove();
             it.remove();
             ((Runnable) it.next()).run();
             ((Runnable) it.next()).run();
@@ -191,16 +191,16 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
 
 
     protected void onPause() {
     protected void onPause() {
         super.onPause();
         super.onPause();
-        this.mGoogleDownloadPresenter.activityOnPause();
-        this.mActivityForeground = false;
+        mGoogleDownloadPresenter.activityOnPause();
+        mActivityForeground = false;
     }
     }
 
 
     public void onBackPressed() {
     public void onBackPressed() {
-        this.mGoogleDownloadPresenter.backKeyPressed();
+        mGoogleDownloadPresenter.backKeyPressed();
     }
     }
 
 
     public void requestSignIn(@NonNull Intent intent, @NonNull IprintGoogleSignIn.StartActivityResultCallback startActivityResultCallback) {
     public void requestSignIn(@NonNull Intent intent, @NonNull IprintGoogleSignIn.StartActivityResultCallback startActivityResultCallback) {
-        this.mSignInStartActivityCallback = startActivityResultCallback;
+        mSignInStartActivityCallback = startActivityResultCallback;
         startActivityForResult(intent, 10);
         startActivityForResult(intent, 10);
     }
     }
 
 
@@ -210,19 +210,19 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
 
 
     public void changeSignInOutButton(int i) {
     public void changeSignInOutButton(int i) {
         int i2 = 0;
         int i2 = 0;
-        this.mSignInMessage.setVisibility(i == 0 ? 0 : 8);
-        ListView listView = this.mListView;
+        mSignInMessage.setVisibility(i == 0 ? 0 : 8);
+        ListView listView = mListView;
         if (i == 0) {
         if (i == 0) {
             i2 = 8;
             i2 = 8;
         }
         }
         listView.setVisibility(i2);
         listView.setVisibility(i2);
-        this.mSignInOutButtonType = i;
+        mSignInOutButtonType = i;
         invalidateOptionsMenu();
         invalidateOptionsMenu();
     }
     }
 
 
     private void showErrorDialog(final int i, final String str) {
     private void showErrorDialog(final int i, final String str) {
         if (!this.mActivityForeground) {
         if (!this.mActivityForeground) {
-            this.mForegroundRunnableList.addLast(new Runnable() {
+            mForegroundRunnableList.addLast(new Runnable() {
                 public void run() {
                 public void run() {
                     ListAndDownloadActivity.this.showErrorDialog(i, str);
                     ListAndDownloadActivity.this.showErrorDialog(i, str);
                 }
                 }
@@ -245,18 +245,18 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
     }
     }
 
 
     public void clearListItems() {
     public void clearListItems() {
-        this.mFileListAdapter.clearItems();
+        mFileListAdapter.clearItems();
     }
     }
 
 
     public void showProgress() {
     public void showProgress() {
-        this.mSignInOutButtonEnabled = false;
+        mSignInOutButtonEnabled = false;
         invalidateOptionsMenu();
         invalidateOptionsMenu();
         showProgressFragment(false, 0);
         showProgressFragment(false, 0);
     }
     }
 
 
     private void showProgressFragment(final boolean z, final int i) {
     private void showProgressFragment(final boolean z, final int i) {
         if (!this.mActivityForeground) {
         if (!this.mActivityForeground) {
-            this.mForegroundRunnableList.addLast(new Runnable() {
+            mForegroundRunnableList.addLast(new Runnable() {
                 public void run() {
                 public void run() {
                     ListAndDownloadActivity.this.showProgressFragment(z, i);
                     ListAndDownloadActivity.this.showProgressFragment(z, i);
                 }
                 }
@@ -268,7 +268,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
     }
     }
 
 
     public void showDownloadProgress() {
     public void showDownloadProgress() {
-        this.mSignInOutButtonEnabled = false;
+        mSignInOutButtonEnabled = false;
         invalidateOptionsMenu();
         invalidateOptionsMenu();
         showProgressFragment(true, R.string.downloading_notification);
         showProgressFragment(true, R.string.downloading_notification);
     }
     }
@@ -276,7 +276,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
     public void dismissProgress() {
     public void dismissProgress() {
         dismissDialog(DIALOG_TAG_CONFIRM_CANCEL);
         dismissDialog(DIALOG_TAG_CONFIRM_CANCEL);
         removeProgressIfExists();
         removeProgressIfExists();
-        this.mSignInOutButtonEnabled = true;
+        mSignInOutButtonEnabled = true;
         invalidateOptionsMenu();
         invalidateOptionsMenu();
     }
     }
 
 
@@ -286,7 +286,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
             showErrorDialog(R.string.unknow_error_mes, DIALOG_TAG_DOWNLOAD_FAILED);
             showErrorDialog(R.string.unknow_error_mes, DIALOG_TAG_DOWNLOAD_FAILED);
             return;
             return;
         }
         }
-        this.mFileListAdapter.setDriveFile(arrayList);
+        mFileListAdapter.setDriveFile(arrayList);
     }
     }
 
 
     public void startPreviewActivity(String str) {
     public void startPreviewActivity(String str) {
@@ -328,16 +328,16 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
     }
     }
 
 
     public void cancel() {
     public void cancel() {
-        this.mGoogleDownloadPresenter.cancelDownload();
+        mGoogleDownloadPresenter.cancelDownload();
     }
     }
 
 
     protected void onStop() {
     protected void onStop() {
         super.onStop();
         super.onStop();
         if (!this.mGoogleDownloadPresenter.isDownloading() || Build.VERSION.SDK_INT < 29) {
         if (!this.mGoogleDownloadPresenter.isDownloading() || Build.VERSION.SDK_INT < 29) {
-            this.mIsDownloadInterruption = false;
+            mIsDownloadInterruption = false;
             return;
             return;
         }
         }
-        this.mIsDownloadInterruption = true;
+        mIsDownloadInterruption = true;
         cancel();
         cancel();
     }
     }
 
 
@@ -346,12 +346,12 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         if (this.mIsDownloadInterruption) {
         if (this.mIsDownloadInterruption) {
             localOnItemClick(this.mPosition);
             localOnItemClick(this.mPosition);
         }
         }
-        this.mIsDownloadInterruption = false;
+        mIsDownloadInterruption = false;
     }
     }
 
 
     private void removeProgressIfExists() {
     private void removeProgressIfExists() {
         if (!this.mActivityForeground) {
         if (!this.mActivityForeground) {
-            this.mForegroundRunnableList.addLast(new Runnable() {
+            mForegroundRunnableList.addLast(new Runnable() {
                 public void run() {
                 public void run() {
                     ListAndDownloadActivity.this.removeProgressIfExists();
                     ListAndDownloadActivity.this.removeProgressIfExists();
                 }
                 }

+ 6 - 6
app/src/main/java/com/epson/iprint/storage/gdrivev3/PlayServiceDialogManager.java

@@ -14,9 +14,9 @@ public class PlayServiceDialogManager {
     }
     }
 
 
     private boolean checkPlayService(@NonNull Activity activity, int i, @NonNull final SingInCancelNotifier singInCancelNotifier) {
     private boolean checkPlayService(@NonNull Activity activity, int i, @NonNull final SingInCancelNotifier singInCancelNotifier) {
-        Dialog dialog = this.mGooglePlayServiceDialog;
+        Dialog dialog = mGooglePlayServiceDialog;
         if (dialog != null && dialog.isShowing()) {
         if (dialog != null && dialog.isShowing()) {
-            this.mGooglePlayServiceDialog.dismiss();
+            mGooglePlayServiceDialog.dismiss();
         }
         }
         GoogleApiAvailability instance = GoogleApiAvailability.getInstance();
         GoogleApiAvailability instance = GoogleApiAvailability.getInstance();
         int isGooglePlayServicesAvailable = instance.isGooglePlayServicesAvailable(activity);
         int isGooglePlayServicesAvailable = instance.isGooglePlayServicesAvailable(activity);
@@ -24,12 +24,12 @@ public class PlayServiceDialogManager {
             return false;
             return false;
         }
         }
         if (instance.isUserResolvableError(isGooglePlayServicesAvailable)) {
         if (instance.isUserResolvableError(isGooglePlayServicesAvailable)) {
-            this.mGooglePlayServiceDialog = instance.getErrorDialog(activity, isGooglePlayServicesAvailable, i, new DialogInterface.OnCancelListener() {
+            mGooglePlayServiceDialog = instance.getErrorDialog(activity, isGooglePlayServicesAvailable, i, new DialogInterface.OnCancelListener() {
                 public void onCancel(DialogInterface dialogInterface) {
                 public void onCancel(DialogInterface dialogInterface) {
                     singInCancelNotifier.playServiceInstallCancel();
                     singInCancelNotifier.playServiceInstallCancel();
                 }
                 }
             });
             });
-            this.mGooglePlayServiceDialog.show();
+            mGooglePlayServiceDialog.show();
             return true;
             return true;
         }
         }
         singInCancelNotifier.playServiceInstallCancel();
         singInCancelNotifier.playServiceInstallCancel();
@@ -41,9 +41,9 @@ public class PlayServiceDialogManager {
     }
     }
 
 
     public void onActivityPaused() {
     public void onActivityPaused() {
-        Dialog dialog = this.mGooglePlayServiceDialog;
+        Dialog dialog = mGooglePlayServiceDialog;
         if (dialog != null && dialog.isShowing()) {
         if (dialog != null && dialog.isShowing()) {
-            this.mGooglePlayServiceDialog.dismiss();
+            mGooglePlayServiceDialog.dismiss();
         }
         }
     }
     }
 }
 }

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

@@ -64,11 +64,11 @@ public class OneDriveClient extends StorageServiceClient {
     }
     }
 
 
     public StorageServiceClient.ProcessError getUploadProcessError() {
     public StorageServiceClient.ProcessError getUploadProcessError() {
-        return this.mUploadProcessError;
+        return mUploadProcessError;
     }
     }
 
 
     public void resetUploadProcessError() {
     public void resetUploadProcessError() {
-        this.mUploadProcessError = StorageServiceClient.ProcessError.NONE;
+        mUploadProcessError = StorageServiceClient.ProcessError.NONE;
     }
     }
 
 
     public StorageServiceClient.Uploader getUploader(Context context, StorageServiceClient.UploadFileType uploadFileType, String str, String str2) {
     public StorageServiceClient.Uploader getUploader(Context context, StorageServiceClient.UploadFileType uploadFileType, String str, String str2) {
@@ -118,7 +118,7 @@ public class OneDriveClient extends StorageServiceClient {
 
 
     public boolean revokeSignedInData(Activity activity) {
     public boolean revokeSignedInData(Activity activity) {
         StorageSecureStore.getSharedSecureStore().revoke(Define.ONEDRIVE_TOKEN);
         StorageSecureStore.getSharedSecureStore().revoke(Define.ONEDRIVE_TOKEN);
-        IOneDriveClient iOneDriveClient = this.oneDriveClient;
+        IOneDriveClient iOneDriveClient = oneDriveClient;
         if (iOneDriveClient == null) {
         if (iOneDriveClient == null) {
             return false;
             return false;
         }
         }
@@ -140,7 +140,7 @@ public class OneDriveClient extends StorageServiceClient {
     }
     }
 
 
     private void getItems(IOneDriveClient iOneDriveClient, String str, StorageServiceClient.EnumerateCompletion enumerateCompletion) {
     private void getItems(IOneDriveClient iOneDriveClient, String str, StorageServiceClient.EnumerateCompletion enumerateCompletion) {
-        this.mStorageItemList = new ArrayList();
+        mStorageItemList = new ArrayList();
         getItem(iOneDriveClient, str, getCallbackItemCollectionPage(enumerateCompletion));
         getItem(iOneDriveClient, str, getCallbackItemCollectionPage(enumerateCompletion));
     }
     }
 
 
@@ -278,7 +278,7 @@ public class OneDriveClient extends StorageServiceClient {
     }
     }
 
 
     public boolean isSessionExpired() {
     public boolean isSessionExpired() {
-        IOneDriveClient iOneDriveClient = this.oneDriveClient;
+        IOneDriveClient iOneDriveClient = oneDriveClient;
         if (iOneDriveClient != null) {
         if (iOneDriveClient != null) {
             return isExpired(iOneDriveClient);
             return isExpired(iOneDriveClient);
         }
         }
@@ -290,7 +290,7 @@ public class OneDriveClient extends StorageServiceClient {
     }
     }
 
 
     private void getClient(Activity activity, OneDriveAuthenticator.OnOneDriveAuthenticatorListener onOneDriveAuthenticatorListener) {
     private void getClient(Activity activity, OneDriveAuthenticator.OnOneDriveAuthenticatorListener onOneDriveAuthenticatorListener) {
-        IOneDriveClient iOneDriveClient = this.oneDriveClient;
+        IOneDriveClient iOneDriveClient = oneDriveClient;
         if (iOneDriveClient == null) {
         if (iOneDriveClient == null) {
             getOneDriveClient(activity, onOneDriveAuthenticatorListener);
             getOneDriveClient(activity, onOneDriveAuthenticatorListener);
         } else if (onOneDriveAuthenticatorListener != null) {
         } else if (onOneDriveAuthenticatorListener != null) {
@@ -494,18 +494,18 @@ public class OneDriveClient extends StorageServiceClient {
 
 
         OneDriveDownloader(Context context, StorageItem storageItem, String str) {
         OneDriveDownloader(Context context, StorageItem storageItem, String str) {
             super();
             super();
-            this.mStorageItem = storageItem;
-            this.mItemid = ((Item) storageItem.userInfo).f323id;
-            this.mWriteFilename = str;
+            mStorageItem = storageItem;
+            mItemid = ((Item) storageItem.userInfo).f323id;
+            mWriteFilename = str;
         }
         }
 
 
         public void start(StorageServiceClient.DownloadCompletion downloadCompletion) {
         public void start(StorageServiceClient.DownloadCompletion downloadCompletion) {
-            this.mThread = new DownloadThread(downloadCompletion);
-            this.mThread.start();
+            mThread = new DownloadThread(downloadCompletion);
+            mThread.start();
         }
         }
 
 
         public void cancel() {
         public void cancel() {
-            DownloadThread downloadThread = this.mThread;
+            DownloadThread downloadThread = mThread;
             if (downloadThread != null) {
             if (downloadThread != null) {
                 downloadThread.cancel();
                 downloadThread.cancel();
             }
             }
@@ -518,35 +518,35 @@ public class OneDriveClient extends StorageServiceClient {
             private InputStream inputStream;
             private InputStream inputStream;
 
 
             DownloadThread(StorageServiceClient.DownloadCompletion downloadCompletion) {
             DownloadThread(StorageServiceClient.DownloadCompletion downloadCompletion) {
-                this.downloaded = downloadCompletion;
+                downloaded = downloadCompletion;
             }
             }
 
 
             public void run() {
             public void run() {
-                this.inputStream = null;
+                inputStream = null;
                 boolean z = false;
                 boolean z = false;
-                this.bCanceled = false;
-                this.bConvertPdf = OneDriveClient.this.isConvertPdfExtension((Item) OneDriveDownloader.this.mStorageItem.userInfo) || OneDriveClient.this.isConvertPdfMimeType((Item) OneDriveDownloader.this.mStorageItem.userInfo);
+                bCanceled = false;
+                bConvertPdf = OneDriveClient.this.isConvertPdfExtension((Item) OneDriveDownloader.this.mStorageItem.userInfo) || OneDriveClient.this.isConvertPdfMimeType((Item) OneDriveDownloader.this.mStorageItem.userInfo);
                 if (this.bConvertPdf && !this.bCanceled) {
                 if (this.bConvertPdf && !this.bCanceled) {
                     try {
                     try {
-                        this.inputStream = OneDriveClient.this.getDownloadInputStreamPdf(OneDriveClient.this.oneDriveClient, OneDriveDownloader.this.mItemid);
+                        inputStream = OneDriveClient.this.getDownloadInputStreamPdf(OneDriveClient.this.oneDriveClient, OneDriveDownloader.this.mItemid);
                     } catch (ClientException e) {
                     } catch (ClientException e) {
                         e.printStackTrace();
                         e.printStackTrace();
                         if (e.isError(OneDriveErrorCodes.NotSupported)) {
                         if (e.isError(OneDriveErrorCodes.NotSupported)) {
-                            this.bConvertPdf = this.inputStream != null;
+                            bConvertPdf = inputStream != null;
                         } else {
                         } else {
-                            this.bConvertPdf = this.inputStream != null;
+                            bConvertPdf = inputStream != null;
                         }
                         }
                     }
                     }
                 }
                 }
                 if (!this.bConvertPdf && !this.bCanceled) {
                 if (!this.bConvertPdf && !this.bCanceled) {
                     try {
                     try {
-                        this.inputStream = OneDriveClient.this.getDownloadInputStream(OneDriveClient.this.oneDriveClient, OneDriveDownloader.this.mItemid);
+                        inputStream = OneDriveClient.this.getDownloadInputStream(OneDriveClient.this.oneDriveClient, OneDriveDownloader.this.mItemid);
                     } catch (ClientException e2) {
                     } catch (ClientException e2) {
                         e2.printStackTrace();
                         e2.printStackTrace();
-                        this.inputStream = null;
+                        inputStream = null;
                     }
                     }
                 }
                 }
-                String access$1600 = this.bConvertPdf ? OneDriveClient.this.getConvertPdfName(OneDriveDownloader.this.mWriteFilename) : OneDriveDownloader.this.mWriteFilename;
+                String access$1600 = bConvertPdf ? OneDriveClient.this.getConvertPdfName(OneDriveDownloader.this.mWriteFilename) : OneDriveDownloader.this.mWriteFilename;
                 if (this.inputStream != null && !this.bCanceled) {
                 if (this.inputStream != null && !this.bCanceled) {
                     try {
                     try {
                         File file = new File(access$1600);
                         File file = new File(access$1600);
@@ -557,7 +557,7 @@ public class OneDriveClient extends StorageServiceClient {
                         byte[] bArr = new byte[1048576];
                         byte[] bArr = new byte[1048576];
                         while (true) {
                         while (true) {
                             try {
                             try {
-                                int read = this.inputStream.read(bArr);
+                                int read = inputStream.read(bArr);
                                 if (read != -1 && !this.bCanceled) {
                                 if (read != -1 && !this.bCanceled) {
                                     fileOutputStream.write(bArr, 0, read);
                                     fileOutputStream.write(bArr, 0, read);
                                 }
                                 }
@@ -576,14 +576,14 @@ public class OneDriveClient extends StorageServiceClient {
                     }
                     }
                 }
                 }
                 closeStream();
                 closeStream();
-                this.downloaded.onDownloadComplete(OneDriveDownloader.this.mStorageItem, access$1600, z ? StorageServiceClient.ProcessError.NONE : this.bCanceled ? StorageServiceClient.ProcessError.CANCELED : StorageServiceClient.ProcessError.ERROR);
+                downloaded.onDownloadComplete(OneDriveDownloader.this.mStorageItem, access$1600, z ? StorageServiceClient.ProcessError.NONE : bCanceled ? StorageServiceClient.ProcessError.CANCELED : StorageServiceClient.ProcessError.ERROR);
             }
             }
 
 
             private void closeStream() {
             private void closeStream() {
                 try {
                 try {
                     if (this.inputStream != null) {
                     if (this.inputStream != null) {
-                        this.inputStream.close();
-                        this.inputStream = null;
+                        inputStream.close();
+                        inputStream = null;
                     }
                     }
                 } catch (IOException e) {
                 } catch (IOException e) {
                     e.printStackTrace();
                     e.printStackTrace();
@@ -591,7 +591,7 @@ public class OneDriveClient extends StorageServiceClient {
             }
             }
 
 
             public void cancel() {
             public void cancel() {
-                this.bCanceled = true;
+                bCanceled = true;
             }
             }
         }
         }
     }
     }
@@ -608,16 +608,16 @@ public class OneDriveClient extends StorageServiceClient {
 
 
         OneDriveUploader(Context context, StorageServiceClient.UploadFileType uploadFileType, String str, String str2) {
         OneDriveUploader(Context context, StorageServiceClient.UploadFileType uploadFileType, String str, String str2) {
             super();
             super();
-            this.mActivity = (Activity) context;
-            this.mOrgFilePath = str;
-            this.mUploadPath = str2;
+            mActivity = (Activity) context;
+            mOrgFilePath = str;
+            mUploadPath = str2;
         }
         }
 
 
         public void start(StorageServiceClient.UploadCompletion uploadCompletion) {
         public void start(StorageServiceClient.UploadCompletion uploadCompletion) {
             StorageServiceClient.ProcessError unused = OneDriveClient.this.mUploadProcessError = StorageServiceClient.ProcessError.NONE;
             StorageServiceClient.ProcessError unused = OneDriveClient.this.mUploadProcessError = StorageServiceClient.ProcessError.NONE;
             OneDriveClient oneDriveClient = OneDriveClient.this;
             OneDriveClient oneDriveClient = OneDriveClient.this;
             if (!oneDriveClient.isExpired(oneDriveClient.oneDriveClient)) {
             if (!oneDriveClient.isExpired(oneDriveClient.oneDriveClient)) {
-                this.mLocalUploader = new LocalUploader(this.mActivity, this.mOrgFilePath, this.mUploadPath, uploadCompletion);
+                mLocalUploader = new LocalUploader(this.mActivity, mOrgFilePath, mUploadPath, uploadCompletion);
                 AsyncTask.THREAD_POOL_EXECUTOR.execute(this.mLocalUploader);
                 AsyncTask.THREAD_POOL_EXECUTOR.execute(this.mLocalUploader);
                 return;
                 return;
             }
             }
@@ -627,7 +627,7 @@ public class OneDriveClient extends StorageServiceClient {
 
 
         public void cancel() {
         public void cancel() {
             super.cancel();
             super.cancel();
-            this.mLocalUploader.cancel();
+            mLocalUploader.cancel();
         }
         }
     }
     }
 
 
@@ -641,20 +641,20 @@ public class OneDriveClient extends StorageServiceClient {
         private UploadSession uploadSession;
         private UploadSession uploadSession;
 
 
         LocalUploader(Activity activity, String str, String str2, @NonNull StorageServiceClient.UploadCompletion uploadCompletion) {
         LocalUploader(Activity activity, String str, String str2, @NonNull StorageServiceClient.UploadCompletion uploadCompletion) {
-            this.mOrgFilePath = str;
-            this.mUploadFilename = str2;
-            this.mNotifier = uploadCompletion;
+            mOrgFilePath = str;
+            mUploadFilename = str2;
+            mNotifier = uploadCompletion;
         }
         }
 
 
         public void run() {
         public void run() {
-            this.bCanceled = false;
-            this.result = false;
-            if (!(this.mOrgFilePath == null || this.mUploadFilename == null || this.bCanceled)) {
-                this.fileInputStream = null;
+            bCanceled = false;
+            result = false;
+            if (!(this.mOrgFilePath == null || mUploadFilename == null || bCanceled)) {
+                fileInputStream = null;
                 try {
                 try {
-                    this.fileInputStream = new FileInputStream(this.mOrgFilePath);
+                    fileInputStream = new FileInputStream(this.mOrgFilePath);
                     try {
                     try {
-                        int available = this.fileInputStream.available();
+                        int available = fileInputStream.available();
                         if (available > 0 && !this.bCanceled) {
                         if (available > 0 && !this.bCanceled) {
                             upload(available);
                             upload(available);
                         }
                         }
@@ -669,19 +669,19 @@ public class OneDriveClient extends StorageServiceClient {
                 }
                 }
                 closefile();
                 closefile();
             }
             }
-            this.mNotifier.onUploadComplete(this.mOrgFilePath, this.mUploadFilename, this.result ? StorageServiceClient.ProcessError.NONE : this.bCanceled ? StorageServiceClient.ProcessError.CANCELED : StorageServiceClient.ProcessError.ERROR);
+            mNotifier.onUploadComplete(this.mOrgFilePath, mUploadFilename, result ? StorageServiceClient.ProcessError.NONE : bCanceled ? StorageServiceClient.ProcessError.CANCELED : StorageServiceClient.ProcessError.ERROR);
         }
         }
 
 
         private void upload(int i) {
         private void upload(int i) {
-            this.uploadSession = null;
+            uploadSession = null;
             try {
             try {
-                this.uploadSession = OneDriveClient.this.getUploadSession(OneDriveClient.this.oneDriveClient, "/Epson iPrint/" + this.mUploadFilename);
+                uploadSession = OneDriveClient.this.getUploadSession(OneDriveClient.this.oneDriveClient, "/Epson iPrint/" + mUploadFilename);
             } catch (ClientException e) {
             } catch (ClientException e) {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }
-            UploadSession uploadSession2 = this.uploadSession;
+            UploadSession uploadSession2 = uploadSession;
             if (uploadSession2 != null) {
             if (uploadSession2 != null) {
-                OneDriveClient.this.uploadLargeFile(uploadSession2, this.fileInputStream, i, new IProgressCallback<Item>() {
+                OneDriveClient.this.uploadLargeFile(uploadSession2, fileInputStream, i, new IProgressCallback<Item>() {
                     public void success(Item item) {
                     public void success(Item item) {
                         boolean unused = LocalUploader.this.result = true;
                         boolean unused = LocalUploader.this.result = true;
                     }
                     }
@@ -706,7 +706,7 @@ public class OneDriveClient extends StorageServiceClient {
         private void closefile() {
         private void closefile() {
             try {
             try {
                 if (this.fileInputStream != null) {
                 if (this.fileInputStream != null) {
-                    this.fileInputStream.close();
+                    fileInputStream.close();
                 }
                 }
             } catch (IOException e) {
             } catch (IOException e) {
                 e.printStackTrace();
                 e.printStackTrace();
@@ -714,7 +714,7 @@ public class OneDriveClient extends StorageServiceClient {
         }
         }
 
 
         public void cancel() {
         public void cancel() {
-            this.bCanceled = true;
+            bCanceled = true;
         }
         }
     }
     }
 }
 }

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

@@ -23,7 +23,7 @@ public class OneDriveSignInActivity extends StorageSignInActivity {
                     }
                     }
                 }
                 }
             });
             });
-            this.mAuthActivityStarted = true;
+            mAuthActivityStarted = true;
             return;
             return;
         }
         }
         finish();
         finish();

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

@@ -18,24 +18,24 @@ public class OneDriveStorageProcessUploadActivity extends StorageProcessUploadAc
 
 
     protected void onStart() {
     protected void onStart() {
         super.onStart();
         super.onStart();
-        this.mExpired = false;
+        mExpired = false;
         checkSession();
         checkSession();
     }
     }
 
 
     protected void onResume() {
     protected void onResume() {
         super.onResume();
         super.onResume();
-        this.mExpired = false;
-        OneDriveClient oneDriveClient = this.mStorageServiceClient;
+        mExpired = false;
+        OneDriveClient oneDriveClient = mStorageServiceClient;
         if (oneDriveClient != null && oneDriveClient.getUploadProcessError().equals(StorageServiceClient.ProcessError.RETRY)) {
         if (oneDriveClient != null && oneDriveClient.getUploadProcessError().equals(StorageServiceClient.ProcessError.RETRY)) {
-            this.mExpired = true;
+            mExpired = true;
             checkSession();
             checkSession();
         }
         }
     }
     }
 
 
     private void checkSession() {
     private void checkSession() {
         if (isConnected()) {
         if (isConnected()) {
-            this.mStorageServiceClient = (OneDriveClient) getStorageClient();
-            if (this.mStorageServiceClient.isSignedIn(this) && this.mStorageServiceClient.isSessionExpired()) {
+            mStorageServiceClient = (OneDriveClient) getStorageClient();
+            if (this.mStorageServiceClient.isSignedIn(this) && mStorageServiceClient.isSessionExpired()) {
                 new Thread() {
                 new Thread() {
                     public void run() {
                     public void run() {
                         super.run();
                         super.run();

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/ble/BleScanWork.java

@@ -83,7 +83,7 @@ public class BleScanWork {
                                 sb.append(BLEUtility.IntToHex2(b & UnsignedBytes.MAX_VALUE));
                                 sb.append(BLEUtility.IntToHex2(b & UnsignedBytes.MAX_VALUE));
                             }
                             }
                             String deviceName = getDeviceName(scanResult);
                             String deviceName = getDeviceName(scanResult);
-                            if (deviceName != null && !deviceName.isEmpty() && scanResult.getRssi() >= -75 && scanResult.getRssi() < 127 && this.update(scanResult.getDevice(), scanResult.getRssi(), deviceName, valueAt) && mScannedDeviceList.size() > 0 && mSuccess != null) {
+                            if (deviceName != null && !deviceName.isEmpty() && scanResult.getRssi() >= -75 && scanResult.getRssi() < 127 && update(scanResult.getDevice(), scanResult.getRssi(), deviceName, valueAt) && mScannedDeviceList.size() > 0 && mSuccess != null) {
                                 EPLog.e("mScannedDeviceList --- " + mScannedDeviceList.size());
                                 EPLog.e("mScannedDeviceList --- " + mScannedDeviceList.size());
                                 mSuccess.call(mScannedDeviceList);
                                 mSuccess.call(mScannedDeviceList);
                                 return;
                                 return;

+ 55 - 55
app/src/main/java/epson/print/copy/ActivityBase.java

@@ -108,32 +108,32 @@ class ActivityBase extends ActivityIACommon {
         }
         }
 
 
         private void show(String str, CancelRequestCallback cancelRequestCallback) {
         private void show(String str, CancelRequestCallback cancelRequestCallback) {
-            this.cancelCallback = cancelRequestCallback;
-            this.messageText.setText(str);
-            this.messageText.setVisibility(0);
-            this.cancelButton = (Button) findViewById(R.id.cancelButton);
-            this.cancelButton.setOnClickListener(new View.OnClickListener() {
+            cancelCallback = cancelRequestCallback;
+            messageText.setText(str);
+            messageText.setVisibility(0);
+            cancelButton = (Button) findViewById(R.id.cancelButton);
+            cancelButton.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                 public void onClick(View view) {
                     WheelDialog wheelDialog = WheelDialog.this;
                     WheelDialog wheelDialog = WheelDialog.this;
                     wheelDialog.cancelDialog = wheelDialog.createCancelDialog();
                     wheelDialog.cancelDialog = wheelDialog.createCancelDialog();
                     WheelDialog.this.cancelDialog.show();
                     WheelDialog.this.cancelDialog.show();
                 }
                 }
             });
             });
-            this.cancelButton.setVisibility(0);
+            cancelButton.setVisibility(0);
             show();
             show();
         }
         }
 
 
         private void setText(String str) {
         private void setText(String str) {
-            this.messageText.setText(str);
+            messageText.setText(str);
         }
         }
 
 
         private void hideCancelButton() {
         private void hideCancelButton() {
-            this.cancelButton.setVisibility(4);
+            cancelButton.setVisibility(4);
         }
         }
 
 
         private void dissmiss() {
         private void dissmiss() {
             super.dismiss();
             super.dismiss();
-            Dialog dialog = this.cancelDialog;
+            Dialog dialog = cancelDialog;
             if (dialog != null) {
             if (dialog != null) {
                 dialog.dismiss();
                 dialog.dismiss();
             }
             }
@@ -142,7 +142,7 @@ class ActivityBase extends ActivityIACommon {
 
 
     public void onCreate(Bundle bundle) {
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         super.onCreate(bundle);
-        this.loading = new WorkingDialog(this);
+        loading = new WorkingDialog(this);
         DisplayUtil.setMap(this, strings);
         DisplayUtil.setMap(this, strings);
     }
     }
 
 
@@ -153,7 +153,7 @@ class ActivityBase extends ActivityIACommon {
         Dialog dialog;
         Dialog dialog;
 
 
         public errorDialog(Context context2) {
         public errorDialog(Context context2) {
-            this.context = context2;
+            context = context2;
         }
         }
 
 
         private void showErrorDialog(String str, String str2) {
         private void showErrorDialog(String str, String str2) {
@@ -211,12 +211,12 @@ class ActivityBase extends ActivityIACommon {
                     }
                     }
                 });
                 });
             }
             }
-            this.dialog = customTitleAlertDialogBuilder.create();
-            this.dialog.show();
+            dialog = customTitleAlertDialogBuilder.create();
+            dialog.show();
         }
         }
 
 
         private void Cancel() {
         private void Cancel() {
-            Dialog dialog2 = this.dialog;
+            Dialog dialog2 = dialog;
             if (dialog2 != null) {
             if (dialog2 != null) {
                 dialog2.cancel();
                 dialog2.cancel();
             }
             }
@@ -353,7 +353,7 @@ class ActivityBase extends ActivityIACommon {
         }
         }
 
 
         private void setOptionValueChangedListener(OptionItemChangedListener optionItemChangedListener) {
         private void setOptionValueChangedListener(OptionItemChangedListener optionItemChangedListener) {
-            this.changedListener = optionItemChangedListener;
+            changedListener = optionItemChangedListener;
         }
         }
 
 
         private String getChoiceString(ECopyOptionItem.ECopyOptionItemChoice eCopyOptionItemChoice) {
         private String getChoiceString(ECopyOptionItem.ECopyOptionItemChoice eCopyOptionItemChoice) {
@@ -370,14 +370,14 @@ class ActivityBase extends ActivityIACommon {
         }
         }
 
 
         private void bindOption(ECopyOptionItem eCopyOptionItem) {
         private void bindOption(ECopyOptionItem eCopyOptionItem) {
-            this.optionItem = eCopyOptionItem;
-            this.choices = eCopyOptionItem.getSelectableChoices();
-            this.selected = eCopyOptionItem.getSelectedChoice();
+            optionItem = eCopyOptionItem;
+            choices = eCopyOptionItem.getSelectableChoices();
+            selected = eCopyOptionItem.getSelectedChoice();
         }
         }
 
 
         private String[] getKeyArray() {
         private String[] getKeyArray() {
             String[] strArr = new String[this.choices.size()];
             String[] strArr = new String[this.choices.size()];
-            for (int i = 0; i < this.choices.size(); i++) {
+            for (int i = 0; i < choices.size(); i++) {
                 strArr[i] = ActivityBase.this.string(this.choices.get(i).name());
                 strArr[i] = ActivityBase.this.string(this.choices.get(i).name());
             }
             }
             return strArr;
             return strArr;
@@ -396,11 +396,11 @@ class ActivityBase extends ActivityIACommon {
 
 
         private void updateWithAddition(int i) {
         private void updateWithAddition(int i) {
             try {
             try {
-                this.value = Integer.valueOf(this.editText.getText().toString()).intValue();
-                this.value = Math.min(Math.max(this.optionItem.getMinimumValue(), this.value + i), this.optionItem.getMaximumValue());
-                this.optionItem.selectValue(this.value);
+                value = Integer.valueOf(this.editText.getText().toString()).intValue();
+                value = Math.min(Math.max(this.optionItem.getMinimumValue(), value + i), optionItem.getMaximumValue());
+                optionItem.selectValue(this.value);
                 if (this.changedListener != null) {
                 if (this.changedListener != null) {
-                    this.changedListener.onOptionItemChanged(this.optionItem);
+                    changedListener.onOptionItemChanged(this.optionItem);
                 }
                 }
             } catch (NumberFormatException unused) {
             } catch (NumberFormatException unused) {
             }
             }
@@ -410,7 +410,7 @@ class ActivityBase extends ActivityIACommon {
             int amount;
             int amount;
 
 
             public Counter(int i) {
             public Counter(int i) {
-                this.amount = i;
+                amount = i;
             }
             }
 
 
             public void onClick(View view) {
             public void onClick(View view) {
@@ -419,35 +419,35 @@ class ActivityBase extends ActivityIACommon {
         }
         }
 
 
         private void bindOption(ECopyOptionItem eCopyOptionItem) {
         private void bindOption(ECopyOptionItem eCopyOptionItem) {
-            this.optionItem = eCopyOptionItem;
-            this.value = eCopyOptionItem.getSelectedValue();
+            optionItem = eCopyOptionItem;
+            value = eCopyOptionItem.getSelectedValue();
         }
         }
 
 
         private void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
         private void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
-            this.optionItem = eCopyOptionItem;
-            this.editText = (TextView) ActivityBase.this.findViewById(i);
-            this.value = eCopyOptionItem.getSelectedValue();
-            this.editText.setText(String.valueOf(this.value));
-            this.editText.setEnabled(eCopyOptionItem.isEnabled());
+            optionItem = eCopyOptionItem;
+            editText = (TextView) ActivityBase.this.findViewById(i);
+            value = eCopyOptionItem.getSelectedValue();
+            editText.setText(String.valueOf(this.value));
+            editText.setEnabled(eCopyOptionItem.isEnabled());
         }
         }
 
 
         private void bindCountUp(int i) {
         private void bindCountUp(int i) {
-            this.countUp = (Button) ActivityBase.this.findViewById(i);
-            this.countUp.setOnClickListener(new Counter(1));
-            if (this.value == this.optionItem.getMaximumValue()) {
-                this.countUp.setEnabled(false);
+            countUp = (Button) ActivityBase.this.findViewById(i);
+            countUp.setOnClickListener(new Counter(1));
+            if (this.value == optionItem.getMaximumValue()) {
+                countUp.setEnabled(false);
             } else {
             } else {
-                this.countUp.setEnabled(true);
+                countUp.setEnabled(true);
             }
             }
         }
         }
 
 
         private void bindCountDown(int i) {
         private void bindCountDown(int i) {
-            this.countDown = (Button) ActivityBase.this.findViewById(i);
-            this.countDown.setOnClickListener(new Counter(-1));
-            if (this.value == this.optionItem.getMinimumValue()) {
-                this.countDown.setEnabled(false);
+            countDown = (Button) ActivityBase.this.findViewById(i);
+            countDown.setOnClickListener(new Counter(-1));
+            if (this.value == optionItem.getMinimumValue()) {
+                countDown.setEnabled(false);
             } else {
             } else {
-                this.countDown.setEnabled(true);
+                countDown.setEnabled(true);
             }
             }
         }
         }
     }
     }
@@ -471,15 +471,15 @@ class ActivityBase extends ActivityIACommon {
         }
         }
 
 
         private String loadPrePrinter() {
         private String loadPrePrinter() {
-            this.presettings = ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
-            return this.presettings.getString(Constants.PRINTER_ID, (String) null);
+            presettings = ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
+            return presettings.getString(Constants.PRINTER_ID, (String) null);
         }
         }
 
 
         private void savePrePrinter() {
         private void savePrePrinter() {
-            this.presettings = ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
-            this.editer = this.presettings.edit();
-            this.editer.putString(Constants.PRINTER_ID, ActivityBase.printerId);
-            this.editer.commit();
+            presettings = ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
+            editer = presettings.edit();
+            editer.putString(Constants.PRINTER_ID, ActivityBase.printerId);
+            editer.commit();
         }
         }
 
 
         private void setCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
         private void setCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
@@ -500,7 +500,7 @@ class ActivityBase extends ActivityIACommon {
         }
         }
 
 
         private void setOption(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey, ECopyOptionItem eCopyOptionItem) {
         private void setOption(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey, ECopyOptionItem eCopyOptionItem) {
-            this.presettings = ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
+            presettings = ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
             if (eCopyOptionItem.getChoiceType() == ECopyOptionItem.ECopyOptionItemChoiceType.ChoiceArray) {
             if (eCopyOptionItem.getChoiceType() == ECopyOptionItem.ECopyOptionItemChoiceType.ChoiceArray) {
                 eCopyOptionItem.selectChoice(ECopyOptionItem.ECopyOptionItemChoice.valueOf(eCopyOptionItemKey, ERemoteOperation.ERemoteParam.stringOf(this.presettings.getString(eCopyOptionItemKey.name(), eCopyOptionItem.getDefaultChoice().getParam().toString()))));
                 eCopyOptionItem.selectChoice(ECopyOptionItem.ECopyOptionItemChoice.valueOf(eCopyOptionItemKey, ERemoteOperation.ERemoteParam.stringOf(this.presettings.getString(eCopyOptionItemKey.name(), eCopyOptionItem.getDefaultChoice().getParam().toString()))));
                 return;
                 return;
@@ -524,20 +524,20 @@ class ActivityBase extends ActivityIACommon {
         }
         }
 
 
         private void saveOption(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey, ECopyOptionItem eCopyOptionItem) {
         private void saveOption(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey, ECopyOptionItem eCopyOptionItem) {
-            this.presettings = ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
+            presettings = ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
             if (eCopyOptionItem.getChoiceType() == ECopyOptionItem.ECopyOptionItemChoiceType.ChoiceArray) {
             if (eCopyOptionItem.getChoiceType() == ECopyOptionItem.ECopyOptionItemChoiceType.ChoiceArray) {
                 String access$000 = ActivityBase.this.TAG;
                 String access$000 = ActivityBase.this.TAG;
                 EPLog.i(access$000, "cursetting:" + eCopyOptionItem.getSelectedChoice().name());
                 EPLog.i(access$000, "cursetting:" + eCopyOptionItem.getSelectedChoice().name());
-                this.editer = this.presettings.edit();
-                this.editer.putString(eCopyOptionItemKey.name(), eCopyOptionItem.getSelectedChoice().getParam().toString());
-                this.editer.commit();
+                editer = presettings.edit();
+                editer.putString(eCopyOptionItemKey.name(), eCopyOptionItem.getSelectedChoice().getParam().toString());
+                editer.commit();
                 return;
                 return;
             }
             }
             String access$0002 = ActivityBase.this.TAG;
             String access$0002 = ActivityBase.this.TAG;
             EPLog.i(access$0002, "cursetting:" + String.valueOf(eCopyOptionItem.getSelectedValue()));
             EPLog.i(access$0002, "cursetting:" + String.valueOf(eCopyOptionItem.getSelectedValue()));
-            this.editer = this.presettings.edit();
-            this.editer.putInt(eCopyOptionItemKey.name(), eCopyOptionItem.getSelectedValue());
-            this.editer.commit();
+            editer = presettings.edit();
+            editer.putInt(eCopyOptionItemKey.name(), eCopyOptionItem.getSelectedValue());
+            editer.commit();
         }
         }
     }
     }
 }
 }

+ 12 - 12
app/src/main/java/epson/print/copy/Component/ecopycomponent/CopyPhotoSettingHandler.java

@@ -48,21 +48,21 @@ class CopyPhotoSettingHandler extends DefaultHandler {
     final String f355y = "y";
     final String f355y = "y";
 
 
     public CopyPhotoSettingHandler(String str) {
     public CopyPhotoSettingHandler(String str) {
-        this.path = str;
+        path = str;
     }
     }
 
 
     public int getScanCount() {
     public int getScanCount() {
-        return this.scanCopies.size();
+        return scanCopies.size();
     }
     }
 
 
     public boolean parse() {
     public boolean parse() {
         try {
         try {
             SAXParserFactory.newInstance().newSAXParser().parse(new File(this.path), this);
             SAXParserFactory.newInstance().newSAXParser().parse(new File(this.path), this);
         } catch (Exception e) {
         } catch (Exception e) {
-            this.scanCopies.clear();
+            scanCopies.clear();
             e.printStackTrace();
             e.printStackTrace();
         }
         }
-        return this.scanCopies.size() > 0;
+        return scanCopies.size() > 0;
     }
     }
 
 
     private String xFormat(String str, String str2) {
     private String xFormat(String str, String str2) {
@@ -84,17 +84,17 @@ class CopyPhotoSettingHandler extends DefaultHandler {
             stringBuffer.append(xFormat(attributes.getValue("r"), "%02X"));
             stringBuffer.append(xFormat(attributes.getValue("r"), "%02X"));
             stringBuffer.append(xFormat(attributes.getValue("g"), "%02X"));
             stringBuffer.append(xFormat(attributes.getValue("g"), "%02X"));
             stringBuffer.append(xFormat(attributes.getValue("b"), "%02X"));
             stringBuffer.append(xFormat(attributes.getValue("b"), "%02X"));
-            this.xFitGamma.add(stringBuffer.toString());
+            xFitGamma.add(stringBuffer.toString());
         } else if (str2.equalsIgnoreCase("xMatrix")) {
         } else if (str2.equalsIgnoreCase("xMatrix")) {
-            this.xFitMatrix.add(xFormat(attributes.getValue(BoxRequestsMetadata.UpdateItemMetadata.BoxMetadataUpdateTask.VALUE), "%04X"));
+            xFitMatrix.add(xFormat(attributes.getValue(BoxRequestsMetadata.UpdateItemMetadata.BoxMetadataUpdateTask.VALUE), "%04X"));
         } else if (str2.equalsIgnoreCase("copies")) {
         } else if (str2.equalsIgnoreCase("copies")) {
-            this.scanCopies.add(attributes.getValue(BoxRequestsMetadata.UpdateItemMetadata.BoxMetadataUpdateTask.VALUE));
+            scanCopies.add(attributes.getValue(BoxRequestsMetadata.UpdateItemMetadata.BoxMetadataUpdateTask.VALUE));
         } else if (str2.equalsIgnoreCase("trimmingRect")) {
         } else if (str2.equalsIgnoreCase("trimmingRect")) {
-            this.scanAreaResolution.add(attributes.getValue("dpi"));
-            this.scanAreaX.add(attributes.getValue("x"));
-            this.scanAreaY.add(attributes.getValue("y"));
-            this.scanAreaWidth.add(attributes.getValue("width"));
-            this.scanAreaHeight.add(attributes.getValue("height"));
+            scanAreaResolution.add(attributes.getValue("dpi"));
+            scanAreaX.add(attributes.getValue("x"));
+            scanAreaY.add(attributes.getValue("y"));
+            scanAreaWidth.add(attributes.getValue("width"));
+            scanAreaHeight.add(attributes.getValue("height"));
         }
         }
     }
     }
 }
 }

+ 15 - 15
app/src/main/java/epson/print/copy/Component/ecopycomponent/ECopyComponent.java

@@ -114,8 +114,8 @@ public final class ECopyComponent {
     }
     }
 
 
     ECopyComponent() {
     ECopyComponent() {
-        this.properties.put(Property.RequestConnectionTimeout, Integer.valueOf(ActivityControlWiFi.SCANNING_TIMEOUT));
-        this.systemSettings = new ICopySystemSettings() {
+        properties.put(Property.RequestConnectionTimeout, Integer.valueOf(ActivityControlWiFi.SCANNING_TIMEOUT));
+        systemSettings = new ICopySystemSettings() {
             public String getPrinterIPAddress() {
             public String getPrinterIPAddress() {
                 return "192.168.10.1";
                 return "192.168.10.1";
             }
             }
@@ -142,12 +142,12 @@ public final class ECopyComponent {
 
 
     public void setProperty(Property property, int i) {
     public void setProperty(Property property, int i) {
         if (C21683.f356x1c67737[property.ordinal()] == 1) {
         if (C21683.f356x1c67737[property.ordinal()] == 1) {
-            this.properties.put(property, Integer.valueOf(i));
+            properties.put(property, Integer.valueOf(i));
         }
         }
     }
     }
 
 
     public void setSystemSettings(ICopySystemSettings iCopySystemSettings) {
     public void setSystemSettings(ICopySystemSettings iCopySystemSettings) {
-        this.systemSettings = iCopySystemSettings;
+        systemSettings = iCopySystemSettings;
     }
     }
 
 
     static class ECopyComponentHolder {
     static class ECopyComponentHolder {
@@ -162,7 +162,7 @@ public final class ECopyComponent {
     }
     }
 
 
     public void getRemoteOperationUUID(Context context) {
     public void getRemoteOperationUUID(Context context) {
-        this.clientID = Utils.getRemoteOperationUUID(context);
+        clientID = Utils.getRemoteOperationUUID(context);
     }
     }
 
 
     public interface ICopyResumeRequest {
     public interface ICopyResumeRequest {
@@ -200,7 +200,7 @@ public final class ECopyComponent {
             String string;
             String string;
 
 
             public String getDebugString() {
             public String getDebugString() {
-                return this.string;
+                return string;
             }
             }
         }
         }
     }
     }
@@ -236,7 +236,7 @@ public final class ECopyComponent {
             String string;
             String string;
 
 
             public String getDebugString() {
             public String getDebugString() {
-                return this.string;
+                return string;
             }
             }
         }
         }
 
 
@@ -250,21 +250,21 @@ public final class ECopyComponent {
             public String string;
             public String string;
 
 
             public String getDebugString() {
             public String getDebugString() {
-                return this.string;
+                return string;
             }
             }
         }
         }
     }
     }
 
 
     public void bindCopyOptionContext(ECopyOptionContext eCopyOptionContext, ICopyOptionListener iCopyOptionListener) {
     public void bindCopyOptionContext(ECopyOptionContext eCopyOptionContext, ICopyOptionListener iCopyOptionListener) {
-        this.optionContext = new ECopyOptionContext(eCopyOptionContext);
-        this.optionChangedListener = iCopyOptionListener;
+        optionContext = new ECopyOptionContext(eCopyOptionContext);
+        optionChangedListener = iCopyOptionListener;
     }
     }
 
 
     public ECopyOptionContext getBindedCopyOptionContext() {
     public ECopyOptionContext getBindedCopyOptionContext() {
         if (this.optionContext.isNull()) {
         if (this.optionContext.isNull()) {
             return null;
             return null;
         }
         }
-        return this.optionContext;
+        return optionContext;
     }
     }
 
 
     public ECopyPreview getComposedCopyPreview(Context context, int i, int i2, ECopyPreview.ECopyPreviewInvalidateListener eCopyPreviewInvalidateListener) {
     public ECopyPreview getComposedCopyPreview(Context context, int i, int i2, ECopyPreview.ECopyPreviewInvalidateListener eCopyPreviewInvalidateListener) {
@@ -280,7 +280,7 @@ public final class ECopyComponent {
 
 
     public ArrayList<ECopyOptionItem> getCopyOptionItems() {
     public ArrayList<ECopyOptionItem> getCopyOptionItems() {
         ArrayList<ECopyOptionItem> arrayList = new ArrayList<>();
         ArrayList<ECopyOptionItem> arrayList = new ArrayList<>();
-        Iterator<ECopyOptionItem> it = this.optionContext.optionItems.iterator();
+        Iterator<ECopyOptionItem> it = optionContext.optionItems.iterator();
         while (it.hasNext()) {
         while (it.hasNext()) {
             arrayList.add(new ECopyOptionItem(it.next()));
             arrayList.add(new ECopyOptionItem(it.next()));
         }
         }
@@ -300,9 +300,9 @@ public final class ECopyComponent {
     public void setCopyOptionItem(ECopyOptionItem eCopyOptionItem) {
     public void setCopyOptionItem(ECopyOptionItem eCopyOptionItem) {
         ITask iTask;
         ITask iTask;
         if (this.optionContext.getCopyType() == ECopyType.Photo) {
         if (this.optionContext.getCopyType() == ECopyType.Photo) {
-            iTask = new RemoteCopyPhotoSetOptionTask(eCopyOptionItem, this.optionChangedListener);
+            iTask = new RemoteCopyPhotoSetOptionTask(eCopyOptionItem, optionChangedListener);
         } else {
         } else {
-            iTask = new RemoteCopySetOptionTask(eCopyOptionItem, this.optionChangedListener);
+            iTask = new RemoteCopySetOptionTask(eCopyOptionItem, optionChangedListener);
         }
         }
         execute(iTask);
         execute(iTask);
     }
     }
@@ -333,7 +333,7 @@ public final class ECopyComponent {
 
 
     protected ICopyCancelRequest execute(ITask iTask) {
     protected ICopyCancelRequest execute(ITask iTask) {
         iTask.setSystemSettings(this.systemSettings);
         iTask.setSystemSettings(this.systemSettings);
-        iTask.setRequestConnectionTimeout(((Integer) this.properties.get(Property.RequestConnectionTimeout)).intValue());
+        iTask.setRequestConnectionTimeout(((Integer) properties.get(Property.RequestConnectionTimeout)).intValue());
         iTask.setClientID(this.clientID);
         iTask.setClientID(this.clientID);
         iTask.setOptionContext(this.optionContext);
         iTask.setOptionContext(this.optionContext);
         return iTask.start();
         return iTask.start();

+ 24 - 24
app/src/main/java/epson/print/copy/Component/ecopycomponent/ECopyOptionContext.java

@@ -32,7 +32,7 @@ public class ECopyOptionContext implements Parcelable {
     public void writeToParcel(Parcel parcel, int i) {
     public void writeToParcel(Parcel parcel, int i) {
         parcel.writeString(this.copyType.name());
         parcel.writeString(this.copyType.name());
         parcel.writeInt(this.optionItems.size());
         parcel.writeInt(this.optionItems.size());
-        Iterator<ECopyOptionItem> it = this.optionItems.iterator();
+        Iterator<ECopyOptionItem> it = optionItems.iterator();
         while (it.hasNext()) {
         while (it.hasNext()) {
             parcel.writeParcelable(it.next(), 0);
             parcel.writeParcelable(it.next(), 0);
         }
         }
@@ -40,59 +40,59 @@ public class ECopyOptionContext implements Parcelable {
     }
     }
 
 
     ECopyOptionContext(Parcel parcel) {
     ECopyOptionContext(Parcel parcel) {
-        this.optionItems = new ArrayList<>();
-        this.copyType = ECopyComponent.ECopyType.valueOf(parcel.readString());
+        optionItems = new ArrayList<>();
+        copyType = ECopyComponent.ECopyType.valueOf(parcel.readString());
         int readInt = parcel.readInt();
         int readInt = parcel.readInt();
         for (int i = 0; i < readInt; i++) {
         for (int i = 0; i < readInt; i++) {
-            this.optionItems.add((ECopyOptionItem) parcel.readParcelable(ECopyOptionItem.class.getClassLoader()));
+            optionItems.add((ECopyOptionItem) parcel.readParcelable(ECopyOptionItem.class.getClassLoader()));
         }
         }
         try {
         try {
             JSONObject jSONObject = new JSONObject(parcel.readString());
             JSONObject jSONObject = new JSONObject(parcel.readString());
             ERemoteCopy eRemoteCopy = new ERemoteCopy();
             ERemoteCopy eRemoteCopy = new ERemoteCopy();
             eRemoteCopy.getClass();
             eRemoteCopy.getClass();
-            this.copyOptionsResult = new ERemoteCopy.ERemoteCopyOptionsResult(jSONObject);
+            copyOptionsResult = new ERemoteCopy.ERemoteCopyOptionsResult(jSONObject);
         } catch (JSONException e) {
         } catch (JSONException e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
     }
     }
 
 
     private boolean isNull() {
     private boolean isNull() {
-        return this.copyType == null;
+        return copyType == null;
     }
     }
 
 
     ECopyOptionContext() {
     ECopyOptionContext() {
-        this.optionItems = new ArrayList<>();
-        this.copyType = null;
+        optionItems = new ArrayList<>();
+        copyType = null;
     }
     }
 
 
     ECopyOptionContext(ECopyComponent.ECopyType eCopyType) {
     ECopyOptionContext(ECopyComponent.ECopyType eCopyType) {
-        this.optionItems = new ArrayList<>();
-        this.copyType = eCopyType;
+        optionItems = new ArrayList<>();
+        copyType = eCopyType;
     }
     }
 
 
     ECopyOptionContext(ECopyOptionContext eCopyOptionContext) {
     ECopyOptionContext(ECopyOptionContext eCopyOptionContext) {
-        this.optionItems = new ArrayList<>();
-        this.copyType = null;
+        optionItems = new ArrayList<>();
+        copyType = null;
         if (eCopyOptionContext != null) {
         if (eCopyOptionContext != null) {
-            this.copyType = eCopyOptionContext.copyType;
+            copyType = eCopyOptionContext.copyType;
             Iterator<ECopyOptionItem> it = eCopyOptionContext.optionItems.iterator();
             Iterator<ECopyOptionItem> it = eCopyOptionContext.optionItems.iterator();
             while (it.hasNext()) {
             while (it.hasNext()) {
-                this.optionItems.add(new ECopyOptionItem(it.next()));
+                optionItems.add(new ECopyOptionItem(it.next()));
             }
             }
-            this.copyOptionsResult = eCopyOptionContext.copyOptionsResult;
+            copyOptionsResult = eCopyOptionContext.copyOptionsResult;
         }
         }
     }
     }
 
 
     private ECopyComponent.ECopyType getCopyType() {
     private ECopyComponent.ECopyType getCopyType() {
-        return this.copyType;
+        return copyType;
     }
     }
 
 
     private ArrayList<ECopyOptionItem> getCopyOptionItems() {
     private ArrayList<ECopyOptionItem> getCopyOptionItems() {
-        return this.optionItems;
+        return optionItems;
     }
     }
 
 
     private ECopyOptionItem getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey) {
     private ECopyOptionItem getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey) {
-        Iterator<ECopyOptionItem> it = this.optionItems.iterator();
+        Iterator<ECopyOptionItem> it = optionItems.iterator();
         while (it.hasNext()) {
         while (it.hasNext()) {
             ECopyOptionItem next = it.next();
             ECopyOptionItem next = it.next();
             if (next.key == eCopyOptionItemKey) {
             if (next.key == eCopyOptionItemKey) {
@@ -103,15 +103,15 @@ public class ECopyOptionContext implements Parcelable {
     }
     }
 
 
     private void add(ECopyOptionItem eCopyOptionItem) {
     private void add(ECopyOptionItem eCopyOptionItem) {
-        this.optionItems.add(eCopyOptionItem);
+        optionItems.add(eCopyOptionItem);
     }
     }
 
 
     public ECopyOptionItem replace(ECopyOptionItem eCopyOptionItem) {
     public ECopyOptionItem replace(ECopyOptionItem eCopyOptionItem) {
-        Iterator<ECopyOptionItem> it = this.optionItems.iterator();
+        Iterator<ECopyOptionItem> it = optionItems.iterator();
         int i = 0;
         int i = 0;
         while (it.hasNext()) {
         while (it.hasNext()) {
             if (it.next().key == eCopyOptionItem.key) {
             if (it.next().key == eCopyOptionItem.key) {
-                return this.optionItems.set(i, eCopyOptionItem);
+                return optionItems.set(i, eCopyOptionItem);
             }
             }
             i++;
             i++;
         }
         }
@@ -119,7 +119,7 @@ public class ECopyOptionContext implements Parcelable {
     }
     }
 
 
     private boolean isChanged(ECopyOptionItem eCopyOptionItem) {
     private boolean isChanged(ECopyOptionItem eCopyOptionItem) {
-        Iterator<ECopyOptionItem> it = this.optionItems.iterator();
+        Iterator<ECopyOptionItem> it = optionItems.iterator();
         while (true) {
         while (true) {
             if (!it.hasNext()) {
             if (!it.hasNext()) {
                 break;
                 break;
@@ -135,10 +135,10 @@ public class ECopyOptionContext implements Parcelable {
     }
     }
 
 
     private void setCopyOptionsResult(ERemoteCopy.ERemoteCopyOptionsResult eRemoteCopyOptionsResult) {
     private void setCopyOptionsResult(ERemoteCopy.ERemoteCopyOptionsResult eRemoteCopyOptionsResult) {
-        this.copyOptionsResult = eRemoteCopyOptionsResult;
+        copyOptionsResult = eRemoteCopyOptionsResult;
     }
     }
 
 
     private ERemoteCopy.ERemoteCopyOptionsResult getCopyOptionsResult() {
     private ERemoteCopy.ERemoteCopyOptionsResult getCopyOptionsResult() {
-        return this.copyOptionsResult;
+        return copyOptionsResult;
     }
     }
 }
 }

+ 67 - 67
app/src/main/java/epson/print/copy/Component/ecopycomponent/ECopyOptionItem.java

@@ -48,10 +48,10 @@ public class ECopyOptionItem implements Parcelable {
         public ChoiceArray(ChoiceArray choiceArray) {
         public ChoiceArray(ChoiceArray choiceArray) {
             Iterator<ECopyOptionItemChoice> it = choiceArray.choices.iterator();
             Iterator<ECopyOptionItemChoice> it = choiceArray.choices.iterator();
             while (it.hasNext()) {
             while (it.hasNext()) {
-                this.choices.add(it.next());
+                choices.add(it.next());
             }
             }
-            this.selectedChoice = choiceArray.selectedChoice;
-            this.defaultChoice = choiceArray.defaultChoice;
+            selectedChoice = choiceArray.selectedChoice;
+            defaultChoice = choiceArray.defaultChoice;
         }
         }
 
 
         public boolean equals(Object obj) {
         public boolean equals(Object obj) {
@@ -62,10 +62,10 @@ public class ECopyOptionItem implements Parcelable {
                 return false;
                 return false;
             }
             }
             ChoiceArray choiceArray = (ChoiceArray) obj;
             ChoiceArray choiceArray = (ChoiceArray) obj;
-            if (this.selectedChoice != choiceArray.selectedChoice || this.defaultChoice != choiceArray.defaultChoice || this.choices.size() != choiceArray.choices.size()) {
+            if (this.selectedChoice != choiceArray.selectedChoice || defaultChoice != choiceArray.defaultChoice || choices.size() != choiceArray.choices.size()) {
                 return false;
                 return false;
             }
             }
-            for (int i = 0; i < this.choices.size(); i++) {
+            for (int i = 0; i < choices.size(); i++) {
                 if (this.choices.get(i) != choiceArray.choices.get(i)) {
                 if (this.choices.get(i) != choiceArray.choices.get(i)) {
                     return false;
                     return false;
                 }
                 }
@@ -85,11 +85,11 @@ public class ECopyOptionItem implements Parcelable {
         }
         }
 
 
         public NumberRange(NumberRange numberRange) {
         public NumberRange(NumberRange numberRange) {
-            this.min = numberRange.min;
-            this.max = numberRange.max;
-            this.selectedValue = numberRange.selectedValue;
-            this.defaultValue = numberRange.defaultValue;
-            this.exceptionValue = numberRange.exceptionValue;
+            min = numberRange.min;
+            max = numberRange.max;
+            selectedValue = numberRange.selectedValue;
+            defaultValue = numberRange.defaultValue;
+            exceptionValue = numberRange.exceptionValue;
         }
         }
 
 
         public boolean equals(Object obj) {
         public boolean equals(Object obj) {
@@ -100,7 +100,7 @@ public class ECopyOptionItem implements Parcelable {
                 return false;
                 return false;
             }
             }
             NumberRange numberRange = (NumberRange) obj;
             NumberRange numberRange = (NumberRange) obj;
-            if (this.min == numberRange.min && this.max == numberRange.max && this.selectedValue == numberRange.selectedValue && this.defaultValue == numberRange.defaultValue && this.exceptionValue == numberRange.exceptionValue) {
+            if (this.min == numberRange.min && max == numberRange.max && selectedValue == numberRange.selectedValue && defaultValue == numberRange.defaultValue && exceptionValue == numberRange.exceptionValue) {
                 return true;
                 return true;
             }
             }
             return false;
             return false;
@@ -114,7 +114,7 @@ public class ECopyOptionItem implements Parcelable {
         parcel.writeInt(this.isLocalOption ? 1 : 0);
         parcel.writeInt(this.isLocalOption ? 1 : 0);
         if (this.choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
         if (this.choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
             parcel.writeInt(this.choiceArray.choices.size());
             parcel.writeInt(this.choiceArray.choices.size());
-            Iterator<ECopyOptionItemChoice> it = this.choiceArray.choices.iterator();
+            Iterator<ECopyOptionItemChoice> it = choiceArray.choices.iterator();
             while (it.hasNext()) {
             while (it.hasNext()) {
                 parcel.writeString(it.next().param.name());
                 parcel.writeString(it.next().param.name());
             }
             }
@@ -130,35 +130,35 @@ public class ECopyOptionItem implements Parcelable {
     }
     }
 
 
     ECopyOptionItem(Parcel parcel) {
     ECopyOptionItem(Parcel parcel) {
-        this.key = ECopyOptionItemKey.valueOf(parcel.readString());
-        this.choiceType = ECopyOptionItemChoiceType.valueOf(parcel.readString());
+        key = ECopyOptionItemKey.valueOf(parcel.readString());
+        choiceType = ECopyOptionItemChoiceType.valueOf(parcel.readString());
         boolean z = true;
         boolean z = true;
-        this.enabled = parcel.readInt() == 1;
-        this.isLocalOption = parcel.readInt() != 1 ? false : z;
+        enabled = parcel.readInt() == 1;
+        isLocalOption = parcel.readInt() != 1 ? false : z;
         if (this.choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
         if (this.choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
-            this.choiceArray = new ChoiceArray();
+            choiceArray = new ChoiceArray();
             int readInt = parcel.readInt();
             int readInt = parcel.readInt();
             for (int i = 0; i < readInt; i++) {
             for (int i = 0; i < readInt; i++) {
-                this.choiceArray.choices.add(ECopyOptionItemChoice.valueOf(this.key, ERemoteOperation.ERemoteParam.valueOf(parcel.readString())));
+                choiceArray.choices.add(ECopyOptionItemChoice.valueOf(this.key, ERemoteOperation.ERemoteParam.valueOf(parcel.readString())));
             }
             }
-            this.choiceArray.selectedChoice = parcel.readInt();
-            this.choiceArray.defaultChoice = parcel.readInt();
+            choiceArray.selectedChoice = parcel.readInt();
+            choiceArray.defaultChoice = parcel.readInt();
             return;
             return;
         }
         }
-        this.numberRange = new NumberRange();
-        this.numberRange.min = parcel.readInt();
-        this.numberRange.max = parcel.readInt();
-        this.numberRange.selectedValue = parcel.readInt();
-        this.numberRange.defaultValue = parcel.readInt();
-        this.numberRange.exceptionValue = parcel.readInt();
+        numberRange = new NumberRange();
+        numberRange.min = parcel.readInt();
+        numberRange.max = parcel.readInt();
+        numberRange.selectedValue = parcel.readInt();
+        numberRange.defaultValue = parcel.readInt();
+        numberRange.exceptionValue = parcel.readInt();
     }
     }
 
 
     ECopyOptionItem(ECopyOptionItemKey eCopyOptionItemKey, int i, int i2, int i3, int i4) {
     ECopyOptionItem(ECopyOptionItemKey eCopyOptionItemKey, int i, int i2, int i3, int i4) {
-        this.key = eCopyOptionItemKey;
-        this.choiceType = ECopyOptionItemChoiceType.NumberRange;
-        this.enabled = true;
-        this.numberRange = new NumberRange();
-        NumberRange numberRange2 = this.numberRange;
+        key = eCopyOptionItemKey;
+        choiceType = ECopyOptionItemChoiceType.NumberRange;
+        enabled = true;
+        numberRange = new NumberRange();
+        NumberRange numberRange2 = numberRange;
         numberRange2.min = i;
         numberRange2.min = i;
         numberRange2.max = i2;
         numberRange2.max = i2;
         numberRange2.selectedValue = i3;
         numberRange2.selectedValue = i3;
@@ -167,37 +167,37 @@ public class ECopyOptionItem implements Parcelable {
     }
     }
 
 
     ECopyOptionItem(ECopyOptionItemKey eCopyOptionItemKey, ArrayList<ERemoteOperation.ERemoteParam> arrayList, ERemoteOperation.ERemoteParam eRemoteParam) {
     ECopyOptionItem(ECopyOptionItemKey eCopyOptionItemKey, ArrayList<ERemoteOperation.ERemoteParam> arrayList, ERemoteOperation.ERemoteParam eRemoteParam) {
-        this.key = eCopyOptionItemKey;
-        this.choiceType = ECopyOptionItemChoiceType.ChoiceArray;
-        this.choiceArray = new ChoiceArray();
-        this.choiceArray.defaultChoice = 0;
+        key = eCopyOptionItemKey;
+        choiceType = ECopyOptionItemChoiceType.ChoiceArray;
+        choiceArray = new ChoiceArray();
+        choiceArray.defaultChoice = 0;
         Iterator<ERemoteOperation.ERemoteParam> it = arrayList.iterator();
         Iterator<ERemoteOperation.ERemoteParam> it = arrayList.iterator();
         while (it.hasNext()) {
         while (it.hasNext()) {
             ERemoteOperation.ERemoteParam next = it.next();
             ERemoteOperation.ERemoteParam next = it.next();
-            this.choiceArray.choices.add(ECopyOptionItemChoice.valueOf(this.key, next));
+            choiceArray.choices.add(ECopyOptionItemChoice.valueOf(this.key, next));
             if (next == eRemoteParam) {
             if (next == eRemoteParam) {
-                ChoiceArray choiceArray2 = this.choiceArray;
+                ChoiceArray choiceArray2 = choiceArray;
                 choiceArray2.defaultChoice = choiceArray2.choices.size() - 1;
                 choiceArray2.defaultChoice = choiceArray2.choices.size() - 1;
             }
             }
         }
         }
-        ChoiceArray choiceArray3 = this.choiceArray;
+        ChoiceArray choiceArray3 = choiceArray;
         choiceArray3.selectedChoice = choiceArray3.defaultChoice;
         choiceArray3.selectedChoice = choiceArray3.defaultChoice;
         if (arrayList.size() > 1) {
         if (arrayList.size() > 1) {
-            this.enabled = true;
+            enabled = true;
         } else {
         } else {
-            this.enabled = false;
+            enabled = false;
         }
         }
     }
     }
 
 
     ECopyOptionItem(ECopyOptionItem eCopyOptionItem) {
     ECopyOptionItem(ECopyOptionItem eCopyOptionItem) {
-        this.key = eCopyOptionItem.key;
-        this.choiceType = eCopyOptionItem.choiceType;
-        this.enabled = eCopyOptionItem.enabled;
-        this.isLocalOption = eCopyOptionItem.isLocalOption;
+        key = eCopyOptionItem.key;
+        choiceType = eCopyOptionItem.choiceType;
+        enabled = eCopyOptionItem.enabled;
+        isLocalOption = eCopyOptionItem.isLocalOption;
         if (this.choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
         if (this.choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
-            this.choiceArray = new ChoiceArray(eCopyOptionItem.choiceArray);
+            choiceArray = new ChoiceArray(eCopyOptionItem.choiceArray);
         } else {
         } else {
-            this.numberRange = new NumberRange(eCopyOptionItem.numberRange);
+            numberRange = new NumberRange(eCopyOptionItem.numberRange);
         }
         }
     }
     }
 
 
@@ -210,13 +210,13 @@ public class ECopyOptionItem implements Parcelable {
             return false;
             return false;
         }
         }
         ECopyOptionItem eCopyOptionItem = (ECopyOptionItem) obj;
         ECopyOptionItem eCopyOptionItem = (ECopyOptionItem) obj;
-        if (this.key != eCopyOptionItem.key || (eCopyOptionItemChoiceType = this.choiceType) != eCopyOptionItem.choiceType || this.isLocalOption != eCopyOptionItem.isLocalOption) {
+        if (this.key != eCopyOptionItem.key || (eCopyOptionItemChoiceType = choiceType) != eCopyOptionItem.choiceType || isLocalOption != eCopyOptionItem.isLocalOption) {
             return false;
             return false;
         }
         }
         if (eCopyOptionItemChoiceType == ECopyOptionItemChoiceType.ChoiceArray) {
         if (eCopyOptionItemChoiceType == ECopyOptionItemChoiceType.ChoiceArray) {
-            return this.choiceArray.equals(eCopyOptionItem.choiceArray);
+            return choiceArray.equals(eCopyOptionItem.choiceArray);
         }
         }
-        return this.numberRange.equals(eCopyOptionItem.numberRange);
+        return numberRange.equals(eCopyOptionItem.numberRange);
     }
     }
 
 
     public enum ECopyOptionItemKey {
     public enum ECopyOptionItemKey {
@@ -239,7 +239,7 @@ public class ECopyOptionItem implements Parcelable {
         ERemoteOperation.ERemoteParam param;
         ERemoteOperation.ERemoteParam param;
 
 
         private ECopyOptionItemKey(ERemoteOperation.ERemoteParam eRemoteParam) {
         private ECopyOptionItemKey(ERemoteOperation.ERemoteParam eRemoteParam) {
-            this.param = eRemoteParam;
+            param = eRemoteParam;
         }
         }
     }
     }
 
 
@@ -358,11 +358,11 @@ public class ECopyOptionItem implements Parcelable {
         ERemoteOperation.ERemoteParam param;
         ERemoteOperation.ERemoteParam param;
 
 
         private ECopyOptionItemChoice(ECopyOptionItemKey eCopyOptionItemKey, ERemoteOperation.ERemoteParam eRemoteParam) {
         private ECopyOptionItemChoice(ECopyOptionItemKey eCopyOptionItemKey, ERemoteOperation.ERemoteParam eRemoteParam) {
-            this.param = eRemoteParam;
+            param = eRemoteParam;
         }
         }
 
 
         public ERemoteOperation.ERemoteParam getParam() {
         public ERemoteOperation.ERemoteParam getParam() {
-            return this.param;
+            return param;
         }
         }
 
 
         /* JADX WARNING: Code restructure failed: missing block: B:101:0x00c6, code lost:
         /* JADX WARNING: Code restructure failed: missing block: B:101:0x00c6, code lost:
@@ -1411,49 +1411,49 @@ public class ECopyOptionItem implements Parcelable {
     }
     }
 
 
     public ECopyOptionItemKey getKey() {
     public ECopyOptionItemKey getKey() {
-        return this.key;
+        return key;
     }
     }
 
 
     public boolean isEnabled() {
     public boolean isEnabled() {
-        return this.enabled;
+        return enabled;
     }
     }
 
 
     public ECopyOptionItemChoiceType getChoiceType() {
     public ECopyOptionItemChoiceType getChoiceType() {
-        return this.choiceType;
+        return choiceType;
     }
     }
 
 
     public int getMinimumValue() {
     public int getMinimumValue() {
-        return this.numberRange.min;
+        return numberRange.min;
     }
     }
 
 
     public int getMaximumValue() {
     public int getMaximumValue() {
-        return this.numberRange.max;
+        return numberRange.max;
     }
     }
 
 
     public int getDefaultValue() {
     public int getDefaultValue() {
-        return this.numberRange.defaultValue;
+        return numberRange.defaultValue;
     }
     }
 
 
     protected void setDefaultValue(int i) {
     protected void setDefaultValue(int i) {
-        this.numberRange.defaultValue = i;
+        numberRange.defaultValue = i;
         selectValue(i);
         selectValue(i);
     }
     }
 
 
     public int getSelectedValue() {
     public int getSelectedValue() {
-        return this.numberRange.selectedValue;
+        return numberRange.selectedValue;
     }
     }
 
 
     public void selectValue(int i) {
     public void selectValue(int i) {
-        NumberRange numberRange2 = this.numberRange;
+        NumberRange numberRange2 = numberRange;
         if (i != numberRange2.exceptionValue) {
         if (i != numberRange2.exceptionValue) {
-            i = Math.min(Math.max(this.numberRange.min, i), this.numberRange.max);
+            i = Math.min(Math.max(this.numberRange.min, i), numberRange.max);
         }
         }
         numberRange2.selectedValue = i;
         numberRange2.selectedValue = i;
     }
     }
 
 
     public ArrayList<ECopyOptionItemChoice> getSelectableChoices() {
     public ArrayList<ECopyOptionItemChoice> getSelectableChoices() {
         try {
         try {
-            return this.choiceArray.choices;
+            return choiceArray.choices;
         } catch (IndexOutOfBoundsException unused) {
         } catch (IndexOutOfBoundsException unused) {
             return null;
             return null;
         }
         }
@@ -1461,7 +1461,7 @@ public class ECopyOptionItem implements Parcelable {
 
 
     public ECopyOptionItemChoice getDefaultChoice() {
     public ECopyOptionItemChoice getDefaultChoice() {
         try {
         try {
-            return this.choiceArray.choices.get(this.choiceArray.defaultChoice);
+            return choiceArray.choices.get(this.choiceArray.defaultChoice);
         } catch (IndexOutOfBoundsException unused) {
         } catch (IndexOutOfBoundsException unused) {
             return null;
             return null;
         }
         }
@@ -1469,18 +1469,18 @@ public class ECopyOptionItem implements Parcelable {
 
 
     public ECopyOptionItemChoice getSelectedChoice() {
     public ECopyOptionItemChoice getSelectedChoice() {
         try {
         try {
-            return this.choiceArray.choices.get(this.choiceArray.selectedChoice);
+            return choiceArray.choices.get(this.choiceArray.selectedChoice);
         } catch (IndexOutOfBoundsException unused) {
         } catch (IndexOutOfBoundsException unused) {
             return null;
             return null;
         }
         }
     }
     }
 
 
     public void selectChoice(ECopyOptionItemChoice eCopyOptionItemChoice) {
     public void selectChoice(ECopyOptionItemChoice eCopyOptionItemChoice) {
-        Iterator<ECopyOptionItemChoice> it = this.choiceArray.choices.iterator();
+        Iterator<ECopyOptionItemChoice> it = choiceArray.choices.iterator();
         int i = 0;
         int i = 0;
         while (it.hasNext()) {
         while (it.hasNext()) {
             if (it.next() == eCopyOptionItemChoice) {
             if (it.next() == eCopyOptionItemChoice) {
-                this.choiceArray.selectedChoice = i;
+                choiceArray.selectedChoice = i;
                 return;
                 return;
             }
             }
             i++;
             i++;

+ 157 - 157
app/src/main/java/epson/print/copy/Component/ecopycomponent/ECopyPreview.java

@@ -112,36 +112,36 @@ public class ECopyPreview extends View {
 
 
     private ECopyPreview(Context context) {
     private ECopyPreview(Context context) {
         super(context);
         super(context);
-        this.copyFramePaint.setColor(SupportMenu.CATEGORY_MASK);
-        this.copyFramePaint.setStyle(Paint.Style.STROKE);
-        this.copyFramePaint.setStrokeWidth(2.0f);
-        this.paperPadding = new Rect();
-        this.grayscalePaint = new Paint();
-        this.paperShadowPaint = new Paint();
-        this.paperFrame = new RectF();
+        copyFramePaint.setColor(SupportMenu.CATEGORY_MASK);
+        copyFramePaint.setStyle(Paint.Style.STROKE);
+        copyFramePaint.setStrokeWidth(2.0f);
+        paperPadding = new Rect();
+        grayscalePaint = new Paint();
+        paperShadowPaint = new Paint();
+        paperFrame = new RectF();
         ColorMatrix colorMatrix = new ColorMatrix();
         ColorMatrix colorMatrix = new ColorMatrix();
         colorMatrix.setSaturation(0.0f);
         colorMatrix.setSaturation(0.0f);
-        this.grayscalePaint.setColorFilter(new ColorMatrixColorFilter(colorMatrix));
+        grayscalePaint.setColorFilter(new ColorMatrixColorFilter(colorMatrix));
     }
     }
 
 
     public void setBackground(Drawable drawable) {
     public void setBackground(Drawable drawable) {
-        this.backgroundDrawable = drawable;
+        backgroundDrawable = drawable;
     }
     }
 
 
     public void setPaperDrawable(Drawable drawable) {
     public void setPaperDrawable(Drawable drawable) {
-        this.paperDrawable = drawable;
+        paperDrawable = drawable;
     }
     }
 
 
     public void setCopyFramePaint(Paint paint) {
     public void setCopyFramePaint(Paint paint) {
-        this.copyFramePaint = paint;
+        copyFramePaint = paint;
     }
     }
 
 
     public void setPaperShadowPaint(Paint paint) {
     public void setPaperShadowPaint(Paint paint) {
-        this.paperShadowPaint = paint;
+        paperShadowPaint = paint;
     }
     }
 
 
     public void setPaperPadding(Rect rect) {
     public void setPaperPadding(Rect rect) {
-        this.paperPadding = new Rect(rect);
+        paperPadding = new Rect(rect);
         resize();
         resize();
     }
     }
 
 
@@ -158,61 +158,61 @@ public class ECopyPreview extends View {
         if (eCopyPreviewColor == ECopyPreviewColor.Monochrome) {
         if (eCopyPreviewColor == ECopyPreviewColor.Monochrome) {
             eCopyOptionItemChoice = ECopyOptionItem.ECopyOptionItemChoice.ColorEffectsType_MonochromeGrayscale;
             eCopyOptionItemChoice = ECopyOptionItem.ECopyOptionItemChoice.ColorEffectsType_MonochromeGrayscale;
         }
         }
-        this.colorOption.selectChoice(eCopyOptionItemChoice);
+        colorOption.selectChoice(eCopyOptionItemChoice);
         requestInvalidateView();
         requestInvalidateView();
     }
     }
 
 
     public ECopyPreviewColor getColor() {
     public ECopyPreviewColor getColor() {
-        return this.colorOption.getSelectedChoice() == ECopyOptionItem.ECopyOptionItemChoice.ColorEffectsType_MonochromeGrayscale ? ECopyPreviewColor.Monochrome : ECopyPreviewColor.Color;
+        return colorOption.getSelectedChoice() == ECopyOptionItem.ECopyOptionItemChoice.ColorEffectsType_MonochromeGrayscale ? ECopyPreviewColor.Monochrome : ECopyPreviewColor.Color;
     }
     }
 
 
     public void setScale(int i) {
     public void setScale(int i) {
-        this.scaleOption.selectValue(i);
-        this.layout.setCopyScale(((float) this.scaleOption.getSelectedValue()) / 100.0f);
+        scaleOption.selectValue(i);
+        layout.setCopyScale(((float) scaleOption.getSelectedValue()) / 100.0f);
         requestInvalidateView();
         requestInvalidateView();
     }
     }
 
 
     public int getScale() {
     public int getScale() {
-        return this.scaleOption.getSelectedValue();
+        return scaleOption.getSelectedValue();
     }
     }
 
 
     public void setCopies(int i) {
     public void setCopies(int i) {
-        this.copiesOpiton.selectValue(i);
+        copiesOpiton.selectValue(i);
     }
     }
 
 
     public int getCopies() {
     public int getCopies() {
-        return this.copiesOpiton.getSelectedValue();
+        return copiesOpiton.getSelectedValue();
     }
     }
 
 
     public void dismiss(boolean z) {
     public void dismiss(boolean z) {
         if (z) {
         if (z) {
-            this.optionCommitter.commit(this.optionContext);
+            optionCommitter.commit(this.optionContext);
         }
         }
     }
     }
 
 
     private void compose(ECopyOptionContext eCopyOptionContext, ICopyPreviewCommitEditedOptionContext iCopyPreviewCommitEditedOptionContext) {
     private void compose(ECopyOptionContext eCopyOptionContext, ICopyPreviewCommitEditedOptionContext iCopyPreviewCommitEditedOptionContext) {
-        this.optionContext = eCopyOptionContext;
-        this.optionCommitter = iCopyPreviewCommitEditedOptionContext;
-        this.copiesOpiton = this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.Copies);
-        this.scaleOption = this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.CopyMagnification);
-        this.colorOption = this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.ColorEffectsType);
+        optionContext = eCopyOptionContext;
+        optionCommitter = iCopyPreviewCommitEditedOptionContext;
+        copiesOpiton = optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.Copies);
+        scaleOption = optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.CopyMagnification);
+        colorOption = optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.ColorEffectsType);
         resize();
         resize();
     }
     }
 
 
     private void resize() {
     private void resize() {
-        int i = (this.drawSize.width - this.paperPadding.left) - this.paperPadding.right;
-        int i2 = (this.drawSize.height - this.paperPadding.top) - this.paperPadding.bottom;
-        ECopyComponent.ECopyType copyType = this.optionContext.getCopyType();
+        int i = (this.drawSize.width - paperPadding.left) - paperPadding.right;
+        int i2 = (this.drawSize.height - paperPadding.top) - paperPadding.bottom;
+        ECopyComponent.ECopyType copyType = optionContext.getCopyType();
         if (copyType == ECopyComponent.ECopyType.A4_2up || copyType == ECopyComponent.ECopyType.B5_2up || copyType == ECopyComponent.ECopyType.A4_2up_Book || copyType == ECopyComponent.ECopyType.B5_2up_Book) {
         if (copyType == ECopyComponent.ECopyType.A4_2up || copyType == ECopyComponent.ECopyType.B5_2up || copyType == ECopyComponent.ECopyType.A4_2up_Book || copyType == ECopyComponent.ECopyType.B5_2up_Book) {
-            this.layout = new Layout2Up(i, i2);
+            layout = new Layout2Up(i, i2);
         } else if (copyType == ECopyComponent.ECopyType.Mirror) {
         } else if (copyType == ECopyComponent.ECopyType.Mirror) {
-            this.layout = new LayoutMirror(i, i2);
+            layout = new LayoutMirror(i, i2);
         } else if (copyType == ECopyComponent.ECopyType.Borderless) {
         } else if (copyType == ECopyComponent.ECopyType.Borderless) {
-            this.layout = new LayoutBorderless(i, i2);
+            layout = new LayoutBorderless(i, i2);
         } else {
         } else {
-            this.layout = new LayoutStandard(i, i2);
+            layout = new LayoutStandard(i, i2);
         }
         }
-        this.layout.setCopyScale(((float) this.scaleOption.getSelectedValue()) / 100.0f);
+        layout.setCopyScale(((float) scaleOption.getSelectedValue()) / 100.0f);
     }
     }
 
 
     protected static ECopyPreview createPreview(Context context, int i, int i2, ECopyPreviewInvalidateListener eCopyPreviewInvalidateListener) {
     protected static ECopyPreview createPreview(Context context, int i, int i2, ECopyPreviewInvalidateListener eCopyPreviewInvalidateListener) {
@@ -225,45 +225,45 @@ public class ECopyPreview extends View {
     }
     }
 
 
     protected void drawScanPreview(Bitmap bitmap) {
     protected void drawScanPreview(Bitmap bitmap) {
-        this.layout.setScanImage(bitmap);
+        layout.setScanImage(bitmap);
         requestInvalidateView();
         requestInvalidateView();
     }
     }
 
 
     protected void calculateScanImageSize(int i, int i2, ScanImageSizeCalculator scanImageSizeCalculator) {
     protected void calculateScanImageSize(int i, int i2, ScanImageSizeCalculator scanImageSizeCalculator) {
-        float scanImageScale = this.layout.getScanImageScale(i, i2);
+        float scanImageScale = layout.getScanImageScale(i, i2);
         scanImageSizeCalculator.onScanImageSize((int) (((float) i) * scanImageScale), (int) (((float) i2) * scanImageScale), scanImageScale);
         scanImageSizeCalculator.onScanImageSize((int) (((float) i) * scanImageScale), (int) (((float) i2) * scanImageScale), scanImageScale);
     }
     }
 
 
     protected void setPaperFrame(RectF rectF) {
     protected void setPaperFrame(RectF rectF) {
-        this.paperFrame = rectF;
-        this.layout.setPaperFrame(rectF);
+        paperFrame = rectF;
+        layout.setPaperFrame(rectF);
         requestInvalidateView();
         requestInvalidateView();
     }
     }
 
 
     protected void onDraw(Canvas canvas) {
     protected void onDraw(Canvas canvas) {
         canvas.save();
         canvas.save();
-        this.backgroundDrawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-        this.backgroundDrawable.draw(canvas);
-        Point offset = this.layout.getOffset();
-        offset.offset(this.paperPadding.left, this.paperPadding.top);
-        RectF paperRect = this.layout.getPaperRect();
+        backgroundDrawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+        backgroundDrawable.draw(canvas);
+        Point offset = layout.getOffset();
+        offset.offset(this.paperPadding.left, paperPadding.top);
+        RectF paperRect = layout.getPaperRect();
         paperRect.offset((float) offset.x, (float) offset.y);
         paperRect.offset((float) offset.x, (float) offset.y);
         if (this.optionContext.copyType == ECopyComponent.ECopyType.Mirror) {
         if (this.optionContext.copyType == ECopyComponent.ECopyType.Mirror) {
             canvas.scale(-1.0f, 1.0f);
             canvas.scale(-1.0f, 1.0f);
             canvas.translate(-(paperRect.centerX() * 2.0f), 0.0f);
             canvas.translate(-(paperRect.centerX() * 2.0f), 0.0f);
         }
         }
-        canvas.drawRect(paperRect, this.paperShadowPaint);
+        canvas.drawRect(paperRect, paperShadowPaint);
         Paint paint = null;
         Paint paint = null;
         if (this.colorOption.getSelectedChoice() == ECopyOptionItem.ECopyOptionItemChoice.ColorEffectsType_MonochromeGrayscale) {
         if (this.colorOption.getSelectedChoice() == ECopyOptionItem.ECopyOptionItemChoice.ColorEffectsType_MonochromeGrayscale) {
-            paint = this.grayscalePaint;
+            paint = grayscalePaint;
         }
         }
         canvas.drawBitmap(this.layout.getBitmap(), (float) offset.x, (float) offset.y, paint);
         canvas.drawBitmap(this.layout.getBitmap(), (float) offset.x, (float) offset.y, paint);
-        RectF copyFrame = this.layout.getCopyFrame();
+        RectF copyFrame = layout.getCopyFrame();
         if (!this.paperFrame.isEmpty() && copyFrame != null) {
         if (!this.paperFrame.isEmpty() && copyFrame != null) {
             copyFrame.offset((float) offset.x, (float) offset.y);
             copyFrame.offset((float) offset.x, (float) offset.y);
             Path path = new Path();
             Path path = new Path();
             path.addRect(copyFrame, Path.Direction.CW);
             path.addRect(copyFrame, Path.Direction.CW);
-            canvas.drawPath(path, this.copyFramePaint);
+            canvas.drawPath(path, copyFramePaint);
         }
         }
         canvas.restore();
         canvas.restore();
     }
     }
@@ -273,18 +273,18 @@ public class ECopyPreview extends View {
         int width;
         int width;
 
 
         Size(int i, int i2) {
         Size(int i, int i2) {
-            this.width = i;
-            this.height = i2;
+            width = i;
+            height = i2;
         }
         }
 
 
         Size(Size size) {
         Size(Size size) {
-            this.width = size.width;
-            this.height = size.height;
+            width = size.width;
+            height = size.height;
         }
         }
 
 
         private void scale(float f) {
         private void scale(float f) {
-            this.width = (int) (((float) this.width) * f);
-            this.height = (int) (((float) this.height) * f);
+            width = (int) (((float) width) * f);
+            height = (int) (((float) height) * f);
         }
         }
     }
     }
 
 
@@ -347,91 +347,91 @@ public class ECopyPreview extends View {
         Bitmap scanImage;
         Bitmap scanImage;
 
 
         LayoutStandard(int i, int i2) {
         LayoutStandard(int i, int i2) {
-            this.layoutWidth = i;
-            this.layoutHeight = i2;
+            layoutWidth = i;
+            layoutHeight = i2;
             if (ECopyPreview.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XScale).getSelectedChoice() == ECopyOptionItem.ECopyOptionItemChoice.XScale_Autofit) {
             if (ECopyPreview.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XScale).getSelectedChoice() == ECopyOptionItem.ECopyOptionItemChoice.XScale_Autofit) {
-                this.autofitEnabled = true;
+                autofitEnabled = true;
             }
             }
             ECopyOptionItem copyOptionItemOf = ECopyPreview.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize);
             ECopyOptionItem copyOptionItemOf = ECopyPreview.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize);
             switch (copyOptionItemOf.getSelectedChoice()) {
             switch (copyOptionItemOf.getSelectedChoice()) {
                 case PrintMediaSize_A4:
                 case PrintMediaSize_A4:
-                    this.paperSize = ECopyPreview.this.f360A4;
+                    paperSize = ECopyPreview.this.f360A4;
                     break;
                     break;
                 case PrintMediaSize_B5:
                 case PrintMediaSize_B5:
-                    this.paperSize = ECopyPreview.this.f361B5;
+                    paperSize = ECopyPreview.this.f361B5;
                     break;
                     break;
                 case PrintMediaSize_L:
                 case PrintMediaSize_L:
-                    this.paperSize = ECopyPreview.this.f363L;
+                    paperSize = ECopyPreview.this.f363L;
                     break;
                     break;
                 case PrintMediaSize_2L:
                 case PrintMediaSize_2L:
-                    this.paperSize = ECopyPreview.this.f364L2;
+                    paperSize = ECopyPreview.this.f364L2;
                     break;
                     break;
                 case PrintMediaSize_Postcard:
                 case PrintMediaSize_Postcard:
-                    this.paperSize = ECopyPreview.this.Hagaki;
+                    paperSize = ECopyPreview.this.Hagaki;
                     break;
                     break;
                 case PrintMediaSize_KG:
                 case PrintMediaSize_KG:
-                    this.paperSize = ECopyPreview.this.f362KG;
+                    paperSize = ECopyPreview.this.f362KG;
                     break;
                     break;
                 case PrintMediaSize_8x10in:
                 case PrintMediaSize_8x10in:
-                    this.paperSize = ECopyPreview.this.f365P6;
+                    paperSize = ECopyPreview.this.f365P6;
                     break;
                     break;
                 default:
                 default:
-                    this.paperSize = ECopyPreview.this.Max;
+                    paperSize = ECopyPreview.this.Max;
                     break;
                     break;
             }
             }
             float f = (float) i;
             float f = (float) i;
             float f2 = (float) i2;
             float f2 = (float) i2;
-            float aspectFitScale = getAspectFitScale(f, f2, (float) this.paperSize.width, (float) this.paperSize.height, Layout.AspectFit.Min);
-            RectF rectF = new RectF(0.0f, 0.0f, (float) this.paperSize.width, (float) this.paperSize.height);
+            float aspectFitScale = getAspectFitScale(f, f2, (float) paperSize.width, (float) paperSize.height, Layout.AspectFit.Min);
+            RectF rectF = new RectF(0.0f, 0.0f, (float) paperSize.width, (float) paperSize.height);
             scaleRect(aspectFitScale, rectF);
             scaleRect(aspectFitScale, rectF);
-            this.paperImage = Bitmap.createBitmap((int) rectF.width(), (int) rectF.height(), Bitmap.Config.ARGB_8888);
-            RectF rectF2 = new RectF(0.0f, 0.0f, (float) this.paperSize.width, (float) this.paperSize.height);
+            paperImage = Bitmap.createBitmap((int) rectF.width(), (int) rectF.height(), Bitmap.Config.ARGB_8888);
+            RectF rectF2 = new RectF(0.0f, 0.0f, (float) paperSize.width, (float) paperSize.height);
             rectF2.left += 18.0f;
             rectF2.left += 18.0f;
             rectF2.top += 18.0f;
             rectF2.top += 18.0f;
             rectF2.right -= 18.0f;
             rectF2.right -= 18.0f;
             rectF2.bottom -= 18.0f;
             rectF2.bottom -= 18.0f;
             scaleRect(aspectFitScale, rectF2);
             scaleRect(aspectFitScale, rectF2);
-            this.paperBorderClipPath.addRect(rectF2, Path.Direction.CW);
+            paperBorderClipPath.addRect(rectF2, Path.Direction.CW);
             float aspectFitScale2 = getAspectFitScale(f, f2, (float) ECopyPreview.this.Max.width, (float) ECopyPreview.this.Max.height, Layout.AspectFit.Min);
             float aspectFitScale2 = getAspectFitScale(f, f2, (float) ECopyPreview.this.Max.width, (float) ECopyPreview.this.Max.height, Layout.AspectFit.Min);
             RectF rectF3 = new RectF(0.0f, 0.0f, (float) ECopyPreview.this.Max.width, (float) ECopyPreview.this.Max.height);
             RectF rectF3 = new RectF(0.0f, 0.0f, (float) ECopyPreview.this.Max.width, (float) ECopyPreview.this.Max.height);
             scaleRect(aspectFitScale2, rectF3);
             scaleRect(aspectFitScale2, rectF3);
-            this.maxPaperImage = Bitmap.createBitmap((int) rectF3.width(), (int) rectF3.height(), Bitmap.Config.ARGB_8888);
+            maxPaperImage = Bitmap.createBitmap((int) rectF3.width(), (int) rectF3.height(), Bitmap.Config.ARGB_8888);
             invalidatePaperSize();
             invalidatePaperSize();
         }
         }
 
 
         private Bitmap getBitmap() {
         private Bitmap getBitmap() {
             boolean showPaper = showPaper();
             boolean showPaper = showPaper();
-            Bitmap bitmap = showPaper ? this.paperImage : this.maxPaperImage;
-            this.canvas = new Canvas(bitmap);
-            this.canvas.save();
+            Bitmap bitmap = showPaper ? paperImage : maxPaperImage;
+            canvas = new Canvas(bitmap);
+            canvas.save();
             ECopyPreview.this.paperDrawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
             ECopyPreview.this.paperDrawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
             ECopyPreview.this.paperDrawable.draw(this.canvas);
             ECopyPreview.this.paperDrawable.draw(this.canvas);
-            Bitmap bitmap2 = this.scanImage;
+            Bitmap bitmap2 = scanImage;
             if (bitmap2 != null) {
             if (bitmap2 != null) {
                 if (showPaper) {
                 if (showPaper) {
-                    float f = this.copyScale / this.limitCopyScaleDown;
+                    float f = copyScale / limitCopyScaleDown;
                     if (this.autofitEnabled) {
                     if (this.autofitEnabled) {
-                        f = 1.0f / getAspectFitScale(this.scanFrame.width(), this.scanFrame.height(), (float) this.canvas.getWidth(), (float) this.canvas.getHeight(), Layout.AspectFit.Max);
+                        f = 1.0f / getAspectFitScale(this.scanFrame.width(), scanFrame.height(), (float) canvas.getWidth(), (float) canvas.getHeight(), Layout.AspectFit.Max);
                     }
                     }
                     Matrix matrix = new Matrix();
                     Matrix matrix = new Matrix();
                     matrix.postScale(f, f);
                     matrix.postScale(f, f);
-                    this.canvas.clipPath(this.paperBorderClipPath);
-                    this.canvas.drawBitmap(this.scanImage, matrix, (Paint) null);
+                    canvas.clipPath(this.paperBorderClipPath);
+                    canvas.drawBitmap(this.scanImage, matrix, (Paint) null);
                 } else {
                 } else {
-                    this.canvas.drawBitmap(bitmap2, 0.0f, 0.0f, (Paint) null);
+                    canvas.drawBitmap(bitmap2, 0.0f, 0.0f, (Paint) null);
                 }
                 }
             }
             }
-            this.canvas.restore();
+            canvas.restore();
             return bitmap;
             return bitmap;
         }
         }
 
 
         private float getScanImageScale(int i, int i2) {
         private float getScanImageScale(int i, int i2) {
-            this.imageScale = getAspectFitScale((float) ((ECopyPreview.this.drawSize.width - ECopyPreview.this.paperPadding.left) - ECopyPreview.this.paperPadding.right), (float) ((ECopyPreview.this.drawSize.height - ECopyPreview.this.paperPadding.top) - ECopyPreview.this.paperPadding.bottom), (float) i, (float) i2, Layout.AspectFit.Min);
-            return this.imageScale;
+            imageScale = getAspectFitScale((float) ((ECopyPreview.this.drawSize.width - ECopyPreview.this.paperPadding.left) - ECopyPreview.this.paperPadding.right), (float) ((ECopyPreview.this.drawSize.height - ECopyPreview.this.paperPadding.top) - ECopyPreview.this.paperPadding.bottom), (float) i, (float) i2, Layout.AspectFit.Min);
+            return imageScale;
         }
         }
 
 
         private void setScanImage(Bitmap bitmap) {
         private void setScanImage(Bitmap bitmap) {
-            this.scanImage = bitmap;
+            scanImage = bitmap;
         }
         }
 
 
         private Point getOffset() {
         private Point getOffset() {
@@ -439,37 +439,37 @@ public class ECopyPreview extends View {
         }
         }
 
 
         private void setPaperFrame(RectF rectF) {
         private void setPaperFrame(RectF rectF) {
-            this.scanFrame = new RectF(rectF);
-            scaleRect(this.imageScale, this.scanFrame);
-            this.copyFrame = new RectF(rectF);
-            this.copyFrame.left += 18.0f;
-            this.copyFrame.top += 18.0f;
-            this.copyFrame.right -= 36.0f;
-            this.copyFrame.bottom -= 36.0f;
-            scaleRect(this.imageScale, this.copyFrame);
+            scanFrame = new RectF(rectF);
+            scaleRect(this.imageScale, scanFrame);
+            copyFrame = new RectF(rectF);
+            copyFrame.left += 18.0f;
+            copyFrame.top += 18.0f;
+            copyFrame.right -= 36.0f;
+            copyFrame.bottom -= 36.0f;
+            scaleRect(this.imageScale, copyFrame);
             calcLimitCopyScaleDown();
             calcLimitCopyScaleDown();
             invalidatePaperSize();
             invalidatePaperSize();
         }
         }
 
 
         private RectF getCopyFrame() {
         private RectF getCopyFrame() {
             RectF rectF;
             RectF rectF;
-            if (showPaper() || this.scanImage == null || (rectF = this.copyFrame) == null) {
+            if (showPaper() || scanImage == null || (rectF = copyFrame) == null) {
                 return null;
                 return null;
             }
             }
             RectF rectF2 = new RectF(rectF);
             RectF rectF2 = new RectF(rectF);
-            float max = 1.0f / Math.max(this.copyScale, this.limitCopyScaleDown);
+            float max = 1.0f / Math.max(this.copyScale, limitCopyScaleDown);
             rectF2.right *= max;
             rectF2.right *= max;
             rectF2.bottom *= max;
             rectF2.bottom *= max;
             return rectF2;
             return rectF2;
         }
         }
 
 
         private void setCopyScale(float f) {
         private void setCopyScale(float f) {
-            this.copyScale = f;
+            copyScale = f;
             invalidatePaperSize();
             invalidatePaperSize();
         }
         }
 
 
         private boolean showPaper() {
         private boolean showPaper() {
-            boolean z = this.copyScale < this.limitCopyScaleDown;
+            boolean z = copyScale < limitCopyScaleDown;
             if (this.autofitEnabled) {
             if (this.autofitEnabled) {
                 return true;
                 return true;
             }
             }
@@ -477,20 +477,20 @@ public class ECopyPreview extends View {
         }
         }
 
 
         private void invalidatePaperSize() {
         private void invalidatePaperSize() {
-            Size size = showPaper() ? this.paperSize : ECopyPreview.this.Max;
-            float aspectFitScale = getAspectFitScale((float) this.layoutWidth, (float) this.layoutHeight, (float) size.width, (float) size.height, Layout.AspectFit.Min);
-            this.paper = new RectF(0.0f, 0.0f, (float) size.width, (float) size.height);
-            scaleRect(aspectFitScale, this.paper);
-            this.offset.x = ((int) (((float) this.layoutWidth) - this.paper.right)) / 2;
-            this.offset.y = ((int) (((float) this.layoutHeight) - this.paper.bottom)) / 2;
+            Size size = showPaper() ? paperSize : ECopyPreview.this.Max;
+            float aspectFitScale = getAspectFitScale((float) layoutWidth, (float) layoutHeight, (float) size.width, (float) size.height, Layout.AspectFit.Min);
+            paper = new RectF(0.0f, 0.0f, (float) size.width, (float) size.height);
+            scaleRect(aspectFitScale, paper);
+            offset.x = ((int) (((float) layoutWidth) - paper.right)) / 2;
+            offset.y = ((int) (((float) layoutHeight) - paper.bottom)) / 2;
         }
         }
 
 
         private void calcLimitCopyScaleDown() {
         private void calcLimitCopyScaleDown() {
-            this.limitCopyScaleDown = getAspectFitScale(this.copyFrame.right, this.copyFrame.bottom, this.paper.width(), this.paper.height(), Layout.AspectFit.Max);
+            limitCopyScaleDown = getAspectFitScale(this.copyFrame.right, copyFrame.bottom, paper.width(), paper.height(), Layout.AspectFit.Max);
         }
         }
 
 
         private RectF getPaperRect() {
         private RectF getPaperRect() {
-            return new RectF(0.0f, 0.0f, this.paper.width(), this.paper.height());
+            return new RectF(0.0f, 0.0f, paper.width(), paper.height());
         }
         }
     }
     }
 
 
@@ -501,27 +501,27 @@ public class ECopyPreview extends View {
 
 
         private Bitmap getBitmap() {
         private Bitmap getBitmap() {
             boolean showPaper = showPaper();
             boolean showPaper = showPaper();
-            Bitmap bitmap = showPaper ? this.paperImage : this.maxPaperImage;
-            this.canvas = new Canvas(bitmap);
-            this.canvas.save();
+            Bitmap bitmap = showPaper ? paperImage : maxPaperImage;
+            canvas = new Canvas(bitmap);
+            canvas.save();
             ECopyPreview.this.paperDrawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
             ECopyPreview.this.paperDrawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
             ECopyPreview.this.paperDrawable.draw(this.canvas);
             ECopyPreview.this.paperDrawable.draw(this.canvas);
             if (this.scanImage != null) {
             if (this.scanImage != null) {
                 if (showPaper) {
                 if (showPaper) {
-                    float f = this.copyScale / this.limitCopyScaleDown;
+                    float f = copyScale / limitCopyScaleDown;
                     if (this.autofitEnabled) {
                     if (this.autofitEnabled) {
-                        f = 1.0f / getAspectFitScale(this.scanFrame.width(), this.scanFrame.height(), (float) this.canvas.getWidth(), (float) this.canvas.getHeight(), Layout.AspectFit.Max);
+                        f = 1.0f / getAspectFitScale(this.scanFrame.width(), scanFrame.height(), (float) canvas.getWidth(), (float) canvas.getHeight(), Layout.AspectFit.Max);
                     }
                     }
                     Matrix matrix = new Matrix();
                     Matrix matrix = new Matrix();
                     matrix.postScale(f, f);
                     matrix.postScale(f, f);
-                    matrix.postTranslate(((float) bitmap.getWidth()) - (((float) this.scanImage.getWidth()) * f), 0.0f);
-                    this.canvas.clipPath(this.paperBorderClipPath);
-                    this.canvas.drawBitmap(this.scanImage, matrix, (Paint) null);
+                    matrix.postTranslate(((float) bitmap.getWidth()) - (((float) scanImage.getWidth()) * f), 0.0f);
+                    canvas.clipPath(this.paperBorderClipPath);
+                    canvas.drawBitmap(this.scanImage, matrix, (Paint) null);
                 } else {
                 } else {
-                    this.canvas.drawBitmap(this.scanImage, 0.0f, 0.0f, (Paint) null);
+                    canvas.drawBitmap(this.scanImage, 0.0f, 0.0f, (Paint) null);
                 }
                 }
             }
             }
-            this.canvas.restore();
+            canvas.restore();
             return bitmap;
             return bitmap;
         }
         }
     }
     }
@@ -544,54 +544,54 @@ public class ECopyPreview extends View {
             super(i, i2);
             super(i, i2);
             ECopyOptionItem.ECopyOptionItemChoice selectedChoice = ECopyPreview.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize).getSelectedChoice();
             ECopyOptionItem.ECopyOptionItemChoice selectedChoice = ECopyPreview.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize).getSelectedChoice();
             if (selectedChoice == ECopyOptionItem.ECopyOptionItemChoice.PrintMediaSize_KG || selectedChoice == ECopyOptionItem.ECopyOptionItemChoice.PrintMediaSize_L || selectedChoice == ECopyOptionItem.ECopyOptionItemChoice.PrintMediaSize_Postcard) {
             if (selectedChoice == ECopyOptionItem.ECopyOptionItemChoice.PrintMediaSize_KG || selectedChoice == ECopyOptionItem.ECopyOptionItemChoice.PrintMediaSize_L || selectedChoice == ECopyOptionItem.ECopyOptionItemChoice.PrintMediaSize_Postcard) {
-                this.f368LO = 15;
-                this.f369RO = 15;
-                this.f370TO = 8;
-                this.f367BO = 15;
+                f368LO = 15;
+                f369RO = 15;
+                f370TO = 8;
+                f367BO = 15;
                 return;
                 return;
             }
             }
-            this.f368LO = 15;
-            this.f369RO = 15;
-            this.f370TO = 17;
-            this.f367BO = 15;
+            f368LO = 15;
+            f369RO = 15;
+            f370TO = 17;
+            f367BO = 15;
         }
         }
 
 
         private Bitmap getBitmap() {
         private Bitmap getBitmap() {
             boolean showPaper = showPaper();
             boolean showPaper = showPaper();
-            Bitmap bitmap = showPaper ? this.paperImage : this.maxPaperImage;
-            this.canvas = new Canvas(bitmap);
-            this.canvas.save();
+            Bitmap bitmap = showPaper ? paperImage : maxPaperImage;
+            canvas = new Canvas(bitmap);
+            canvas.save();
             ECopyPreview.this.paperDrawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
             ECopyPreview.this.paperDrawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
             ECopyPreview.this.paperDrawable.draw(this.canvas);
             ECopyPreview.this.paperDrawable.draw(this.canvas);
             if (this.scanImage != null) {
             if (this.scanImage != null) {
                 if (showPaper) {
                 if (showPaper) {
-                    float f = this.copyScale;
+                    float f = copyScale;
                     if (this.autofitEnabled) {
                     if (this.autofitEnabled) {
-                        f = 1.0f / getAspectFitScale(this.scanFrame.width(), this.scanFrame.height(), (float) ((this.paperImage.getWidth() + this.f368LO) + this.f369RO), (float) ((this.paperImage.getHeight() + this.f370TO) + this.f367BO), Layout.AspectFit.Min);
+                        f = 1.0f / getAspectFitScale(this.scanFrame.width(), scanFrame.height(), (float) ((this.paperImage.getWidth() + f368LO) + f369RO), (float) ((this.paperImage.getHeight() + f370TO) + f367BO), Layout.AspectFit.Min);
                     }
                     }
                     Matrix matrix = new Matrix();
                     Matrix matrix = new Matrix();
                     matrix.postTranslate((float) (-this.f368LO), (float) (-this.f370TO));
                     matrix.postTranslate((float) (-this.f368LO), (float) (-this.f370TO));
                     matrix.postScale(f, f);
                     matrix.postScale(f, f);
-                    this.canvas.drawBitmap(this.scanImage, matrix, (Paint) null);
+                    canvas.drawBitmap(this.scanImage, matrix, (Paint) null);
                 } else {
                 } else {
-                    this.canvas.drawBitmap(this.scanImage, (float) (-this.f368LO), (float) (-this.f370TO), (Paint) null);
+                    canvas.drawBitmap(this.scanImage, (float) (-this.f368LO), (float) (-this.f370TO), (Paint) null);
                 }
                 }
             }
             }
-            this.canvas.restore();
+            canvas.restore();
             return bitmap;
             return bitmap;
         }
         }
 
 
         private void setPaperFrame(RectF rectF) {
         private void setPaperFrame(RectF rectF) {
-            this.scanFrame = new RectF(rectF);
-            scaleRect(this.imageScale, this.scanFrame);
-            this.copyFrame = new RectF(rectF);
-            scaleRect(this.imageScale, this.copyFrame);
+            scanFrame = new RectF(rectF);
+            scaleRect(this.imageScale, scanFrame);
+            copyFrame = new RectF(rectF);
+            scaleRect(this.imageScale, copyFrame);
             calcLimitCopyScaleDown();
             calcLimitCopyScaleDown();
             invalidatePaperSize();
             invalidatePaperSize();
-            this.f368LO = (int) (((float) this.f368LO) * this.imageScale);
-            this.f369RO = (int) (((float) this.f369RO) * this.imageScale);
-            this.f370TO = (int) (((float) this.f370TO) * this.imageScale);
-            this.f367BO = (int) (((float) this.f367BO) * this.imageScale);
+            f368LO = (int) (((float) f368LO) * imageScale);
+            f369RO = (int) (((float) f369RO) * imageScale);
+            f370TO = (int) (((float) f370TO) * imageScale);
+            f367BO = (int) (((float) f367BO) * imageScale);
         }
         }
     }
     }
 
 
@@ -614,43 +614,43 @@ public class ECopyPreview extends View {
         Layout2Up(int i, int i2) {
         Layout2Up(int i, int i2) {
             Size size = ECopyPreview.this.A4_2Up;
             Size size = ECopyPreview.this.A4_2Up;
             Size size2 = ECopyPreview.this.A4_2UpPage;
             Size size2 = ECopyPreview.this.A4_2UpPage;
-            this.paper = new RectF(0.0f, 0.0f, (float) size.width, (float) size.height);
-            this.page1 = new RectF(30.0f, 32.0f, (float) (size2.width + 30), (float) (size2.height + 32));
-            this.page2 = new RectF(this.page1.right + 35.0f, this.page1.top, this.page1.right + 35.0f + ((float) size2.width), this.page1.bottom);
+            paper = new RectF(0.0f, 0.0f, (float) size.width, (float) size.height);
+            page1 = new RectF(30.0f, 32.0f, (float) (size2.width + 30), (float) (size2.height + 32));
+            page2 = new RectF(this.page1.right + 35.0f, page1.top, page1.right + 35.0f + ((float) size2.width), page1.bottom);
             float f = (float) i;
             float f = (float) i;
             float f2 = (float) i2;
             float f2 = (float) i2;
             float aspectFitScale = getAspectFitScale(f, f2, (float) size.width, (float) size.height, Layout.AspectFit.Min);
             float aspectFitScale = getAspectFitScale(f, f2, (float) size.width, (float) size.height, Layout.AspectFit.Min);
-            scaleRect(aspectFitScale, this.paper);
-            scaleRect(aspectFitScale, this.page1);
-            scaleRect(aspectFitScale, this.page2);
-            this.offset.x = ((int) (f - this.paper.right)) / 2;
-            this.offset.y = ((int) (f2 - this.paper.bottom)) / 2;
+            scaleRect(aspectFitScale, paper);
+            scaleRect(aspectFitScale, page1);
+            scaleRect(aspectFitScale, page2);
+            offset.x = ((int) (f - paper.right)) / 2;
+            offset.y = ((int) (f2 - paper.bottom)) / 2;
         }
         }
 
 
         public Bitmap getBitmap() {
         public Bitmap getBitmap() {
-            Bitmap createBitmap = Bitmap.createBitmap((int) this.paper.width(), (int) this.paper.height(), Bitmap.Config.ARGB_8888);
+            Bitmap createBitmap = Bitmap.createBitmap((int) paper.width(), (int) paper.height(), Bitmap.Config.ARGB_8888);
             Canvas canvas = new Canvas(createBitmap);
             Canvas canvas = new Canvas(createBitmap);
             ECopyPreview.this.paperDrawable.setBounds(0, 0, createBitmap.getWidth(), createBitmap.getHeight());
             ECopyPreview.this.paperDrawable.setBounds(0, 0, createBitmap.getWidth(), createBitmap.getHeight());
             ECopyPreview.this.paperDrawable.draw(canvas);
             ECopyPreview.this.paperDrawable.draw(canvas);
-            Bitmap createBitmap2 = Bitmap.createBitmap((int) this.page1.width(), (int) this.page1.height(), Bitmap.Config.ARGB_8888);
+            Bitmap createBitmap2 = Bitmap.createBitmap((int) page1.width(), (int) page1.height(), Bitmap.Config.ARGB_8888);
             new Canvas(createBitmap2).drawColor(-3355444);
             new Canvas(createBitmap2).drawColor(-3355444);
-            Bitmap bitmap = this.page1Bitmap;
+            Bitmap bitmap = page1Bitmap;
             if (bitmap == null) {
             if (bitmap == null) {
                 bitmap = createBitmap2;
                 bitmap = createBitmap2;
             }
             }
-            canvas.drawBitmap(bitmap, (Rect) null, this.page1, (Paint) null);
-            canvas.drawBitmap(createBitmap2, (Rect) null, this.page2, (Paint) null);
+            canvas.drawBitmap(bitmap, (Rect) null, page1, (Paint) null);
+            canvas.drawBitmap(createBitmap2, (Rect) null, page2, (Paint) null);
             return createBitmap;
             return createBitmap;
         }
         }
 
 
         private float getScanImageScale(int i, int i2) {
         private float getScanImageScale(int i, int i2) {
-            this.imageScale = getAspectFitScale(this.page1.width(), this.page1.height(), (float) i, (float) i2, Layout.AspectFit.Min);
-            return this.imageScale;
+            imageScale = getAspectFitScale(this.page1.width(), page1.height(), (float) i, (float) i2, Layout.AspectFit.Min);
+            return imageScale;
         }
         }
 
 
         private void setScanImage(Bitmap bitmap) {
         private void setScanImage(Bitmap bitmap) {
-            Rect rect = new Rect((int) this.copyFrame.left, (int) this.copyFrame.top, (int) this.copyFrame.right, (int) this.copyFrame.bottom);
-            this.page1Bitmap = Bitmap.createBitmap((int) this.page1.width(), (int) this.page1.height(), Bitmap.Config.ARGB_8888);
+            Rect rect = new Rect((int) copyFrame.left, (int) copyFrame.top, (int) copyFrame.right, (int) copyFrame.bottom);
+            page1Bitmap = Bitmap.createBitmap((int) page1.width(), (int) page1.height(), Bitmap.Config.ARGB_8888);
             Canvas canvas = new Canvas(this.page1Bitmap);
             Canvas canvas = new Canvas(this.page1Bitmap);
             canvas.drawBitmap(bitmap, rect, new RectF(0.0f, 0.0f, (float) canvas.getWidth(), (float) canvas.getHeight()), (Paint) null);
             canvas.drawBitmap(bitmap, rect, new RectF(0.0f, 0.0f, (float) canvas.getWidth(), (float) canvas.getHeight()), (Paint) null);
         }
         }
@@ -660,12 +660,12 @@ public class ECopyPreview extends View {
         }
         }
 
 
         private void setPaperFrame(RectF rectF) {
         private void setPaperFrame(RectF rectF) {
-            this.copyFrame = new RectF(rectF);
-            scaleRect(this.imageScale, this.copyFrame);
+            copyFrame = new RectF(rectF);
+            scaleRect(this.imageScale, copyFrame);
         }
         }
 
 
         private RectF getPaperRect() {
         private RectF getPaperRect() {
-            return new RectF(0.0f, 0.0f, this.paper.width(), this.paper.height());
+            return new RectF(0.0f, 0.0f, paper.width(), paper.height());
         }
         }
     }
     }
 }
 }

+ 17 - 17
app/src/main/java/epson/print/copy/Component/ecopycomponent/PreviewScanTask.java

@@ -31,12 +31,12 @@ class PreviewScanTask extends AsyncTask<Void, Void, Void> implements IScanContro
     }
     }
 
 
     public PreviewScanTask(ECopyPreview eCopyPreview, ECopyComponent.ICopyStatusListener iCopyStatusListener) {
     public PreviewScanTask(ECopyPreview eCopyPreview, ECopyComponent.ICopyStatusListener iCopyStatusListener) {
-        this.copyPreview = eCopyPreview;
-        this.statusListener = iCopyStatusListener;
+        copyPreview = eCopyPreview;
+        statusListener = iCopyStatusListener;
     }
     }
 
 
     private void setPropertyValue(int i, Object obj) {
     private void setPropertyValue(int i, Object obj) {
-        this.properties.put(Integer.valueOf(i), obj);
+        properties.put(Integer.valueOf(i), obj);
     }
     }
 
 
     public ECopyComponent.ICopyCancelRequest start() {
     public ECopyComponent.ICopyCancelRequest start() {
@@ -51,14 +51,14 @@ class PreviewScanTask extends AsyncTask<Void, Void, Void> implements IScanContro
     }
     }
 
 
     public void setSystemSettings(ECopyComponent.ICopySystemSettings iCopySystemSettings) {
     public void setSystemSettings(ECopyComponent.ICopySystemSettings iCopySystemSettings) {
-        this.systemSettings = iCopySystemSettings;
+        systemSettings = iCopySystemSettings;
     }
     }
 
 
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
         int i;
         int i;
-        this.optionContext = eCopyOptionContext;
+        optionContext = eCopyOptionContext;
         if (this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XScale).getSelectedChoice() != ECopyOptionItem.ECopyOptionItemChoice.XScale_Autofit) {
         if (this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XScale).getSelectedChoice() != ECopyOptionItem.ECopyOptionItemChoice.XScale_Autofit) {
-            ECopyOptionItem copyOptionItemOf = this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize);
+            ECopyOptionItem copyOptionItemOf = optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize);
             switch (copyOptionItemOf.getSelectedChoice()) {
             switch (copyOptionItemOf.getSelectedChoice()) {
                 case PrintMediaSize_A4:
                 case PrintMediaSize_A4:
                     i = IScanController.CPPREV_VALUE_SCAN_COPYFRAME_A4;
                     i = IScanController.CPPREV_VALUE_SCAN_COPYFRAME_A4;
@@ -84,7 +84,7 @@ class PreviewScanTask extends AsyncTask<Void, Void, Void> implements IScanContro
             }
             }
         }
         }
         i = IScanController.CPPREV_VALUE_SCAN_COPYFRAME_AUTOFIT;
         i = IScanController.CPPREV_VALUE_SCAN_COPYFRAME_AUTOFIT;
-        ECopyComponent.ECopyType copyType = this.optionContext.getCopyType();
+        ECopyComponent.ECopyType copyType = optionContext.getCopyType();
         if (copyType == ECopyComponent.ECopyType.A4_2up || copyType == ECopyComponent.ECopyType.A4_2up_Book) {
         if (copyType == ECopyComponent.ECopyType.A4_2up || copyType == ECopyComponent.ECopyType.A4_2up_Book) {
             i = IScanController.CPPREV_VALUE_SCAN_COPYFRAME_A4;
             i = IScanController.CPPREV_VALUE_SCAN_COPYFRAME_A4;
         } else if (copyType == ECopyComponent.ECopyType.B5_2up || copyType == ECopyComponent.ECopyType.B5_2up_Book) {
         } else if (copyType == ECopyComponent.ECopyType.B5_2up || copyType == ECopyComponent.ECopyType.B5_2up_Book) {
@@ -96,29 +96,29 @@ class PreviewScanTask extends AsyncTask<Void, Void, Void> implements IScanContro
     }
     }
 
 
     protected Void doInBackground(Void... voidArr) {
     protected Void doInBackground(Void... voidArr) {
-        setPropertyValue(4, this.systemSettings.getPrinterIPAddress());
+        setPropertyValue(4, systemSettings.getPrinterIPAddress());
         EScanDevice.nativeStartScan(this);
         EScanDevice.nativeStartScan(this);
         return null;
         return null;
     }
     }
 
 
     public int getIntegerValue(int i) {
     public int getIntegerValue(int i) {
-        return ((Integer) this.properties.get(Integer.valueOf(i))).intValue();
+        return ((Integer) properties.get(Integer.valueOf(i))).intValue();
     }
     }
 
 
     public String getStringValue(int i) {
     public String getStringValue(int i) {
-        return (String) this.properties.get(Integer.valueOf(i));
+        return (String) properties.get(Integer.valueOf(i));
     }
     }
 
 
     public boolean isCancelRequested() {
     public boolean isCancelRequested() {
         boolean z;
         boolean z;
         synchronized (this) {
         synchronized (this) {
-            z = this.cancelRequested;
+            z = cancelRequested;
         }
         }
         return z;
         return z;
     }
     }
 
 
     public void setScanStatusChanged(final int i, final int i2) {
     public void setScanStatusChanged(final int i, final int i2) {
-        ((Activity) this.copyPreview.getContext()).runOnUiThread(new Runnable() {
+        ((Activity) copyPreview.getContext()).runOnUiThread(new Runnable() {
             public void run() {
             public void run() {
                 ECopyComponent.ICopyStatusListener.CopyTaskResult copyTaskResult;
                 ECopyComponent.ICopyStatusListener.CopyTaskResult copyTaskResult;
                 switch (i) {
                 switch (i) {
@@ -160,7 +160,7 @@ class PreviewScanTask extends AsyncTask<Void, Void, Void> implements IScanContro
     }
     }
 
 
     public void setScanImageSize(int i, int i2) {
     public void setScanImageSize(int i, int i2) {
-        this.copyPreview.calculateScanImageSize(i, i2, new ECopyPreview.ScanImageSizeCalculator() {
+        copyPreview.calculateScanImageSize(i, i2, new ECopyPreview.ScanImageSizeCalculator() {
             public void onScanImageSize(int i, int i2, float f) {
             public void onScanImageSize(int i, int i2, float f) {
                 PreviewScanTask previewScanTask = PreviewScanTask.this;
                 PreviewScanTask previewScanTask = PreviewScanTask.this;
                 previewScanTask.scale = f;
                 previewScanTask.scale = f;
@@ -174,11 +174,11 @@ class PreviewScanTask extends AsyncTask<Void, Void, Void> implements IScanContro
     public void setScanImageBlockReceived(int[] iArr, int i, int i2, int i3, int i4) {
     public void setScanImageBlockReceived(int[] iArr, int i, int i2, int i3, int i4) {
         Bitmap createBitmap = Bitmap.createBitmap(iArr, i3, i4, Bitmap.Config.ARGB_8888);
         Bitmap createBitmap = Bitmap.createBitmap(iArr, i3, i4, Bitmap.Config.ARGB_8888);
         Matrix matrix = new Matrix();
         Matrix matrix = new Matrix();
-        float f = this.scale;
+        float f = scale;
         matrix.postScale(f, f);
         matrix.postScale(f, f);
-        float f2 = this.scale;
+        float f2 = scale;
         matrix.postTranslate(((float) i) * f2, ((float) i2) * f2);
         matrix.postTranslate(((float) i) * f2, ((float) i2) * f2);
-        this.canvas.drawBitmap(createBitmap, matrix, (Paint) null);
+        canvas.drawBitmap(createBitmap, matrix, (Paint) null);
     }
     }
 
 
     public void setCopyFrameSize(int i, int i2, int i3, int i4) {
     public void setCopyFrameSize(int i, int i2, int i3, int i4) {
@@ -188,6 +188,6 @@ class PreviewScanTask extends AsyncTask<Void, Void, Void> implements IScanContro
                 rectF = new RectF();
                 rectF = new RectF();
             }
             }
         }
         }
-        this.copyPreview.setPaperFrame(rectF);
+        copyPreview.setPaperFrame(rectF);
     }
     }
 }
 }

+ 10 - 10
app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyGetOptionTask.java

@@ -30,8 +30,8 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
     }
     }
 
 
     public RemoteCopyGetOptionTask(ECopyComponent.ECopyType eCopyType, ECopyComponent.ICopyOptionContextListener iCopyOptionContextListener) {
     public RemoteCopyGetOptionTask(ECopyComponent.ECopyType eCopyType, ECopyComponent.ICopyOptionContextListener iCopyOptionContextListener) {
-        this.copyType = eCopyType;
-        this.contextListener = iCopyOptionContextListener;
+        copyType = eCopyType;
+        contextListener = iCopyOptionContextListener;
     }
     }
 
 
     public ECopyComponent.ICopyCancelRequest start() {
     public ECopyComponent.ICopyCancelRequest start() {
@@ -40,15 +40,15 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
     }
     }
 
 
     public void setSystemSettings(ECopyComponent.ICopySystemSettings iCopySystemSettings) {
     public void setSystemSettings(ECopyComponent.ICopySystemSettings iCopySystemSettings) {
-        this.systemSettings = iCopySystemSettings;
+        systemSettings = iCopySystemSettings;
     }
     }
 
 
     public void setRequestConnectionTimeout(int i) {
     public void setRequestConnectionTimeout(int i) {
-        this.operation.setRequestConnectionTimeout(i);
+        operation.setRequestConnectionTimeout(i);
     }
     }
 
 
     public void setClientID(String str) {
     public void setClientID(String str) {
-        this.clientID = str;
+        clientID = str;
     }
     }
 
 
     private Result getErrorResult(ERemoteOperation.ERemoteOperationResult eRemoteOperationResult) {
     private Result getErrorResult(ERemoteOperation.ERemoteOperationResult eRemoteOperationResult) {
@@ -63,7 +63,7 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
 
 
     private Result checkDeviceError() {
     private Result checkDeviceError() {
         Result result = new Result();
         Result result = new Result();
-        result.copyType = this.copyType;
+        result.copyType = copyType;
         ERemoteDevice eRemoteDevice = new ERemoteDevice();
         ERemoteDevice eRemoteDevice = new ERemoteDevice();
         eRemoteDevice.setHostIP(this.operation.getHostIP());
         eRemoteDevice.setHostIP(this.operation.getHostIP());
         eRemoteDevice.setRequestConnectionTimeout(this.operation.getRequestConnectionTimeout());
         eRemoteDevice.setRequestConnectionTimeout(this.operation.getRequestConnectionTimeout());
@@ -117,14 +117,14 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
     }
     }
 
 
     protected Result doInBackground(Void... voidArr) {
     protected Result doInBackground(Void... voidArr) {
-        this.operation.setHostIP(this.systemSettings.getPrinterIPAddress());
+        operation.setHostIP(this.systemSettings.getPrinterIPAddress());
         Result checkDeviceError = checkDeviceError();
         Result checkDeviceError = checkDeviceError();
         if (checkDeviceError != null) {
         if (checkDeviceError != null) {
             return checkDeviceError;
             return checkDeviceError;
         }
         }
         Result result = new Result();
         Result result = new Result();
-        result.copyType = this.copyType;
-        ERemoteCopy.ERemoteCopyOptionsResult selectableOptions = this.operation.getSelectableOptions();
+        result.copyType = copyType;
+        ERemoteCopy.ERemoteCopyOptionsResult selectableOptions = operation.getSelectableOptions();
         if (selectableOptions.success()) {
         if (selectableOptions.success()) {
             result.optionContext = new ECopyOptionContext(result.copyType);
             result.optionContext = new ECopyOptionContext(result.copyType);
             result.optionContext.setCopyOptionsResult(selectableOptions);
             result.optionContext.setCopyOptionsResult(selectableOptions);
@@ -157,6 +157,6 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
     }
     }
 
 
     protected void onPostExecute(Result result) {
     protected void onPostExecute(Result result) {
-        this.contextListener.onCopyOptionContextCreated(result.copyType, result.optionContext, result.error);
+        contextListener.onCopyOptionContextCreated(result.copyType, result.optionContext, result.error);
     }
     }
 }
 }

+ 11 - 11
app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyPhotoGetOptionTask.java

@@ -25,8 +25,8 @@ class RemoteCopyPhotoGetOptionTask extends AsyncTask<Void, Void, Result> impleme
     }
     }
 
 
     public RemoteCopyPhotoGetOptionTask(ECopyComponent.ECopyType eCopyType, ECopyComponent.ICopyOptionContextListener iCopyOptionContextListener) {
     public RemoteCopyPhotoGetOptionTask(ECopyComponent.ECopyType eCopyType, ECopyComponent.ICopyOptionContextListener iCopyOptionContextListener) {
-        this.copyType = eCopyType;
-        this.contextListener = iCopyOptionContextListener;
+        copyType = eCopyType;
+        contextListener = iCopyOptionContextListener;
     }
     }
 
 
     public ECopyComponent.ICopyCancelRequest start() {
     public ECopyComponent.ICopyCancelRequest start() {
@@ -35,26 +35,26 @@ class RemoteCopyPhotoGetOptionTask extends AsyncTask<Void, Void, Result> impleme
     }
     }
 
 
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
-        this.optionContext = eCopyOptionContext;
+        optionContext = eCopyOptionContext;
     }
     }
 
 
     public void setSystemSettings(ECopyComponent.ICopySystemSettings iCopySystemSettings) {
     public void setSystemSettings(ECopyComponent.ICopySystemSettings iCopySystemSettings) {
-        this.systemSettings = iCopySystemSettings;
+        systemSettings = iCopySystemSettings;
     }
     }
 
 
     public void setRequestConnectionTimeout(int i) {
     public void setRequestConnectionTimeout(int i) {
-        this.operation.setRequestConnectionTimeout(i);
+        operation.setRequestConnectionTimeout(i);
     }
     }
 
 
     public void setClientID(String str) {
     public void setClientID(String str) {
-        this.clientID = str;
+        clientID = str;
     }
     }
 
 
     protected Result doInBackground(Void... voidArr) {
     protected Result doInBackground(Void... voidArr) {
-        this.operation.setHostIP(this.systemSettings.getPrinterIPAddress());
+        operation.setHostIP(this.systemSettings.getPrinterIPAddress());
         Result result = new Result();
         Result result = new Result();
-        result.copyType = this.copyType;
-        final ERemoteCopyPhoto.ERemoteCopyPhotoOptionResult selectableOptions = this.operation.getSelectableOptions();
+        result.copyType = copyType;
+        final ERemoteCopyPhoto.ERemoteCopyPhotoOptionResult selectableOptions = operation.getSelectableOptions();
         if (!selectableOptions.success()) {
         if (!selectableOptions.success()) {
             if (selectableOptions.isNull(ERemoteOperation.ERemoteParam.success)) {
             if (selectableOptions.isNull(ERemoteOperation.ERemoteParam.success)) {
                 result.error = ECopyComponent.ICopyOptionContextListener.ContextCreationError.ErrorCommunication;
                 result.error = ECopyComponent.ICopyOptionContextListener.ContextCreationError.ErrorCommunication;
@@ -63,7 +63,7 @@ class RemoteCopyPhotoGetOptionTask extends AsyncTask<Void, Void, Result> impleme
             }
             }
             return result;
             return result;
         }
         }
-        ERemoteCopyPhoto.ERemoteCopyPhotoOptionResult options = this.operation.getOptions(new ERemoteCopyPhoto.IRemoteCopyPhotoOptionsParameter() {
+        ERemoteCopyPhoto.ERemoteCopyPhotoOptionResult options = operation.getOptions(new ERemoteCopyPhoto.IRemoteCopyPhotoOptionsParameter() {
             public boolean default_as_fixed() {
             public boolean default_as_fixed() {
                 return true;
                 return true;
             }
             }
@@ -136,6 +136,6 @@ class RemoteCopyPhotoGetOptionTask extends AsyncTask<Void, Void, Result> impleme
     }
     }
 
 
     protected void onPostExecute(Result result) {
     protected void onPostExecute(Result result) {
-        this.contextListener.onCopyOptionContextCreated(result.copyType, result.optionContext, result.error);
+        contextListener.onCopyOptionContextCreated(result.copyType, result.optionContext, result.error);
     }
     }
 }
 }

+ 23 - 23
app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyPhotoSetOptionTask.java

@@ -28,8 +28,8 @@ class RemoteCopyPhotoSetOptionTask extends AsyncTask<Void, Void, Result> impleme
     }
     }
 
 
     public RemoteCopyPhotoSetOptionTask(ECopyOptionItem eCopyOptionItem, ECopyComponent.ICopyOptionListener iCopyOptionListener) {
     public RemoteCopyPhotoSetOptionTask(ECopyOptionItem eCopyOptionItem, ECopyComponent.ICopyOptionListener iCopyOptionListener) {
-        this.selectedItem = eCopyOptionItem;
-        this.optionChangedListener = iCopyOptionListener;
+        selectedItem = eCopyOptionItem;
+        optionChangedListener = iCopyOptionListener;
     }
     }
 
 
     public ECopyComponent.ICopyCancelRequest start() {
     public ECopyComponent.ICopyCancelRequest start() {
@@ -38,42 +38,42 @@ class RemoteCopyPhotoSetOptionTask extends AsyncTask<Void, Void, Result> impleme
     }
     }
 
 
     public void setSystemSettings(ECopyComponent.ICopySystemSettings iCopySystemSettings) {
     public void setSystemSettings(ECopyComponent.ICopySystemSettings iCopySystemSettings) {
-        this.systemSettings = iCopySystemSettings;
+        systemSettings = iCopySystemSettings;
     }
     }
 
 
     public void setRequestConnectionTimeout(int i) {
     public void setRequestConnectionTimeout(int i) {
-        this.operation.setRequestConnectionTimeout(i);
+        operation.setRequestConnectionTimeout(i);
     }
     }
 
 
     public void setClientID(String str) {
     public void setClientID(String str) {
-        this.clientID = str;
+        clientID = str;
     }
     }
 
 
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
-        this.optionContext = eCopyOptionContext;
-        this.replacedItem = this.optionContext.replace(new ECopyOptionItem(this.selectedItem));
-        this.changableParams = new ArrayList<>();
-        this.changableParams.add(ERemoteOperation.ERemoteParam.x_borderless);
-        this.changableParams.add(ERemoteOperation.ERemoteParam.print_media_size);
-        this.changableParams.add(ERemoteOperation.ERemoteParam.print_media_type);
-        this.changableParams.add(ERemoteOperation.ERemoteParam.x_apf);
-        this.changableParams.add(ERemoteOperation.ERemoteParam.print_quality);
-        this.changableParams.add(ERemoteOperation.ERemoteParam.print_media_source);
+        optionContext = eCopyOptionContext;
+        replacedItem = optionContext.replace(new ECopyOptionItem(this.selectedItem));
+        changableParams = new ArrayList<>();
+        changableParams.add(ERemoteOperation.ERemoteParam.x_borderless);
+        changableParams.add(ERemoteOperation.ERemoteParam.print_media_size);
+        changableParams.add(ERemoteOperation.ERemoteParam.print_media_type);
+        changableParams.add(ERemoteOperation.ERemoteParam.x_apf);
+        changableParams.add(ERemoteOperation.ERemoteParam.print_quality);
+        changableParams.add(ERemoteOperation.ERemoteParam.print_media_source);
     }
     }
 
 
     public Result getResultLocalOptions() {
     public Result getResultLocalOptions() {
         Result result = new Result();
         Result result = new Result();
-        result.selectedItem = this.selectedItem;
+        result.selectedItem = selectedItem;
         result.changedItems = new ArrayList<>();
         result.changedItems = new ArrayList<>();
         return result;
         return result;
     }
     }
 
 
     protected Result doInBackground(Void... voidArr) {
     protected Result doInBackground(Void... voidArr) {
-        this.operation.setHostIP(this.systemSettings.getPrinterIPAddress());
+        operation.setHostIP(this.systemSettings.getPrinterIPAddress());
         if (this.selectedItem.isLocalOption) {
         if (this.selectedItem.isLocalOption) {
             return getResultLocalOptions();
             return getResultLocalOptions();
         }
         }
-        ERemoteCopyPhoto.ERemoteCopyPhotoOptionResult options = this.operation.getOptions(new ERemoteCopyPhoto.IRemoteCopyPhotoOptionsParameter() {
+        ERemoteCopyPhoto.ERemoteCopyPhotoOptionResult options = operation.getOptions(new ERemoteCopyPhoto.IRemoteCopyPhotoOptionsParameter() {
             public boolean default_as_fixed() {
             public boolean default_as_fixed() {
                 return true;
                 return true;
             }
             }
@@ -126,16 +126,16 @@ class RemoteCopyPhotoSetOptionTask extends AsyncTask<Void, Void, Result> impleme
             }
             }
         });
         });
         Result result = new Result();
         Result result = new Result();
-        result.selectedItem = this.selectedItem;
+        result.selectedItem = selectedItem;
         if (options.success()) {
         if (options.success()) {
-            this.optionContext.setCopyOptionsResult(options);
+            optionContext.setCopyOptionsResult(options);
             result.changedItems = new ArrayList<>();
             result.changedItems = new ArrayList<>();
-            Iterator<ERemoteOperation.ERemoteParam> it = this.changableParams.iterator();
+            Iterator<ERemoteOperation.ERemoteParam> it = changableParams.iterator();
             while (it.hasNext()) {
             while (it.hasNext()) {
                 ECopyOptionItem createOptionItem = ECopyOptionItem.createOptionItem(it.next(), options);
                 ECopyOptionItem createOptionItem = ECopyOptionItem.createOptionItem(it.next(), options);
                 if (this.optionContext.isChanged(createOptionItem)) {
                 if (this.optionContext.isChanged(createOptionItem)) {
                     result.changedItems.add(createOptionItem);
                     result.changedItems.add(createOptionItem);
-                    this.optionContext.replace(createOptionItem);
+                    optionContext.replace(createOptionItem);
                 }
                 }
             }
             }
             Iterator<ECopyOptionItem> it2 = result.changedItems.iterator();
             Iterator<ECopyOptionItem> it2 = result.changedItems.iterator();
@@ -162,12 +162,12 @@ class RemoteCopyPhotoSetOptionTask extends AsyncTask<Void, Void, Result> impleme
                 result.error = ECopyComponent.ICopyOptionListener.CopyOptionChangedError.Error;
                 result.error = ECopyComponent.ICopyOptionListener.CopyOptionChangedError.Error;
             }
             }
             result.selectedItem = new ECopyOptionItem(this.replacedItem);
             result.selectedItem = new ECopyOptionItem(this.replacedItem);
-            this.optionContext.replace(this.replacedItem);
+            optionContext.replace(this.replacedItem);
         }
         }
         return result;
         return result;
     }
     }
 
 
     protected void onPostExecute(Result result) {
     protected void onPostExecute(Result result) {
-        this.optionChangedListener.onCopyOptionChanged(result.selectedItem, result.changedItems, result.error);
+        optionChangedListener.onCopyOptionChanged(result.selectedItem, result.changedItems, result.error);
     }
     }
 }
 }

+ 37 - 37
app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyPhotoTask.java

@@ -39,31 +39,31 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
         private void setResult(ERemoteOperation.ERemoteParam eRemoteParam) {
         private void setResult(ERemoteOperation.ERemoteParam eRemoteParam) {
             switch (eRemoteParam) {
             switch (eRemoteParam) {
                 case none:
                 case none:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Succeed;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Succeed;
                     return;
                     return;
                 case success:
                 case success:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Succeed;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Succeed;
                     return;
                     return;
                 case canceled:
                 case canceled:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Canceled;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Canceled;
                     return;
                     return;
                 case busy:
                 case busy:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Busy;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Busy;
                     return;
                     return;
                 case document_error:
                 case document_error:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
                     return;
                     return;
                 case x_failed_communication:
                 case x_failed_communication:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorCommunication;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorCommunication;
                     return;
                     return;
                 case unknown_token:
                 case unknown_token:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
                     return;
                     return;
                 case x_invalid_photo_setting:
                 case x_invalid_photo_setting:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorInvalidOption;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorInvalidOption;
                     return;
                     return;
                 default:
                 default:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
                     return;
                     return;
             }
             }
         }
         }
@@ -82,8 +82,8 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
     }
     }
 
 
     public RemoteCopyPhotoTask(String str, ECopyComponent.ICopyStatusListener iCopyStatusListener) {
     public RemoteCopyPhotoTask(String str, ECopyComponent.ICopyStatusListener iCopyStatusListener) {
-        this.photoSetting = new CopyPhotoSettingHandler(str);
-        this.statusListener = iCopyStatusListener;
+        photoSetting = new CopyPhotoSettingHandler(str);
+        statusListener = iCopyStatusListener;
     }
     }
 
 
     public ECopyComponent.ICopyCancelRequest start() {
     public ECopyComponent.ICopyCancelRequest start() {
@@ -98,23 +98,23 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
     }
     }
 
 
     public void setSystemSettings(ECopyComponent.ICopySystemSettings iCopySystemSettings) {
     public void setSystemSettings(ECopyComponent.ICopySystemSettings iCopySystemSettings) {
-        this.systemSettings = iCopySystemSettings;
+        systemSettings = iCopySystemSettings;
     }
     }
 
 
     public void setRequestConnectionTimeout(int i) {
     public void setRequestConnectionTimeout(int i) {
-        this.operation.setRequestConnectionTimeout(i);
+        operation.setRequestConnectionTimeout(i);
     }
     }
 
 
     public void setClientID(String str) {
     public void setClientID(String str) {
-        this.clientID = str;
+        clientID = str;
     }
     }
 
 
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
-        this.optionContext = eCopyOptionContext;
+        optionContext = eCopyOptionContext;
     }
     }
 
 
     protected void onPreExecute() {
     protected void onPreExecute() {
-        this.cancelParameter = new ERemoteCopy.IRemoteCancelParameter() {
+        cancelParameter = new ERemoteCopy.IRemoteCancelParameter() {
             public String client_id() {
             public String client_id() {
                 return RemoteCopyPhotoTask.this.clientID;
                 return RemoteCopyPhotoTask.this.clientID;
             }
             }
@@ -123,7 +123,7 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
                 return RemoteCopyPhotoTask.this.jobToken;
                 return RemoteCopyPhotoTask.this.jobToken;
             }
             }
         };
         };
-        this.statusParameter = new ERemoteCopy.IRemoteCopyStatusParameter() {
+        statusParameter = new ERemoteCopy.IRemoteCopyStatusParameter() {
             public String client_id() {
             public String client_id() {
                 return RemoteCopyPhotoTask.this.clientID;
                 return RemoteCopyPhotoTask.this.clientID;
             }
             }
@@ -147,18 +147,18 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
                 return arrayList;
                 return arrayList;
             }
             }
         };
         };
-        this.statusListener.onStarted(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy);
+        statusListener.onStarted(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy);
     }
     }
 
 
     protected void onProgressUpdate(Progress... progressArr) {
     protected void onProgressUpdate(Progress... progressArr) {
         Progress progress2 = progressArr[0];
         Progress progress2 = progressArr[0];
-        this.statusListener.onProcessed(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy, progress2.totalPages, progress2.currentPages, progress2.taskProgress, progress2.resumeRequest);
+        statusListener.onProcessed(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy, progress2.totalPages, progress2.currentPages, progress2.taskProgress, progress2.resumeRequest);
     }
     }
 
 
     private void resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
     private void resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
         synchronized (this.progress) {
         synchronized (this.progress) {
-            this.progress.resumeState = resumeState;
-            this.progress.notify();
+            progress.resumeState = resumeState;
+            progress.notify();
         }
         }
     }
     }
 
 
@@ -170,7 +170,7 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
         synchronized (this.progress) {
         synchronized (this.progress) {
             while (this.progress.resumeState == null) {
             while (this.progress.resumeState == null) {
                 try {
                 try {
-                    this.progress.wait(1000);
+                    progress.wait(1000);
                 } catch (InterruptedException e) {
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                     e.printStackTrace();
                 }
                 }
@@ -189,17 +189,17 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
                 i = 15000;
                 i = 15000;
                 break;
                 break;
             case Cancel:
             case Cancel:
-                this.cancelRequested = true;
+                cancelRequested = true;
                 break;
                 break;
         }
         }
-        Progress progress2 = this.progress;
+        Progress progress2 = progress;
         progress2.resumeState = null;
         progress2.resumeState = null;
         progress2.resumeRequest = null;
         progress2.resumeRequest = null;
         return i;
         return i;
     }
     }
 
 
     private ERemoteOperation.ERemoteReasonResult startCopy() {
     private ERemoteOperation.ERemoteReasonResult startCopy() {
-        ERemoteCopy.ERemoteCopyResult copy = this.operation.copy(new ERemoteCopyPhoto.IRemoteCopyPhotoParameter() {
+        ERemoteCopy.ERemoteCopyResult copy = operation.copy(new ERemoteCopyPhoto.IRemoteCopyPhotoParameter() {
             public String client_id() {
             public String client_id() {
                 return RemoteCopyPhotoTask.this.clientID;
                 return RemoteCopyPhotoTask.this.clientID;
             }
             }
@@ -284,13 +284,13 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
             }
             }
         });
         });
         if (copy.success()) {
         if (copy.success()) {
-            this.jobToken = copy.job_token();
+            jobToken = copy.job_token();
         }
         }
         return copy;
         return copy;
     }
     }
 
 
     protected Result doInBackground(Void... voidArr) {
     protected Result doInBackground(Void... voidArr) {
-        this.operation.setHostIP(this.systemSettings.getPrinterIPAddress());
+        operation.setHostIP(this.systemSettings.getPrinterIPAddress());
         if (!this.photoSetting.parse()) {
         if (!this.photoSetting.parse()) {
             return new Result(ERemoteOperation.ERemoteParam.x_invalid_photo_setting);
             return new Result(ERemoteOperation.ERemoteParam.x_invalid_photo_setting);
         }
         }
@@ -308,26 +308,26 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
                 }
                 }
                 z2 = true;
                 z2 = true;
             }
             }
-            final ERemoteCopy.ERemoteCopyStatusResult status = this.operation.getStatus(this.statusParameter);
+            final ERemoteCopy.ERemoteCopyStatusResult status = operation.getStatus(this.statusParameter);
             if (!status.success()) {
             if (!status.success()) {
                 return new Result((ERemoteOperation.ERemoteReasonResult) status);
                 return new Result((ERemoteOperation.ERemoteReasonResult) status);
             }
             }
             Result result2 = new Result(status.job_result());
             Result result2 = new Result(status.job_result());
-            this.progress.totalPages = status.job_print_total_pages();
-            this.progress.currentPages = status.job_print_current_pages();
+            progress.totalPages = status.job_print_total_pages();
+            progress.currentPages = status.job_print_current_pages();
             if (this.progress.currentPages < 1) {
             if (this.progress.currentPages < 1) {
-                this.progress.currentPages = 1;
+                progress.currentPages = 1;
             }
             }
             ERemoteOperation.ERemoteParam job_state = status.job_state();
             ERemoteOperation.ERemoteParam job_state = status.job_state();
             switch (job_state) {
             switch (job_state) {
                 case scanning:
                 case scanning:
-                    this.progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Scanning;
+                    progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Scanning;
                     break;
                     break;
                 case copying:
                 case copying:
-                    this.progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Copying;
+                    progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Copying;
                     break;
                     break;
                 case canceling:
                 case canceling:
-                    this.progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Canceling;
+                    progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Canceling;
                     break;
                     break;
                 case finished:
                 case finished:
                     result = result2;
                     result = result2;
@@ -337,10 +337,10 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
             switch (status.printer_state()) {
             switch (status.printer_state()) {
                 case stopped:
                 case stopped:
                     if (job_state == ERemoteOperation.ERemoteParam.copying || job_state == ERemoteOperation.ERemoteParam.scanning) {
                     if (job_state == ERemoteOperation.ERemoteParam.copying || job_state == ERemoteOperation.ERemoteParam.scanning) {
-                        Progress progress2 = this.progress;
+                        Progress progress2 = progress;
                         progress2.resumeState = null;
                         progress2.resumeState = null;
                         progress2.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Stopped;
                         progress2.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Stopped;
-                        this.progress.resumeRequest = new ECopyComponent.ICopyInvalidateResumeRequest() {
+                        progress.resumeRequest = new ECopyComponent.ICopyInvalidateResumeRequest() {
                             public void invalidate() {
                             public void invalidate() {
                             }
                             }
 
 
@@ -618,6 +618,6 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
     }
     }
 
 
     protected void onPostExecute(Result result) {
     protected void onPostExecute(Result result) {
-        this.statusListener.onFinished(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy, result.taskResult);
+        statusListener.onFinished(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy, result.taskResult);
     }
     }
 }
 }

+ 27 - 27
app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopySetOptionTask.java

@@ -152,8 +152,8 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
     }
     }
 
 
     public RemoteCopySetOptionTask(ECopyOptionItem eCopyOptionItem, ECopyComponent.ICopyOptionListener iCopyOptionListener) {
     public RemoteCopySetOptionTask(ECopyOptionItem eCopyOptionItem, ECopyComponent.ICopyOptionListener iCopyOptionListener) {
-        this.selectedItem = eCopyOptionItem;
-        this.optionChangedListener = iCopyOptionListener;
+        selectedItem = eCopyOptionItem;
+        optionChangedListener = iCopyOptionListener;
     }
     }
 
 
     public static int scaleValue(ECopyOptionItem.ECopyOptionItemChoice eCopyOptionItemChoice) {
     public static int scaleValue(ECopyOptionItem.ECopyOptionItemChoice eCopyOptionItemChoice) {
@@ -166,40 +166,40 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
     }
     }
 
 
     public void setSystemSettings(ECopyComponent.ICopySystemSettings iCopySystemSettings) {
     public void setSystemSettings(ECopyComponent.ICopySystemSettings iCopySystemSettings) {
-        this.systemSettings = iCopySystemSettings;
+        systemSettings = iCopySystemSettings;
     }
     }
 
 
     public void setRequestConnectionTimeout(int i) {
     public void setRequestConnectionTimeout(int i) {
-        this.operation.setRequestConnectionTimeout(i);
+        operation.setRequestConnectionTimeout(i);
     }
     }
 
 
     public void setClientID(String str) {
     public void setClientID(String str) {
-        this.clientID = str;
+        clientID = str;
     }
     }
 
 
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
-        this.optionContext = eCopyOptionContext;
-        this.replacedItem = this.optionContext.replace(new ECopyOptionItem(this.selectedItem));
-        this.changableParams = new ArrayList<>();
-        this.changableParams.add(ERemoteOperation.ERemoteParam.print_media_size);
-        this.changableParams.add(ERemoteOperation.ERemoteParam.print_media_type);
-        this.changableParams.add(ERemoteOperation.ERemoteParam.scan_content_type);
-        this.changableParams.add(ERemoteOperation.ERemoteParam.print_media_source);
-        this.changableParams.add(ERemoteOperation.ERemoteParam.print_quality);
-        this.xscaleMap = getXScaleMap(eCopyOptionContext.copyType);
-        this.copyScaleMap = getCopyMagnificationMap(this.xscaleMap);
+        optionContext = eCopyOptionContext;
+        replacedItem = optionContext.replace(new ECopyOptionItem(this.selectedItem));
+        changableParams = new ArrayList<>();
+        changableParams.add(ERemoteOperation.ERemoteParam.print_media_size);
+        changableParams.add(ERemoteOperation.ERemoteParam.print_media_type);
+        changableParams.add(ERemoteOperation.ERemoteParam.scan_content_type);
+        changableParams.add(ERemoteOperation.ERemoteParam.print_media_source);
+        changableParams.add(ERemoteOperation.ERemoteParam.print_quality);
+        xscaleMap = getXScaleMap(eCopyOptionContext.copyType);
+        copyScaleMap = getCopyMagnificationMap(this.xscaleMap);
     }
     }
 
 
     public Result getResultLocalOptions() {
     public Result getResultLocalOptions() {
         Result result = new Result();
         Result result = new Result();
-        result.selectedItem = this.selectedItem;
+        result.selectedItem = selectedItem;
         result.changedItems = new ArrayList<>();
         result.changedItems = new ArrayList<>();
-        ECopyOptionItem.ECopyOptionItemKey key = this.selectedItem.getKey();
+        ECopyOptionItem.ECopyOptionItemKey key = selectedItem.getKey();
         if (key == ECopyOptionItem.ECopyOptionItemKey.CopyMagnification) {
         if (key == ECopyOptionItem.ECopyOptionItemKey.CopyMagnification) {
             result.changedItems.add(this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XScale));
             result.changedItems.add(this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XScale));
         } else if (key == ECopyOptionItem.ECopyOptionItemKey.XScale) {
         } else if (key == ECopyOptionItem.ECopyOptionItemKey.XScale) {
-            ECopyOptionItem copyOptionItemOf = this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.CopyMagnification);
-            int intValue = this.xscaleMap.get(this.selectedItem.getSelectedChoice()).intValue();
+            ECopyOptionItem copyOptionItemOf = optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.CopyMagnification);
+            int intValue = xscaleMap.get(this.selectedItem.getSelectedChoice()).intValue();
             if (intValue != XScale_Custom_Value) {
             if (intValue != XScale_Custom_Value) {
                 copyOptionItemOf.selectValue(intValue);
                 copyOptionItemOf.selectValue(intValue);
             }
             }
@@ -216,11 +216,11 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
     }
     }
 
 
     protected Result doInBackground(Void... voidArr) {
     protected Result doInBackground(Void... voidArr) {
-        this.operation.setHostIP(this.systemSettings.getPrinterIPAddress());
+        operation.setHostIP(this.systemSettings.getPrinterIPAddress());
         if (this.selectedItem.isLocalOption) {
         if (this.selectedItem.isLocalOption) {
             return getResultLocalOptions();
             return getResultLocalOptions();
         }
         }
-        ERemoteCopy.ERemoteCopyOptionsResult options = this.operation.getOptions(new ERemoteCopy.IRemoteCopyOptionsParameter() {
+        ERemoteCopy.ERemoteCopyOptionsResult options = operation.getOptions(new ERemoteCopy.IRemoteCopyOptionsParameter() {
             public boolean default_as_fixed() {
             public boolean default_as_fixed() {
                 return true;
                 return true;
             }
             }
@@ -304,16 +304,16 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
             }
             }
         });
         });
         Result result = new Result();
         Result result = new Result();
-        result.selectedItem = this.selectedItem;
+        result.selectedItem = selectedItem;
         if (options.success()) {
         if (options.success()) {
-            this.optionContext.setCopyOptionsResult(options);
+            optionContext.setCopyOptionsResult(options);
             result.changedItems = new ArrayList<>();
             result.changedItems = new ArrayList<>();
-            Iterator<ERemoteOperation.ERemoteParam> it = this.changableParams.iterator();
+            Iterator<ERemoteOperation.ERemoteParam> it = changableParams.iterator();
             while (it.hasNext()) {
             while (it.hasNext()) {
                 ECopyOptionItem createOptionItem = ECopyOptionItem.createOptionItem(it.next(), options);
                 ECopyOptionItem createOptionItem = ECopyOptionItem.createOptionItem(it.next(), options);
                 if (this.optionContext.isChanged(createOptionItem)) {
                 if (this.optionContext.isChanged(createOptionItem)) {
                     result.changedItems.add(createOptionItem);
                     result.changedItems.add(createOptionItem);
-                    this.optionContext.replace(createOptionItem);
+                    optionContext.replace(createOptionItem);
                 }
                 }
             }
             }
             if (result.changedItems.size() == 0) {
             if (result.changedItems.size() == 0) {
@@ -326,12 +326,12 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
                 result.error = ECopyComponent.ICopyOptionListener.CopyOptionChangedError.Error;
                 result.error = ECopyComponent.ICopyOptionListener.CopyOptionChangedError.Error;
             }
             }
             result.selectedItem = new ECopyOptionItem(this.replacedItem);
             result.selectedItem = new ECopyOptionItem(this.replacedItem);
-            this.optionContext.replace(this.replacedItem);
+            optionContext.replace(this.replacedItem);
         }
         }
         return result;
         return result;
     }
     }
 
 
     protected void onPostExecute(Result result) {
     protected void onPostExecute(Result result) {
-        this.optionChangedListener.onCopyOptionChanged(result.selectedItem, result.changedItems, result.error);
+        optionChangedListener.onCopyOptionChanged(result.selectedItem, result.changedItems, result.error);
     }
     }
 }
 }

+ 49 - 49
app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyTask.java

@@ -52,40 +52,40 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
         private void setResult(ERemoteOperation.ERemoteParam eRemoteParam) {
         private void setResult(ERemoteOperation.ERemoteParam eRemoteParam) {
             switch (eRemoteParam) {
             switch (eRemoteParam) {
                 case none:
                 case none:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Succeed;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Succeed;
                     return;
                     return;
                 case success:
                 case success:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Succeed;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Succeed;
                     return;
                     return;
                 case canceled:
                 case canceled:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Canceled;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Canceled;
                     return;
                     return;
                 case busy:
                 case busy:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Busy;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Busy;
                     return;
                     return;
                 case illegal_combination:
                 case illegal_combination:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
                     return;
                     return;
                 case memory_full:
                 case memory_full:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
                     return;
                     return;
                 case remove_adf_paper:
                 case remove_adf_paper:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.RemoveAdfPaper;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.RemoveAdfPaper;
                     return;
                     return;
                 case set_adf_paper:
                 case set_adf_paper:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
                     return;
                     return;
                 case document_error:
                 case document_error:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
                     return;
                     return;
                 case x_failed_communication:
                 case x_failed_communication:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorCommunication;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorCommunication;
                     return;
                     return;
                 case unknown_token:
                 case unknown_token:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
                     return;
                     return;
                 default:
                 default:
-                    this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
+                    taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.ErrorOther;
                     return;
                     return;
             }
             }
         }
         }
@@ -172,12 +172,12 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
     }
     }
 
 
     public RemoteCopyTask(CopyMode copyMode2, String str, ECopyComponent.ICopyStatusListener iCopyStatusListener, Context context) {
     public RemoteCopyTask(CopyMode copyMode2, String str, ECopyComponent.ICopyStatusListener iCopyStatusListener, Context context) {
-        this.operation = new ERemoteCopy();
-        this.progress = new Progress();
-        this.statusListener = iCopyStatusListener;
-        this.copyMode = copyMode2;
-        this.recoverJobToken = str;
-        this.mContext = context;
+        operation = new ERemoteCopy();
+        progress = new Progress();
+        statusListener = iCopyStatusListener;
+        copyMode = copyMode2;
+        recoverJobToken = str;
+        mContext = context;
     }
     }
 
 
     public RemoteCopyTask(CopyMode copyMode2, ECopyComponent.ICopyStatusListener iCopyStatusListener, Context context) {
     public RemoteCopyTask(CopyMode copyMode2, ECopyComponent.ICopyStatusListener iCopyStatusListener, Context context) {
@@ -196,23 +196,23 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
     }
     }
 
 
     public void setSystemSettings(ECopyComponent.ICopySystemSettings iCopySystemSettings) {
     public void setSystemSettings(ECopyComponent.ICopySystemSettings iCopySystemSettings) {
-        this.systemSettings = iCopySystemSettings;
+        systemSettings = iCopySystemSettings;
     }
     }
 
 
     public void setRequestConnectionTimeout(int i) {
     public void setRequestConnectionTimeout(int i) {
-        this.operation.setRequestConnectionTimeout(i);
+        operation.setRequestConnectionTimeout(i);
     }
     }
 
 
     public void setClientID(String str) {
     public void setClientID(String str) {
-        this.clientID = str;
+        clientID = str;
     }
     }
 
 
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
-        this.optionContext = eCopyOptionContext;
+        optionContext = eCopyOptionContext;
     }
     }
 
 
     protected void onPreExecute() {
     protected void onPreExecute() {
-        this.cancelParameter = new ERemoteCopy.IRemoteCancelParameter() {
+        cancelParameter = new ERemoteCopy.IRemoteCancelParameter() {
             public String client_id() {
             public String client_id() {
                 return RemoteCopyTask.this.clientID;
                 return RemoteCopyTask.this.clientID;
             }
             }
@@ -221,7 +221,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                 return RemoteCopyTask.this.jobToken;
                 return RemoteCopyTask.this.jobToken;
             }
             }
         };
         };
-        this.statusParameter = new ERemoteCopy.IRemoteCopyStatusParameter() {
+        statusParameter = new ERemoteCopy.IRemoteCopyStatusParameter() {
             public String client_id() {
             public String client_id() {
                 return RemoteCopyTask.this.clientID;
                 return RemoteCopyTask.this.clientID;
             }
             }
@@ -244,18 +244,18 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                 return arrayList;
                 return arrayList;
             }
             }
         };
         };
-        this.statusListener.onStarted(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy);
+        statusListener.onStarted(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy);
     }
     }
 
 
     protected void onProgressUpdate(Progress... progressArr) {
     protected void onProgressUpdate(Progress... progressArr) {
         Progress progress2 = progressArr[0];
         Progress progress2 = progressArr[0];
-        this.statusListener.onProcessed(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy, progress2.totalPages, progress2.currentPages, progress2.taskProgress, progress2.resumeRequest);
+        statusListener.onProcessed(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy, progress2.totalPages, progress2.currentPages, progress2.taskProgress, progress2.resumeRequest);
     }
     }
 
 
     private void resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
     private void resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
         synchronized (this.progress) {
         synchronized (this.progress) {
-            this.progress.resumeState = resumeState;
-            this.progress.notify();
+            progress.resumeState = resumeState;
+            progress.notify();
         }
         }
     }
     }
 
 
@@ -266,15 +266,15 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                 while (true) {
                 while (true) {
                     try {
                     try {
                         if (this.progress.resumeState == null) {
                         if (this.progress.resumeState == null) {
-                            this.progress.wait(1000);
+                            progress.wait(1000);
                             switch (this.operation.getStatus(this.statusParameter).printer_state()) {
                             switch (this.operation.getStatus(this.statusParameter).printer_state()) {
                                 case idle:
                                 case idle:
-                                    this.progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Processing;
+                                    progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Processing;
                                     publishProgress(new Progress[]{this.progress});
                                     publishProgress(new Progress[]{this.progress});
                                     resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState.Cancel);
                                     resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState.Cancel);
                                     continue;
                                     continue;
                                 case processing:
                                 case processing:
-                                    this.progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Processing;
+                                    progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Processing;
                                     publishProgress(new Progress[]{this.progress});
                                     publishProgress(new Progress[]{this.progress});
                                     resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState.ClearError);
                                     resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState.ClearError);
                                     continue;
                                     continue;
@@ -309,11 +309,11 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                                 }
                                 }
                                 break;
                                 break;
                             case Cancel:
                             case Cancel:
-                                this.cancelRequested = true;
+                                cancelRequested = true;
                                 break;
                                 break;
                             case NextPageReady:
                             case NextPageReady:
                             case NextPageNotExist:
                             case NextPageNotExist:
-                                boolean success = this.operation.documentChanged(new ERemoteCopy.IRemoteCopyDocumentChangedParameter() {
+                                boolean success = operation.documentChanged(new ERemoteCopy.IRemoteCopyDocumentChangedParameter() {
                                     public String client_id() {
                                     public String client_id() {
                                         return RemoteCopyTask.this.clientID;
                                         return RemoteCopyTask.this.clientID;
                                     }
                                     }
@@ -328,7 +328,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                                 }).success();
                                 }).success();
                                 break;
                                 break;
                         }
                         }
-                        Progress progress2 = this.progress;
+                        Progress progress2 = progress;
                         progress2.resumeState = null;
                         progress2.resumeState = null;
                         progress2.resumeRequest = null;
                         progress2.resumeRequest = null;
                         return;
                         return;
@@ -414,7 +414,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
     }
     }
 
 
     protected Result doInBackground(Void... voidArr) {
     protected Result doInBackground(Void... voidArr) {
-        this.operation.setHostIP(this.systemSettings.getPrinterIPAddress());
+        operation.setHostIP(this.systemSettings.getPrinterIPAddress());
         ERemoteOperation.ERemoteReasonResult startCopy = startCopy();
         ERemoteOperation.ERemoteReasonResult startCopy = startCopy();
         if (!startCopy.success()) {
         if (!startCopy.success()) {
             return new Result(startCopy);
             return new Result(startCopy);
@@ -429,33 +429,33 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                 }
                 }
                 z2 = true;
                 z2 = true;
             }
             }
-            final ERemoteCopy.ERemoteCopyStatusResult status = this.operation.getStatus(this.statusParameter);
+            final ERemoteCopy.ERemoteCopyStatusResult status = operation.getStatus(this.statusParameter);
             if (!status.success()) {
             if (!status.success()) {
                 sendLog(this.progress.currentPages);
                 sendLog(this.progress.currentPages);
                 return new Result((ERemoteOperation.ERemoteReasonResult) status);
                 return new Result((ERemoteOperation.ERemoteReasonResult) status);
             }
             }
             Result result2 = new Result(status.job_result());
             Result result2 = new Result(status.job_result());
-            this.progress.totalPages = status.job_print_total_pages();
-            this.progress.currentPages = status.job_print_current_pages();
+            progress.totalPages = status.job_print_total_pages();
+            progress.currentPages = status.job_print_current_pages();
             if (this.progress.currentPages < 1) {
             if (this.progress.currentPages < 1) {
-                this.progress.currentPages = 1;
+                progress.currentPages = 1;
             }
             }
             ERemoteOperation.ERemoteParam job_state = status.job_state();
             ERemoteOperation.ERemoteParam job_state = status.job_state();
             switch (job_state) {
             switch (job_state) {
                 case scanning:
                 case scanning:
-                    this.progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Scanning;
+                    progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Scanning;
                     break;
                     break;
                 case copying:
                 case copying:
-                    this.progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Copying;
+                    progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Copying;
                     break;
                     break;
                 case canceling:
                 case canceling:
-                    this.progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Canceling;
+                    progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Canceling;
                     break;
                     break;
                 case nextpaper:
                 case nextpaper:
-                    Progress progress2 = this.progress;
+                    Progress progress2 = progress;
                     progress2.resumeState = null;
                     progress2.resumeState = null;
                     progress2.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Waiting2ndPage;
                     progress2.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Waiting2ndPage;
-                    this.progress.resumeRequest = new ECopyComponent.ICopyInvalidateResumeRequest() {
+                    progress.resumeRequest = new ECopyComponent.ICopyInvalidateResumeRequest() {
                         public void invalidate() {
                         public void invalidate() {
                         }
                         }
 
 
@@ -481,10 +481,10 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
             switch (status.printer_state()) {
             switch (status.printer_state()) {
                 case stopped:
                 case stopped:
                     if (job_state == ERemoteOperation.ERemoteParam.copying || job_state == ERemoteOperation.ERemoteParam.scanning) {
                     if (job_state == ERemoteOperation.ERemoteParam.copying || job_state == ERemoteOperation.ERemoteParam.scanning) {
-                        Progress progress3 = this.progress;
+                        Progress progress3 = progress;
                         progress3.resumeState = null;
                         progress3.resumeState = null;
                         progress3.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Stopped;
                         progress3.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Stopped;
-                        this.progress.resumeRequest = new ECopyComponent.ICopyInvalidateResumeRequest() {
+                        progress.resumeRequest = new ECopyComponent.ICopyInvalidateResumeRequest() {
                             public void invalidate() {
                             public void invalidate() {
                             }
                             }
 
 
@@ -550,8 +550,8 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
     }
     }
 
 
     private void sendLog(int i) {
     private void sendLog(int i) {
-        CopyParams copyParams = this.mCopyParams;
-        Context context = this.mContext;
+        CopyParams copyParams = mCopyParams;
+        Context context = mContext;
         if (context != null && copyParams != null) {
         if (context != null && copyParams != null) {
             CommonLog commonLog = new CommonLog();
             CommonLog commonLog = new CommonLog();
             commonLog.setConnectionType(context);
             commonLog.setConnectionType(context);
@@ -563,6 +563,6 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
     }
     }
 
 
     protected void onPostExecute(Result result) {
     protected void onPostExecute(Result result) {
-        this.statusListener.onFinished(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy, result.taskResult);
+        statusListener.onFinished(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy, result.taskResult);
     }
     }
 }
 }

+ 8 - 8
app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteDeviceTask.java

@@ -29,7 +29,7 @@ class RemoteDeviceTask extends AsyncTask<Void, Void, Result> implements ECopyCom
     }
     }
 
 
     public RemoteDeviceTask(ECopyComponent.ICopyDeviceStatusListener iCopyDeviceStatusListener) {
     public RemoteDeviceTask(ECopyComponent.ICopyDeviceStatusListener iCopyDeviceStatusListener) {
-        this.statusListener = iCopyDeviceStatusListener;
+        statusListener = iCopyDeviceStatusListener;
     }
     }
 
 
     public ECopyComponent.ICopyCancelRequest start() {
     public ECopyComponent.ICopyCancelRequest start() {
@@ -38,19 +38,19 @@ class RemoteDeviceTask extends AsyncTask<Void, Void, Result> implements ECopyCom
     }
     }
 
 
     public void setSystemSettings(ECopyComponent.ICopySystemSettings iCopySystemSettings) {
     public void setSystemSettings(ECopyComponent.ICopySystemSettings iCopySystemSettings) {
-        this.systemSettings = iCopySystemSettings;
+        systemSettings = iCopySystemSettings;
     }
     }
 
 
     public void setRequestConnectionTimeout(int i) {
     public void setRequestConnectionTimeout(int i) {
-        this.operation.setRequestConnectionTimeout(i);
+        operation.setRequestConnectionTimeout(i);
     }
     }
 
 
     public void setClientID(String str) {
     public void setClientID(String str) {
-        this.clientID = str;
+        clientID = str;
     }
     }
 
 
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
-        this.optionContext = eCopyOptionContext;
+        optionContext = eCopyOptionContext;
     }
     }
 
 
     private ECopyComponent.ICopyDeviceStatusListener.DeviceState getDeviceState(ERemoteOperation.ERemoteParam eRemoteParam) {
     private ECopyComponent.ICopyDeviceStatusListener.DeviceState getDeviceState(ERemoteOperation.ERemoteParam eRemoteParam) {
@@ -193,8 +193,8 @@ class RemoteDeviceTask extends AsyncTask<Void, Void, Result> implements ECopyCom
     }
     }
 
 
     protected Result doInBackground(Void... voidArr) {
     protected Result doInBackground(Void... voidArr) {
-        this.operation.setHostIP(this.systemSettings.getPrinterIPAddress());
-        ERemoteDevice.ERemoteDeviceStatusResult status = this.operation.getStatus(new ERemoteOperation.IRemoteStatusParameter() {
+        operation.setHostIP(this.systemSettings.getPrinterIPAddress());
+        ERemoteDevice.ERemoteDeviceStatusResult status = operation.getStatus(new ERemoteOperation.IRemoteStatusParameter() {
             public String client_id() {
             public String client_id() {
                 return RemoteDeviceTask.this.clientID;
                 return RemoteDeviceTask.this.clientID;
             }
             }
@@ -228,6 +228,6 @@ class RemoteDeviceTask extends AsyncTask<Void, Void, Result> implements ECopyCom
     }
     }
 
 
     protected void onPostExecute(Result result) {
     protected void onPostExecute(Result result) {
-        this.statusListener.onDeviceStatus(result.connetion, result.printer, result.scanner, result.printerReasons, result.scannerReasons, result.jobTokens);
+        statusListener.onDeviceStatus(result.connetion, result.printer, result.scanner, result.printerReasons, result.scannerReasons, result.jobTokens);
     }
     }
 }
 }

+ 9 - 9
app/src/main/java/epson/print/copy/Component/eremoteoperation/ERemoteCopy.java

@@ -110,7 +110,7 @@ public class ERemoteCopy extends ERemoteOperation {
             } else if (eRemoteParam != ERemoteOperation.ERemoteParam.print_x_bleed) {
             } else if (eRemoteParam != ERemoteOperation.ERemoteParam.print_x_bleed) {
                 return arrayList;
                 return arrayList;
             } else {
             } else {
-                ERemoteOperation.ERemoteParam eRemoteParam2 = (ERemoteOperation.ERemoteParam) this.request.remoteParam.get(ERemoteOperation.ERemoteParam.print_media_size);
+                ERemoteOperation.ERemoteParam eRemoteParam2 = (ERemoteOperation.ERemoteParam) request.remoteParam.get(ERemoteOperation.ERemoteParam.print_media_size);
                 arrayList.add(ERemoteOperation.ERemoteParam.standard);
                 arrayList.add(ERemoteOperation.ERemoteParam.standard);
                 arrayList.add(ERemoteOperation.ERemoteParam.midium);
                 arrayList.add(ERemoteOperation.ERemoteParam.midium);
                 arrayList.add(ERemoteOperation.ERemoteParam.minimum);
                 arrayList.add(ERemoteOperation.ERemoteParam.minimum);
@@ -136,14 +136,14 @@ public class ERemoteCopy extends ERemoteOperation {
             ArrayList<ERemoteOperation.ERemoteParam> scalePresets;
             ArrayList<ERemoteOperation.ERemoteParam> scalePresets;
 
 
             public ScaleOptions(ArrayList<ERemoteOperation.ERemoteParam> arrayList) {
             public ScaleOptions(ArrayList<ERemoteOperation.ERemoteParam> arrayList) {
-                this.mediaSizeList = arrayList;
+                mediaSizeList = arrayList;
             }
             }
 
 
             public ArrayList<ERemoteOperation.ERemoteParam> scale_options() {
             public ArrayList<ERemoteOperation.ERemoteParam> scale_options() {
-                this.scalePresets = new ArrayList<>();
-                this.scalePresets.add(ERemoteOperation.ERemoteParam.x_scale_autofit);
-                this.scalePresets.add(ERemoteOperation.ERemoteParam.x_scale_fullsize);
-                this.scalePresets.add(ERemoteOperation.ERemoteParam.x_scale_custom);
+                scalePresets = new ArrayList<>();
+                scalePresets.add(ERemoteOperation.ERemoteParam.x_scale_autofit);
+                scalePresets.add(ERemoteOperation.ERemoteParam.x_scale_fullsize);
+                scalePresets.add(ERemoteOperation.ERemoteParam.x_scale_custom);
                 checkPaperSize(ERemoteOperation.ERemoteParam.na_letter_8_5x11in, ERemoteOperation.ERemoteParam.na_index_4x6_4x6in, ERemoteOperation.ERemoteParam.x_scale_letter_to_kg);
                 checkPaperSize(ERemoteOperation.ERemoteParam.na_letter_8_5x11in, ERemoteOperation.ERemoteParam.na_index_4x6_4x6in, ERemoteOperation.ERemoteParam.x_scale_letter_to_kg);
                 checkPaperSize(ERemoteOperation.ERemoteParam.na_index_4x6_4x6in, ERemoteOperation.ERemoteParam.na_letter_8_5x11in, ERemoteOperation.ERemoteParam.x_scale_kg_to_letter);
                 checkPaperSize(ERemoteOperation.ERemoteParam.na_index_4x6_4x6in, ERemoteOperation.ERemoteParam.na_letter_8_5x11in, ERemoteOperation.ERemoteParam.x_scale_kg_to_letter);
                 checkPaperSize(ERemoteOperation.ERemoteParam.na_letter_8_5x11in, ERemoteOperation.ERemoteParam.na_5x7_5x7in, ERemoteOperation.ERemoteParam.x_scale_letter_to_2l);
                 checkPaperSize(ERemoteOperation.ERemoteParam.na_letter_8_5x11in, ERemoteOperation.ERemoteParam.na_5x7_5x7in, ERemoteOperation.ERemoteParam.x_scale_letter_to_2l);
@@ -168,12 +168,12 @@ public class ERemoteCopy extends ERemoteOperation {
                 checkPaperSize(ERemoteOperation.ERemoteParam.iso_a4_210x297mm, ERemoteOperation.ERemoteParam.iso_a5_148x210mm, ERemoteOperation.ERemoteParam.x_scale_a4_to_a5);
                 checkPaperSize(ERemoteOperation.ERemoteParam.iso_a4_210x297mm, ERemoteOperation.ERemoteParam.iso_a5_148x210mm, ERemoteOperation.ERemoteParam.x_scale_a4_to_a5);
                 checkPaperSize(ERemoteOperation.ERemoteParam.iso_a4_210x297mm, ERemoteOperation.ERemoteParam.iso_a3_297x420mm, ERemoteOperation.ERemoteParam.x_scale_a4_to_a3);
                 checkPaperSize(ERemoteOperation.ERemoteParam.iso_a4_210x297mm, ERemoteOperation.ERemoteParam.iso_a3_297x420mm, ERemoteOperation.ERemoteParam.x_scale_a4_to_a3);
                 checkPaperSize(ERemoteOperation.ERemoteParam.na_letter_8_5x11in, ERemoteOperation.ERemoteParam.na_ledger_11x17in, ERemoteOperation.ERemoteParam.x_scale_letter_to_11x17);
                 checkPaperSize(ERemoteOperation.ERemoteParam.na_letter_8_5x11in, ERemoteOperation.ERemoteParam.na_ledger_11x17in, ERemoteOperation.ERemoteParam.x_scale_letter_to_11x17);
-                return this.scalePresets;
+                return scalePresets;
             }
             }
 
 
             private void checkPaperSize(ERemoteOperation.ERemoteParam eRemoteParam, ERemoteOperation.ERemoteParam eRemoteParam2, ERemoteOperation.ERemoteParam eRemoteParam3) {
             private void checkPaperSize(ERemoteOperation.ERemoteParam eRemoteParam, ERemoteOperation.ERemoteParam eRemoteParam2, ERemoteOperation.ERemoteParam eRemoteParam3) {
-                if (this.mediaSizeList.contains(eRemoteParam) && this.mediaSizeList.contains(eRemoteParam2)) {
-                    this.scalePresets.add(eRemoteParam3);
+                if (this.mediaSizeList.contains(eRemoteParam) && mediaSizeList.contains(eRemoteParam2)) {
+                    scalePresets.add(eRemoteParam3);
                 }
                 }
             }
             }
         }
         }

+ 48 - 48
app/src/main/java/epson/print/copy/Component/eremoteoperation/ERemoteOperation.java

@@ -35,19 +35,19 @@ public class ERemoteOperation {
     }
     }
 
 
     public void setHostIP(String str) {
     public void setHostIP(String str) {
-        this.hostIP = new String(str);
+        hostIP = new String(str);
     }
     }
 
 
     public String getHostIP() {
     public String getHostIP() {
-        return this.hostIP;
+        return hostIP;
     }
     }
 
 
     public void setRequestConnectionTimeout(int i) {
     public void setRequestConnectionTimeout(int i) {
-        this.requestConnectionTimeout = i;
+        requestConnectionTimeout = i;
     }
     }
 
 
     public int getRequestConnectionTimeout() {
     public int getRequestConnectionTimeout() {
-        return this.requestConnectionTimeout;
+        return requestConnectionTimeout;
     }
     }
 
 
     public enum ERemoteParam {
     public enum ERemoteParam {
@@ -294,7 +294,7 @@ public class ERemoteOperation {
         public String string;
         public String string;
 
 
         private ERemoteParam(String str) {
         private ERemoteParam(String str) {
-            this.string = str;
+            string = str;
         }
         }
 
 
         public static ERemoteParam stringOf(String str) {
         public static ERemoteParam stringOf(String str) {
@@ -307,7 +307,7 @@ public class ERemoteOperation {
         }
         }
 
 
         public String toString() {
         public String toString() {
-            return this.string;
+            return string;
         }
         }
     }
     }
 
 
@@ -334,7 +334,7 @@ public class ERemoteOperation {
         public String string;
         public String string;
 
 
         private RequestParam(String str) {
         private RequestParam(String str) {
-            this.string = str;
+            string = str;
         }
         }
     }
     }
 
 
@@ -356,24 +356,24 @@ public class ERemoteOperation {
         }
         }
 
 
         public ERemoteOperationResult(JSONObject jSONObject) {
         public ERemoteOperationResult(JSONObject jSONObject) {
-            this.json = jSONObject;
+            json = jSONObject;
         }
         }
 
 
         public String toString() {
         public String toString() {
-            return this.json.toString();
+            return json.toString();
         }
         }
 
 
         public boolean isNull(ERemoteParam eRemoteParam) {
         public boolean isNull(ERemoteParam eRemoteParam) {
-            return this.json.isNull(eRemoteParam.string);
+            return json.isNull(eRemoteParam.string);
         }
         }
 
 
         public void setRemoteRequestBuilder(ERemoteRequestBuilder eRemoteRequestBuilder) {
         public void setRemoteRequestBuilder(ERemoteRequestBuilder eRemoteRequestBuilder) {
-            this.request = eRemoteRequestBuilder;
+            request = eRemoteRequestBuilder;
         }
         }
 
 
         public boolean success() {
         public boolean success() {
             try {
             try {
-                return this.json.getBoolean(ERemoteParam.success.string);
+                return json.getBoolean(ERemoteParam.success.string);
             } catch (Exception e) {
             } catch (Exception e) {
                 e.printStackTrace();
                 e.printStackTrace();
                 return false;
                 return false;
@@ -382,7 +382,7 @@ public class ERemoteOperation {
 
 
         private boolean getBooleanValueOf(ERemoteParam eRemoteParam) {
         private boolean getBooleanValueOf(ERemoteParam eRemoteParam) {
             try {
             try {
-                return this.json.getBoolean(eRemoteParam.string);
+                return json.getBoolean(eRemoteParam.string);
             } catch (Exception e) {
             } catch (Exception e) {
                 e.printStackTrace();
                 e.printStackTrace();
                 return false;
                 return false;
@@ -391,7 +391,7 @@ public class ERemoteOperation {
 
 
         private int getIntValueOf(ERemoteParam eRemoteParam) {
         private int getIntValueOf(ERemoteParam eRemoteParam) {
             try {
             try {
-                return this.json.getInt(eRemoteParam.string);
+                return json.getInt(eRemoteParam.string);
             } catch (Exception e) {
             } catch (Exception e) {
                 e.printStackTrace();
                 e.printStackTrace();
                 return 0;
                 return 0;
@@ -400,7 +400,7 @@ public class ERemoteOperation {
 
 
         private String getStringValueOf(ERemoteParam eRemoteParam) {
         private String getStringValueOf(ERemoteParam eRemoteParam) {
             try {
             try {
-                return this.json.getString(eRemoteParam.string);
+                return json.getString(eRemoteParam.string);
             } catch (Exception e) {
             } catch (Exception e) {
                 e.printStackTrace();
                 e.printStackTrace();
                 return "";
                 return "";
@@ -410,7 +410,7 @@ public class ERemoteOperation {
         private ArrayList<String> getStringsValueOf(ERemoteParam eRemoteParam) {
         private ArrayList<String> getStringsValueOf(ERemoteParam eRemoteParam) {
             ArrayList<String> arrayList = new ArrayList<>();
             ArrayList<String> arrayList = new ArrayList<>();
             try {
             try {
-                for (String trim : this.json.getString(eRemoteParam.string).split(PreferencesConstants.COOKIE_DELIMITER)) {
+                for (String trim : json.getString(eRemoteParam.string).split(PreferencesConstants.COOKIE_DELIMITER)) {
                     arrayList.add(trim.trim());
                     arrayList.add(trim.trim());
                 }
                 }
             } catch (Exception e) {
             } catch (Exception e) {
@@ -432,7 +432,7 @@ public class ERemoteOperation {
         private ERemoteParam getDefaultValueOf(ERemoteParam eRemoteParam) {
         private ERemoteParam getDefaultValueOf(ERemoteParam eRemoteParam) {
             ERemoteParam eRemoteParam2 = ERemoteParam.x_null;
             ERemoteParam eRemoteParam2 = ERemoteParam.x_null;
             try {
             try {
-                JSONObject jSONObject = this.json;
+                JSONObject jSONObject = json;
                 return ERemoteParam.stringOf(jSONObject.getString(eRemoteParam.string + "-default"));
                 return ERemoteParam.stringOf(jSONObject.getString(eRemoteParam.string + "-default"));
             } catch (Exception e) {
             } catch (Exception e) {
                 e.printStackTrace();
                 e.printStackTrace();
@@ -443,7 +443,7 @@ public class ERemoteOperation {
         private ArrayList<ERemoteParam> getOptionsValueOf(ERemoteParam eRemoteParam) {
         private ArrayList<ERemoteParam> getOptionsValueOf(ERemoteParam eRemoteParam) {
             ArrayList<ERemoteParam> arrayList = new ArrayList<>();
             ArrayList<ERemoteParam> arrayList = new ArrayList<>();
             try {
             try {
-                for (String trim : this.json.getString(eRemoteParam.string + "-options").split(PreferencesConstants.COOKIE_DELIMITER)) {
+                for (String trim : json.getString(eRemoteParam.string + "-options").split(PreferencesConstants.COOKIE_DELIMITER)) {
                     ERemoteParam stringOf = ERemoteParam.stringOf(trim.trim());
                     ERemoteParam stringOf = ERemoteParam.stringOf(trim.trim());
                     if (stringOf != ERemoteParam.x_null) {
                     if (stringOf != ERemoteParam.x_null) {
                         arrayList.add(stringOf);
                         arrayList.add(stringOf);
@@ -484,11 +484,11 @@ public class ERemoteOperation {
 
 
         public ERemoteRequest(String str, ArrayList<BasicNameValuePair> arrayList, int i) {
         public ERemoteRequest(String str, ArrayList<BasicNameValuePair> arrayList, int i) {
             try {
             try {
-                this.request = new IAHttpClient.HttpPost(str);
-                this.request.setContentEncoding(CharEncoding.UTF_8);
-                this.request.setContentType(RequestParam.Content_Type.string);
-                this.request.setEntity(IAHttpClient.HttpPost.getUrlEncodedFormEntity(arrayList, CharEncoding.UTF_8));
-                this.timeout = i;
+                request = new IAHttpClient.HttpPost(str);
+                request.setContentEncoding(CharEncoding.UTF_8);
+                request.setContentType(RequestParam.Content_Type.string);
+                request.setEntity(IAHttpClient.HttpPost.getUrlEncodedFormEntity(arrayList, CharEncoding.UTF_8));
+                timeout = i;
             } catch (UnsupportedEncodingException e) {
             } catch (UnsupportedEncodingException e) {
                 e.printStackTrace();
                 e.printStackTrace();
             }
             }
@@ -496,9 +496,9 @@ public class ERemoteOperation {
 
 
         public JSONObject execute() {
         public JSONObject execute() {
             try {
             try {
-                Log.d("ERequest A", this.request.getURI().toString());
+                Log.d("ERequest A", request.getURI().toString());
                 ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
                 ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
-                this.request.getEntity().writeTo(byteArrayOutputStream);
+                request.getEntity().writeTo(byteArrayOutputStream);
                 Log.d("ERequest B", byteArrayOutputStream.toString());
                 Log.d("ERequest B", byteArrayOutputStream.toString());
                 IAHttpClient iAHttpClient = new IAHttpClient();
                 IAHttpClient iAHttpClient = new IAHttpClient();
                 iAHttpClient.setConnectionTimeout(this.timeout);
                 iAHttpClient.setConnectionTimeout(this.timeout);
@@ -525,10 +525,10 @@ public class ERemoteOperation {
         }
         }
 
 
         ERemoteRequestBuilder(String str, RequestParam requestParam, RequestParam requestParam2, RequestParam requestParam3, int i) {
         ERemoteRequestBuilder(String str, RequestParam requestParam, RequestParam requestParam2, RequestParam requestParam3, int i) {
-            this.operation = requestParam;
-            this.version = requestParam2;
-            this.command = requestParam3;
-            this.timeout = i;
+            operation = requestParam;
+            version = requestParam2;
+            command = requestParam3;
+            timeout = i;
             StringBuffer stringBuffer = new StringBuffer();
             StringBuffer stringBuffer = new StringBuffer();
             stringBuffer.append(CommonDefine.SLASH);
             stringBuffer.append(CommonDefine.SLASH);
             stringBuffer.append(RequestParam.remote_operation.string);
             stringBuffer.append(RequestParam.remote_operation.string);
@@ -538,8 +538,8 @@ public class ERemoteOperation {
             stringBuffer.append(requestParam.string);
             stringBuffer.append(requestParam.string);
             stringBuffer.append(CommonDefine.SLASH);
             stringBuffer.append(CommonDefine.SLASH);
             stringBuffer.append(requestParam3.string);
             stringBuffer.append(requestParam3.string);
-            this.requestURI = new StringBuffer(IPAddressUtils.buildURL(RequestParam.HTTP.string, str, stringBuffer.toString()));
-            this.remoteParam = new HashMap<>();
+            requestURI = new StringBuffer(IPAddressUtils.buildURL(RequestParam.HTTP.string, str, stringBuffer.toString()));
+            remoteParam = new HashMap<>();
         }
         }
 
 
         private void deleteLastCharIf(StringBuffer stringBuffer, char c) {
         private void deleteLastCharIf(StringBuffer stringBuffer, char c) {
@@ -576,30 +576,30 @@ public class ERemoteOperation {
         }
         }
 
 
         public void add(ERemoteParam eRemoteParam, boolean z) {
         public void add(ERemoteParam eRemoteParam, boolean z) {
-            this.remoteParam.put(eRemoteParam, new Boolean(z));
-            this.messageBody.add(new BasicNameValuePair(eRemoteParam.string, String.valueOf(z)));
+            remoteParam.put(eRemoteParam, new Boolean(z));
+            messageBody.add(new BasicNameValuePair(eRemoteParam.string, String.valueOf(z)));
         }
         }
 
 
         public void add(ERemoteParam eRemoteParam, int i) {
         public void add(ERemoteParam eRemoteParam, int i) {
-            this.remoteParam.put(eRemoteParam, new Integer(i));
-            this.messageBody.add(new BasicNameValuePair(eRemoteParam.string, String.valueOf(i)));
+            remoteParam.put(eRemoteParam, new Integer(i));
+            messageBody.add(new BasicNameValuePair(eRemoteParam.string, String.valueOf(i)));
         }
         }
 
 
         public void add(ERemoteParam eRemoteParam, int[] iArr) {
         public void add(ERemoteParam eRemoteParam, int[] iArr) {
-            this.remoteParam.put(eRemoteParam, Arrays.asList(new int[][]{iArr}));
+            remoteParam.put(eRemoteParam, Arrays.asList(new int[][]{iArr}));
             StringBuffer stringBuffer = new StringBuffer();
             StringBuffer stringBuffer = new StringBuffer();
             for (int append : iArr) {
             for (int append : iArr) {
                 stringBuffer.append(append);
                 stringBuffer.append(append);
                 stringBuffer.append(PreferencesConstants.COOKIE_DELIMITER);
                 stringBuffer.append(PreferencesConstants.COOKIE_DELIMITER);
             }
             }
             deleteLastCharIf(stringBuffer, ',');
             deleteLastCharIf(stringBuffer, ',');
-            this.messageBody.add(new BasicNameValuePair(eRemoteParam.string, String.valueOf(stringBuffer)));
+            messageBody.add(new BasicNameValuePair(eRemoteParam.string, String.valueOf(stringBuffer)));
         }
         }
 
 
         public void add(ERemoteParam eRemoteParam, String str) {
         public void add(ERemoteParam eRemoteParam, String str) {
             if (!str.equals(ERemoteParam.x_null.string)) {
             if (!str.equals(ERemoteParam.x_null.string)) {
-                this.remoteParam.put(eRemoteParam, str);
-                this.messageBody.add(new BasicNameValuePair(eRemoteParam.string, str));
+                remoteParam.put(eRemoteParam, str);
+                messageBody.add(new BasicNameValuePair(eRemoteParam.string, str));
             }
             }
         }
         }
 
 
@@ -609,19 +609,19 @@ public class ERemoteOperation {
             if (convertValue != null) {
             if (convertValue != null) {
                 valueOf = convertValue.string;
                 valueOf = convertValue.string;
             }
             }
-            this.remoteParam.put(eRemoteParam, valueOf);
-            this.messageBody.add(new BasicNameValuePair(eRemoteParam.string, valueOf));
+            remoteParam.put(eRemoteParam, valueOf);
+            messageBody.add(new BasicNameValuePair(eRemoteParam.string, valueOf));
         }
         }
 
 
         public void add(ERemoteParam eRemoteParam, ERemoteParam eRemoteParam2) {
         public void add(ERemoteParam eRemoteParam, ERemoteParam eRemoteParam2) {
             if (eRemoteParam2 != ERemoteParam.x_null) {
             if (eRemoteParam2 != ERemoteParam.x_null) {
-                this.remoteParam.put(eRemoteParam, eRemoteParam2);
-                this.messageBody.add(new BasicNameValuePair(eRemoteParam.string, eRemoteParam2.string));
+                remoteParam.put(eRemoteParam, eRemoteParam2);
+                messageBody.add(new BasicNameValuePair(eRemoteParam.string, eRemoteParam2.string));
             }
             }
         }
         }
 
 
         public void add(ERemoteParam eRemoteParam, ArrayList<ERemoteParam> arrayList) {
         public void add(ERemoteParam eRemoteParam, ArrayList<ERemoteParam> arrayList) {
-            this.remoteParam.put(eRemoteParam, arrayList);
+            remoteParam.put(eRemoteParam, arrayList);
             StringBuffer stringBuffer = new StringBuffer();
             StringBuffer stringBuffer = new StringBuffer();
             Iterator<ERemoteParam> it = arrayList.iterator();
             Iterator<ERemoteParam> it = arrayList.iterator();
             while (it.hasNext()) {
             while (it.hasNext()) {
@@ -629,22 +629,22 @@ public class ERemoteOperation {
                 stringBuffer.append(PreferencesConstants.COOKIE_DELIMITER);
                 stringBuffer.append(PreferencesConstants.COOKIE_DELIMITER);
             }
             }
             deleteLastCharIf(stringBuffer, ',');
             deleteLastCharIf(stringBuffer, ',');
-            this.messageBody.add(new BasicNameValuePair(eRemoteParam.string, String.valueOf(stringBuffer)));
+            messageBody.add(new BasicNameValuePair(eRemoteParam.string, String.valueOf(stringBuffer)));
         }
         }
 
 
         public void add(ERemoteParam eRemoteParam, List<String> list) {
         public void add(ERemoteParam eRemoteParam, List<String> list) {
-            this.remoteParam.put(eRemoteParam, list);
+            remoteParam.put(eRemoteParam, list);
             StringBuffer stringBuffer = new StringBuffer();
             StringBuffer stringBuffer = new StringBuffer();
             for (String append : list) {
             for (String append : list) {
                 stringBuffer.append(append);
                 stringBuffer.append(append);
                 stringBuffer.append(PreferencesConstants.COOKIE_DELIMITER);
                 stringBuffer.append(PreferencesConstants.COOKIE_DELIMITER);
             }
             }
             deleteLastCharIf(stringBuffer, ',');
             deleteLastCharIf(stringBuffer, ',');
-            this.messageBody.add(new BasicNameValuePair(eRemoteParam.string, String.valueOf(stringBuffer)));
+            messageBody.add(new BasicNameValuePair(eRemoteParam.string, String.valueOf(stringBuffer)));
         }
         }
 
 
         public ERemoteRequest getRemoteRequest() {
         public ERemoteRequest getRemoteRequest() {
-            return new ERemoteRequest(this.requestURI.toString(), this.messageBody, this.timeout);
+            return new ERemoteRequest(this.requestURI.toString(), messageBody, timeout);
         }
         }
     }
     }
 }
 }

+ 28 - 28
app/src/main/java/epson/print/copy/CopyScaleActivity.java

@@ -40,10 +40,10 @@ public class CopyScaleActivity extends ActivityBase {
         setContentView((int) R.layout.copy_scale);
         setContentView((int) R.layout.copy_scale);
         Intent intent = getIntent();
         Intent intent = getIntent();
         if (intent != null) {
         if (intent != null) {
-            this.settingItemKey = intent.getStringExtra("Key");
+            settingItemKey = intent.getStringExtra("Key");
             setActionBar(string(this.settingItemKey), true);
             setActionBar(string(this.settingItemKey), true);
         }
         }
-        this.optionValueChangedListener = new ActivityBase.OptionItemChangedListener() {
+        optionValueChangedListener = new ActivityBase.OptionItemChangedListener() {
             public void onOptionItemChanged(ECopyOptionItem eCopyOptionItem) {
             public void onOptionItemChanged(ECopyOptionItem eCopyOptionItem) {
                 ArrayList arrayList = new ArrayList();
                 ArrayList arrayList = new ArrayList();
                 CopyScaleActivity.this.copyComponent.setCopyOptionItem(eCopyOptionItem);
                 CopyScaleActivity.this.copyComponent.setCopyOptionItem(eCopyOptionItem);
@@ -63,10 +63,10 @@ public class CopyScaleActivity extends ActivityBase {
             ECopyOptionItem next = it.next();
             ECopyOptionItem next = it.next();
             ECopyOptionItem.ECopyOptionItemKey key = next.getKey();
             ECopyOptionItem.ECopyOptionItemKey key = next.getKey();
             if (key == ECopyOptionItem.ECopyOptionItemKey.CopyMagnification) {
             if (key == ECopyOptionItem.ECopyOptionItemKey.CopyMagnification) {
-                this.optionValueMap.put(key, new CopyMagnificationValue(next));
+                optionValueMap.put(key, new CopyMagnificationValue(next));
             }
             }
             if (key.name().equalsIgnoreCase(this.settingItemKey)) {
             if (key.name().equalsIgnoreCase(this.settingItemKey)) {
-                this.optionValueMap.put(key, new XScaleValue(next));
+                optionValueMap.put(key, new XScaleValue(next));
             }
             }
         }
         }
     }
     }
@@ -87,18 +87,18 @@ public class CopyScaleActivity extends ActivityBase {
 
 
         private ScaleAdapter getArrayAdapter(XScaleValue xScaleValue, Context context) {
         private ScaleAdapter getArrayAdapter(XScaleValue xScaleValue, Context context) {
             for (int i = 3; i < xScaleValue.getKeyArray().length; i++) {
             for (int i = 3; i < xScaleValue.getKeyArray().length; i++) {
-                this.presetArray.add(new ScaleInfo(CopyScaleActivity.this.copyType, (ECopyOptionItem.ECopyOptionItemChoice) xScaleValue.choices.get(i)));
+                presetArray.add(new ScaleInfo(CopyScaleActivity.this.copyType, (ECopyOptionItem.ECopyOptionItemChoice) xScaleValue.choices.get(i)));
             }
             }
-            return new ScaleAdapter(context, R.layout.setting_item, this.presetArray);
+            return new ScaleAdapter(context, R.layout.setting_item, presetArray);
         }
         }
 
 
         private void capabilitySetting(ECopyOptionItem eCopyOptionItem, Context context) {
         private void capabilitySetting(ECopyOptionItem eCopyOptionItem, Context context) {
             int i = 0;
             int i = 0;
             while (true) {
             while (true) {
-                if (i >= this.choices.size()) {
+                if (i >= choices.size()) {
                     break;
                     break;
-                } else if (this.selected == this.choices.get(i)) {
-                    this.selectedItemPos = i;
+                } else if (this.selected == choices.get(i)) {
+                    selectedItemPos = i;
                     break;
                     break;
                 } else {
                 } else {
                     i++;
                     i++;
@@ -167,16 +167,16 @@ public class CopyScaleActivity extends ActivityBase {
 
 
             public ScaleAdapter(Context context, int i, ArrayList<ScaleInfo> arrayList) {
             public ScaleAdapter(Context context, int i, ArrayList<ScaleInfo> arrayList) {
                 super(context, i, arrayList);
                 super(context, i, arrayList);
-                this.items = arrayList;
-                this.inflater = (LayoutInflater) context.getSystemService(Service.LAYOUT_INFLATER_SERVICE);
+                items = arrayList;
+                inflater = (LayoutInflater) context.getSystemService(Service.LAYOUT_INFLATER_SERVICE);
             }
             }
 
 
             public View getView(int i, View view, ViewGroup viewGroup) {
             public View getView(int i, View view, ViewGroup viewGroup) {
                 if (view == null) {
                 if (view == null) {
-                    view = this.inflater.inflate(R.layout.setting_item, (ViewGroup) null);
+                    view = inflater.inflate(R.layout.setting_item, (ViewGroup) null);
                 }
                 }
                 ((TextView) view.findViewById(R.id.setting_name)).setText(this.items.get(i).scalePresetName);
                 ((TextView) view.findViewById(R.id.setting_name)).setText(this.items.get(i).scalePresetName);
-                int i2 = this.items.get(i).scaleNum;
+                int i2 = items.get(i).scaleNum;
                 ((TextView) view.findViewById(R.id.setting_value)).setText(String.valueOf(i2) + " %");
                 ((TextView) view.findViewById(R.id.setting_value)).setText(String.valueOf(i2) + " %");
                 if (i == XScaleValue.this.selectedItemPos - 3) {
                 if (i == XScaleValue.this.selectedItemPos - 3) {
                     ((ImageView) view.findViewById(R.id.setting_active_icon)).setVisibility(0);
                     ((ImageView) view.findViewById(R.id.setting_active_icon)).setVisibility(0);
@@ -192,8 +192,8 @@ public class CopyScaleActivity extends ActivityBase {
             String scalePresetName;
             String scalePresetName;
 
 
             ScaleInfo(ECopyComponent.ECopyType eCopyType, ECopyOptionItem.ECopyOptionItemChoice eCopyOptionItemChoice) {
             ScaleInfo(ECopyComponent.ECopyType eCopyType, ECopyOptionItem.ECopyOptionItemChoice eCopyOptionItemChoice) {
-                this.scalePresetName = CopyScaleActivity.this.string(eCopyOptionItemChoice.name());
-                this.scaleNum = CopyScaleActivity.this.copyComponent.getCopyValue(eCopyType, eCopyOptionItemChoice);
+                scalePresetName = CopyScaleActivity.this.string(eCopyOptionItemChoice.name());
+                scaleNum = CopyScaleActivity.this.copyComponent.getCopyValue(eCopyType, eCopyOptionItemChoice);
             }
             }
         }
         }
     }
     }
@@ -207,15 +207,15 @@ public class CopyScaleActivity extends ActivityBase {
         }
         }
 
 
         private void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
         private void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
-            this.optionItem = eCopyOptionItem;
-            this.editText = (TextView) CopyScaleActivity.this.findViewById(i);
-            this.value = eCopyOptionItem.getSelectedValue();
+            optionItem = eCopyOptionItem;
+            editText = (TextView) CopyScaleActivity.this.findViewById(i);
+            value = eCopyOptionItem.getSelectedValue();
             if (this.value == ECopyOptionItem.CopyMagnificationAutofitValue) {
             if (this.value == ECopyOptionItem.CopyMagnificationAutofitValue) {
-                this.editText.setText("---");
+                editText.setText("---");
             } else {
             } else {
-                this.editText.setText(String.valueOf(this.value));
+                editText.setText(String.valueOf(this.value));
             }
             }
-            this.editText.setEnabled(eCopyOptionItem.isEnabled());
+            editText.setEnabled(eCopyOptionItem.isEnabled());
         }
         }
 
 
         private void clickCustomScale() {
         private void clickCustomScale() {
@@ -278,8 +278,8 @@ public class CopyScaleActivity extends ActivityBase {
 
 
         private void onDismissDialog() {
         private void onDismissDialog() {
             MotionEvent obtain = MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis() + 10, 1, 0.0f, 0.0f, 0);
             MotionEvent obtain = MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis() + 10, 1, 0.0f, 0.0f, 0);
-            this.countDown.dispatchTouchEvent(obtain);
-            this.countUp.dispatchTouchEvent(obtain);
+            countDown.dispatchTouchEvent(obtain);
+            countUp.dispatchTouchEvent(obtain);
         }
         }
 
 
         class CountCustomScale extends ActivityBase.NumberOptionValue.Counter {
         class CountCustomScale extends ActivityBase.NumberOptionValue.Counter {
@@ -290,7 +290,7 @@ public class CopyScaleActivity extends ActivityBase {
             public void onClick(View view) {
             public void onClick(View view) {
                 try {
                 try {
                     CopyMagnificationValue.this.value = Integer.valueOf(CopyMagnificationValue.this.editText.getText().toString()).intValue();
                     CopyMagnificationValue.this.value = Integer.valueOf(CopyMagnificationValue.this.editText.getText().toString()).intValue();
-                    CopyMagnificationValue.this.value = Math.min(Math.max(CopyMagnificationValue.this.optionItem.getMinimumValue(), CopyMagnificationValue.this.value + this.amount), CopyMagnificationValue.this.optionItem.getMaximumValue());
+                    CopyMagnificationValue.this.value = Math.min(Math.max(CopyMagnificationValue.this.optionItem.getMinimumValue(), CopyMagnificationValue.this.value + amount), CopyMagnificationValue.this.optionItem.getMaximumValue());
                 } catch (NumberFormatException unused) {
                 } catch (NumberFormatException unused) {
                 }
                 }
                 CopyMagnificationValue.this.editText.setText(String.valueOf(CopyMagnificationValue.this.value));
                 CopyMagnificationValue.this.editText.setText(String.valueOf(CopyMagnificationValue.this.value));
@@ -309,18 +309,18 @@ public class CopyScaleActivity extends ActivityBase {
     }
     }
 
 
     public void onBackPressed() {
     public void onBackPressed() {
-        this.isKeepSimpleAPConnection = true;
+        isKeepSimpleAPConnection = true;
         finish();
         finish();
     }
     }
 
 
     protected void onResume() {
     protected void onResume() {
         super.onResume();
         super.onResume();
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
-            this.isTryConnectSimpleAp = false;
+            isTryConnectSimpleAp = false;
         } else if (!this.isTryConnectSimpleAp) {
         } else if (!this.isTryConnectSimpleAp) {
-            this.isTryConnectSimpleAp = true;
+            isTryConnectSimpleAp = true;
             if (WiFiDirectManager.reconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
             if (WiFiDirectManager.reconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
-                this.isKeepSimpleAPConnection = true;
+                isKeepSimpleAPConnection = true;
             }
             }
         }
         }
     }
     }

+ 16 - 16
app/src/main/java/epson/print/copy/CopySettingActivity.java

@@ -34,15 +34,15 @@ public class CopySettingActivity extends ActivityBase {
         setContentView((int) R.layout.copy_setting);
         setContentView((int) R.layout.copy_setting);
         Intent intent = getIntent();
         Intent intent = getIntent();
         if (intent != null) {
         if (intent != null) {
-            this.settingItemKey = intent.getStringExtra("Key");
+            settingItemKey = intent.getStringExtra("Key");
             setActionBar(string(this.settingItemKey), true);
             setActionBar(string(this.settingItemKey), true);
         }
         }
-        this.optionValueChangedListener = new ActivityBase.OptionItemChangedListener() {
+        optionValueChangedListener = new ActivityBase.OptionItemChangedListener() {
             public void onOptionItemChanged(ECopyOptionItem eCopyOptionItem) {
             public void onOptionItemChanged(ECopyOptionItem eCopyOptionItem) {
                 CopySettingActivity.this.copyComponent.setCopyOptionItem(eCopyOptionItem);
                 CopySettingActivity.this.copyComponent.setCopyOptionItem(eCopyOptionItem);
             }
             }
         };
         };
-        this.optionListener = new ECopyComponent.ICopyOptionListener() {
+        optionListener = new ECopyComponent.ICopyOptionListener() {
             public void onCopyOptionChanged(ECopyOptionItem eCopyOptionItem, ArrayList<ECopyOptionItem> arrayList, ECopyComponent.ICopyOptionListener.CopyOptionChangedError copyOptionChangedError) {
             public void onCopyOptionChanged(ECopyOptionItem eCopyOptionItem, ArrayList<ECopyOptionItem> arrayList, ECopyComponent.ICopyOptionListener.CopyOptionChangedError copyOptionChangedError) {
                 CopySettingActivity.this.loading.dismiss();
                 CopySettingActivity.this.loading.dismiss();
                 if (copyOptionChangedError != null) {
                 if (copyOptionChangedError != null) {
@@ -55,8 +55,8 @@ public class CopySettingActivity extends ActivityBase {
                 CopySettingActivity.this.finish();
                 CopySettingActivity.this.finish();
             }
             }
         };
         };
-        this.optionContext = this.copyComponent.getBindedCopyOptionContext();
-        this.copyComponent.bindCopyOptionContext(this.optionContext, this.optionListener);
+        optionContext = copyComponent.getBindedCopyOptionContext();
+        copyComponent.bindCopyOptionContext(this.optionContext, optionListener);
         buildCopyOptions(this.copyComponent.getCopyOptionItems());
         buildCopyOptions(this.copyComponent.getCopyOptionItems());
     }
     }
 
 
@@ -67,7 +67,7 @@ public class CopySettingActivity extends ActivityBase {
             ECopyOptionItem next = it.next();
             ECopyOptionItem next = it.next();
             ECopyOptionItem.ECopyOptionItemKey key = next.getKey();
             ECopyOptionItem.ECopyOptionItemKey key = next.getKey();
             if (key.name().equalsIgnoreCase(this.settingItemKey)) {
             if (key.name().equalsIgnoreCase(this.settingItemKey)) {
-                this.optionValueMap.put(key, new OthersettingValue(next));
+                optionValueMap.put(key, new OthersettingValue(next));
             }
             }
         }
         }
     }
     }
@@ -99,9 +99,9 @@ public class CopySettingActivity extends ActivityBase {
                 }
                 }
             });
             });
             listView.setAdapter(getArrayAdapter(this, context));
             listView.setAdapter(getArrayAdapter(this, context));
-            for (int i = 0; i < this.choices.size(); i++) {
-                if (this.selected == this.choices.get(i)) {
-                    this.selectedItemPos = i;
+            for (int i = 0; i < choices.size(); i++) {
+                if (this.selected == choices.get(i)) {
+                    selectedItemPos = i;
                     return;
                     return;
                 }
                 }
             }
             }
@@ -113,13 +113,13 @@ public class CopySettingActivity extends ActivityBase {
 
 
             public SettingAdapter(Context context, int i, String[] strArr) {
             public SettingAdapter(Context context, int i, String[] strArr) {
                 super(context, i, strArr);
                 super(context, i, strArr);
-                this.items = strArr;
-                this.inflater = (LayoutInflater) context.getSystemService(Service.LAYOUT_INFLATER_SERVICE);
+                items = strArr;
+                inflater = (LayoutInflater) context.getSystemService(Service.LAYOUT_INFLATER_SERVICE);
             }
             }
 
 
             public View getView(int i, View view, ViewGroup viewGroup) {
             public View getView(int i, View view, ViewGroup viewGroup) {
                 if (view == null) {
                 if (view == null) {
-                    view = this.inflater.inflate(R.layout.setting_item, (ViewGroup) null);
+                    view = inflater.inflate(R.layout.setting_item, (ViewGroup) null);
                 }
                 }
                 ((TextView) view.findViewById(R.id.setting_name)).setText(this.items[i]);
                 ((TextView) view.findViewById(R.id.setting_name)).setText(this.items[i]);
                 if (i == OthersettingValue.this.selectedItemPos) {
                 if (i == OthersettingValue.this.selectedItemPos) {
@@ -133,18 +133,18 @@ public class CopySettingActivity extends ActivityBase {
     }
     }
 
 
     public void onBackPressed() {
     public void onBackPressed() {
-        this.isKeepSimpleAPConnection = true;
+        isKeepSimpleAPConnection = true;
         finish();
         finish();
     }
     }
 
 
     protected void onResume() {
     protected void onResume() {
         super.onResume();
         super.onResume();
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
-            this.isTryConnectSimpleAp = false;
+            isTryConnectSimpleAp = false;
         } else if (!this.isTryConnectSimpleAp) {
         } else if (!this.isTryConnectSimpleAp) {
-            this.isTryConnectSimpleAp = true;
+            isTryConnectSimpleAp = true;
             if (WiFiDirectManager.reconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
             if (WiFiDirectManager.reconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
-                this.isKeepSimpleAPConnection = true;
+                isKeepSimpleAPConnection = true;
             }
             }
         }
         }
     }
     }

+ 2 - 2
app/src/main/java/epson/print/copy/DisplayUtil.java

@@ -147,8 +147,8 @@ public class DisplayUtil {
         final int f384id;
         final int f384id;
 
 
         EnumAndDisplayStringId(@NonNull ECopyOptionItem.ECopyOptionItemChoice eCopyOptionItemChoice, @StringRes int i) {
         EnumAndDisplayStringId(@NonNull ECopyOptionItem.ECopyOptionItemChoice eCopyOptionItemChoice, @StringRes int i) {
-            this.copyParamEnum = eCopyOptionItemChoice;
-            this.f384id = i;
+            copyParamEnum = eCopyOptionItemChoice;
+            f384id = i;
         }
         }
 
 
         private void addHashMap(@NonNull Context context, @NonNull HashMap<String, String> hashMap) {
         private void addHashMap(@NonNull Context context, @NonNull HashMap<String, String> hashMap) {

+ 8 - 8
app/src/main/java/epson/print/ecclient/EcClientLib.java

@@ -85,15 +85,15 @@ public class EcClientLib {
     }
     }
 
 
     private void SetHttpAccess(HttpAccess httpAccess) {
     private void SetHttpAccess(HttpAccess httpAccess) {
-        this.mHttpAcess = httpAccess;
+        mHttpAcess = httpAccess;
     }
     }
 
 
     public void cancel() {
     public void cancel() {
-        this.mHttpAcess.cancel();
+        mHttpAcess.cancel();
     }
     }
 
 
     public void resetCancel() {
     public void resetCancel() {
-        this.mHttpAcess.resetCancel();
+        mHttpAcess.resetCancel();
     }
     }
 
 
     protected void finalize() throws Throwable {
     protected void finalize() throws Throwable {
@@ -101,22 +101,22 @@ public class EcClientLib {
     }
     }
 
 
     public String printerName2() {
     public String printerName2() {
-        return this.mPrinterName2;
+        return mPrinterName2;
     }
     }
 
 
     public String serialNumber() {
     public String serialNumber() {
-        return this.mSerialNumber;
+        return mSerialNumber;
     }
     }
 
 
     public String deviceId() {
     public String deviceId() {
-        return this.mEpsonDeviceId;
+        return mEpsonDeviceId;
     }
     }
 
 
     public String printerName() {
     public String printerName() {
-        return this.mPrinterName;
+        return mPrinterName;
     }
     }
 
 
     public String clientId() {
     public String clientId() {
-        return this.mClientId;
+        return mClientId;
     }
     }
 }
 }

+ 31 - 31
app/src/main/java/epson/print/ecclient/EpsJobAttrib.java

@@ -38,36 +38,36 @@ public class EpsJobAttrib {
     }
     }
 
 
     public void setDefault() {
     public void setDefault() {
-        this.mVersion = 4;
-        this.mColorPlane = 1;
-        this.mPaletteSize = 0;
-        this.mPaletteData = null;
-        this.mInputResolution = 1;
-        this.mMediaSizeIdx = 0;
-        this.mMediaTypeIdx = 0;
-        this.mPrintLayout = 2;
-        this.mPrintQuality = 2;
-        this.mPaperSource = 2;
-        this.mPrintDirection = 0;
-        this.mColorMode = 1;
-        this.mBrightness = 0;
-        this.mContrast = 0;
-        this.mSaturation = 0;
-        this.mApfAutoCorrect = 0;
-        this.mSharpness = 0;
-        this.mRedeye = 0;
-        this.mTopMargin = 0;
-        this.mLeftMargin = 0;
-        this.mBottomMargin = 0;
-        this.mRightMargin = 0;
-        this.mCdDimIn = 0;
-        this.mCdDimOut = 0;
-        this.mCmdType = 0;
-        this.mDuplex = 0;
-        this.mCopies = 1;
-        this.mFeedDirection = 0;
-        this.mUserDefWidth = 0;
-        this.mUserDefHeight = 0;
-        this.mPageNum = 0;
+        mVersion = 4;
+        mColorPlane = 1;
+        mPaletteSize = 0;
+        mPaletteData = null;
+        mInputResolution = 1;
+        mMediaSizeIdx = 0;
+        mMediaTypeIdx = 0;
+        mPrintLayout = 2;
+        mPrintQuality = 2;
+        mPaperSource = 2;
+        mPrintDirection = 0;
+        mColorMode = 1;
+        mBrightness = 0;
+        mContrast = 0;
+        mSaturation = 0;
+        mApfAutoCorrect = 0;
+        mSharpness = 0;
+        mRedeye = 0;
+        mTopMargin = 0;
+        mLeftMargin = 0;
+        mBottomMargin = 0;
+        mRightMargin = 0;
+        mCdDimIn = 0;
+        mCdDimOut = 0;
+        mCmdType = 0;
+        mDuplex = 0;
+        mCopies = 1;
+        mFeedDirection = 0;
+        mUserDefWidth = 0;
+        mUserDefHeight = 0;
+        mPageNum = 0;
     }
     }
 }
 }

+ 23 - 23
app/src/main/java/epson/print/ecclient/EpsonConnectAccess.java

@@ -21,22 +21,22 @@ public class EpsonConnectAccess {
     }
     }
 
 
     public boolean Initialize() {
     public boolean Initialize() {
-        return this.mEcClientLib.Initialize();
+        return mEcClientLib.Initialize();
     }
     }
 
 
     public void Terminate() {
     public void Terminate() {
-        this.mEcClientLib.Terminate();
+        mEcClientLib.Terminate();
     }
     }
 
 
     private int internalLogin(String str, String str2, String str3) {
     private int internalLogin(String str, String str2, String str3) {
-        return this.mEcClientLib.Login(str, str2, str3);
+        return mEcClientLib.Login(str, str2, str3);
     }
     }
 
 
     public int Login(Context context, String str, String str2) {
     public int Login(Context context, String str, String str2) {
         String quoteForJsonString = EcClientLibUtil.quoteForJsonString(str);
         String quoteForJsonString = EcClientLibUtil.quoteForJsonString(str);
         String quoteForJsonString2 = EcClientLibUtil.quoteForJsonString(str2);
         String quoteForJsonString2 = EcClientLibUtil.quoteForJsonString(str2);
         String loadClientId = loadClientId(context);
         String loadClientId = loadClientId(context);
-        int Login = this.mEcClientLib.Login(quoteForJsonString, quoteForJsonString2, loadClientId);
+        int Login = mEcClientLib.Login(quoteForJsonString, quoteForJsonString2, loadClientId);
         if (Login == 0 && loadClientId == null) {
         if (Login == 0 && loadClientId == null) {
             saveClientId(context, getClientId());
             saveClientId(context, getClientId());
         }
         }
@@ -44,59 +44,59 @@ public class EpsonConnectAccess {
     }
     }
 
 
     public int logout() {
     public int logout() {
-        return this.mEcClientLib.Logout();
+        return mEcClientLib.Logout();
     }
     }
 
 
     private int RegPrinter(String str, String str2, String str3) {
     private int RegPrinter(String str, String str2, String str3) {
-        return this.mEcClientLib.RegPrinter(str, str2, str3);
+        return mEcClientLib.RegPrinter(str, str2, str3);
     }
     }
 
 
     public int GetCapability() {
     public int GetCapability() {
-        return this.mEcClientLib.GetCapability();
+        return mEcClientLib.GetCapability();
     }
     }
 
 
     public int GetDefaultSetting() {
     public int GetDefaultSetting() {
-        return this.mEcClientLib.GetDefaultSetting();
+        return mEcClientLib.GetDefaultSetting();
     }
     }
 
 
     public int GetPrintLogUri(String str, String str2, String str3, String str4) {
     public int GetPrintLogUri(String str, String str2, String str3, String str4) {
-        return this.mEcClientLib.GetPrintLogUri(str, str2, str3, str4);
+        return mEcClientLib.GetPrintLogUri(str, str2, str3, str4);
     }
     }
 
 
     public int CreateJob(int i, String str, int i2, EpsJobAttrib epsJobAttrib, int i3, int i4) {
     public int CreateJob(int i, String str, int i2, EpsJobAttrib epsJobAttrib, int i3, int i4) {
-        return this.mEcClientLib.CreateJob(i, str, i2, epsJobAttrib, i3, i4);
+        return mEcClientLib.CreateJob(i, str, i2, epsJobAttrib, i3, i4);
     }
     }
 
 
     public int EndJob() {
     public int EndJob() {
-        return this.mEcClientLib.EndJob();
+        return mEcClientLib.EndJob();
     }
     }
 
 
     public int UploadFile(String str, int i, int i2) {
     public int UploadFile(String str, int i, int i2) {
-        return this.mEcClientLib.UploadFile(str, i, i2);
+        return mEcClientLib.UploadFile(str, i, i2);
     }
     }
 
 
     public int GetRenderingStatus() {
     public int GetRenderingStatus() {
-        return this.mEcClientLib.GetRenderingStatus();
+        return mEcClientLib.GetRenderingStatus();
     }
     }
 
 
     public int DownloadPreview(int i, String str) {
     public int DownloadPreview(int i, String str) {
-        return this.mEcClientLib.DownloadPreview(i, str);
+        return mEcClientLib.DownloadPreview(i, str);
     }
     }
 
 
     public int ChangePrintSetting(EpsJobAttrib epsJobAttrib, String str, String str2, boolean z) {
     public int ChangePrintSetting(EpsJobAttrib epsJobAttrib, String str, String str2, boolean z) {
-        return this.mEcClientLib.ChangePrintSetting(epsJobAttrib, str, str2, z);
+        return mEcClientLib.ChangePrintSetting(epsJobAttrib, str, str2, z);
     }
     }
 
 
     public int StartPrint(int i, int i2) {
     public int StartPrint(int i, int i2) {
-        return this.mEcClientLib.StartPrint(i, i2);
+        return mEcClientLib.StartPrint(i, i2);
     }
     }
 
 
     public void cancel() {
     public void cancel() {
-        this.mEcClientLib.cancel();
+        mEcClientLib.cancel();
     }
     }
 
 
     public void resetCancel() {
     public void resetCancel() {
-        this.mEcClientLib.resetCancel();
+        mEcClientLib.resetCancel();
     }
     }
 
 
     public RemotePrinterInfo oldLibGetPrinterInfo() {
     public RemotePrinterInfo oldLibGetPrinterInfo() {
@@ -105,7 +105,7 @@ public class EpsonConnectAccess {
         }
         }
         RemotePrinterInfo remotePrinterInfo = new RemotePrinterInfo();
         RemotePrinterInfo remotePrinterInfo = new RemotePrinterInfo();
         remotePrinterInfo.mSerialNumber = "";
         remotePrinterInfo.mSerialNumber = "";
-        remotePrinterInfo.mPrinterName = this.mEcClientLib.printerName();
+        remotePrinterInfo.mPrinterName = mEcClientLib.printerName();
         remotePrinterInfo.mDeviceId = remotePrinterInfo.mPrinterName;
         remotePrinterInfo.mDeviceId = remotePrinterInfo.mPrinterName;
         return remotePrinterInfo;
         return remotePrinterInfo;
     }
     }
@@ -115,9 +115,9 @@ public class EpsonConnectAccess {
             return null;
             return null;
         }
         }
         RemotePrinterInfo remotePrinterInfo = new RemotePrinterInfo();
         RemotePrinterInfo remotePrinterInfo = new RemotePrinterInfo();
-        remotePrinterInfo.mDeviceId = this.mEcClientLib.deviceId();
-        remotePrinterInfo.mSerialNumber = this.mEcClientLib.serialNumber();
-        remotePrinterInfo.mPrinterName = this.mEcClientLib.printerName2();
+        remotePrinterInfo.mDeviceId = mEcClientLib.deviceId();
+        remotePrinterInfo.mSerialNumber = mEcClientLib.serialNumber();
+        remotePrinterInfo.mPrinterName = mEcClientLib.printerName2();
         return remotePrinterInfo;
         return remotePrinterInfo;
     }
     }
 
 
@@ -126,7 +126,7 @@ public class EpsonConnectAccess {
     }
     }
 
 
     public String getClientId() {
     public String getClientId() {
-        return this.mEcClientLib.clientId();
+        return mEcClientLib.clientId();
     }
     }
 
 
     public static EpsonConnectAccess getInstance() {
     public static EpsonConnectAccess getInstance() {

+ 31 - 31
app/src/main/java/epson/print/ecclient/HttpApache.java

@@ -13,12 +13,12 @@ public class HttpApache extends HttpAccess {
     private IAHttpClient mHttpClient = null;
     private IAHttpClient mHttpClient = null;
 
 
     public void setDisplay(DebugDisplay debugDisplay) {
     public void setDisplay(DebugDisplay debugDisplay) {
-        this.mDisplay = debugDisplay;
+        mDisplay = debugDisplay;
     }
     }
 
 
     private void dispHttpRes(String str) {
     private void dispHttpRes(String str) {
         if (this.mDisplay != null) {
         if (this.mDisplay != null) {
-            DebugDisplay debugDisplay = this.mDisplay;
+            DebugDisplay debugDisplay = mDisplay;
             debugDisplay.addResText(str + Constants.BREAK_LINE);
             debugDisplay.addResText(str + Constants.BREAK_LINE);
         }
         }
         EPLog.v("epson_connect", str);
         EPLog.v("epson_connect", str);
@@ -26,22 +26,22 @@ public class HttpApache extends HttpAccess {
 
 
     private void dispHttpCmd(URL url) {
     private void dispHttpCmd(URL url) {
         if (this.mDisplay != null) {
         if (this.mDisplay != null) {
-            DebugDisplay debugDisplay = this.mDisplay;
+            DebugDisplay debugDisplay = mDisplay;
             debugDisplay.addResText("=> " + url.toString() + Constants.BREAK_LINE);
             debugDisplay.addResText("=> " + url.toString() + Constants.BREAK_LINE);
         }
         }
         EPLog.v("epson_connect", url.toString());
         EPLog.v("epson_connect", url.toString());
     }
     }
 
 
     public int HttpGet(String str) {
     public int HttpGet(String str) {
-        this.mResString = null;
-        this.mHttpRetCode = 0;
+        mResString = null;
+        mHttpRetCode = 0;
         dispHttpRes("[get]::" + str);
         dispHttpRes("[get]::" + str);
         try {
         try {
-            this.mHttpClient = new IAHttpClient();
-            IAHttpClient.HttpResponse execute = this.mHttpClient.execute(new IAHttpClient.HttpGet(str));
-            this.mResString = execute.getEntity().toString(CharEncoding.UTF_8);
-            this.mHttpRetCode = execute.getResponseCode();
-            dispHttpRes("get return :: <" + this.mHttpRetCode + "> '" + this.mResString + "'\n");
+            mHttpClient = new IAHttpClient();
+            IAHttpClient.HttpResponse execute = mHttpClient.execute(new IAHttpClient.HttpGet(str));
+            mResString = execute.getEntity().toString(CharEncoding.UTF_8);
+            mHttpRetCode = execute.getResponseCode();
+            dispHttpRes("get return :: <" + mHttpRetCode + "> '" + mResString + "'\n");
             return 0;
             return 0;
         } catch (Exception e) {
         } catch (Exception e) {
             EPLog.w("epson_connect", "error in HttpGet: " + e.toString());
             EPLog.w("epson_connect", "error in HttpGet: " + e.toString());
@@ -50,20 +50,20 @@ public class HttpApache extends HttpAccess {
     }
     }
 
 
     public int HttpPost(String str, String str2) {
     public int HttpPost(String str, String str2) {
-        this.mResString = null;
-        this.mHttpRetCode = 0;
+        mResString = null;
+        mHttpRetCode = 0;
         dispHttpRes("[post]:: " + str + " :: " + str2);
         dispHttpRes("[post]:: " + str + " :: " + str2);
         try {
         try {
             IAHttpClient.HttpPost httpPost = new IAHttpClient.HttpPost(str);
             IAHttpClient.HttpPost httpPost = new IAHttpClient.HttpPost(str);
-            this.mHttpClient = new IAHttpClient();
+            mHttpClient = new IAHttpClient();
             httpPost.setChunked(false);
             httpPost.setChunked(false);
             httpPost.setContentType("application/json");
             httpPost.setContentType("application/json");
             httpPost.setContentEncoding(CharEncoding.UTF_8);
             httpPost.setContentEncoding(CharEncoding.UTF_8);
             httpPost.setEntity(str2.getBytes(CharEncoding.UTF_8));
             httpPost.setEntity(str2.getBytes(CharEncoding.UTF_8));
-            IAHttpClient.HttpResponse execute = this.mHttpClient.execute(httpPost);
-            this.mResString = execute.getEntity().toString(CharEncoding.UTF_8);
-            this.mHttpRetCode = execute.getResponseCode();
-            dispHttpRes("post return :: <" + this.mHttpRetCode + "> '" + this.mResString + "'\n");
+            IAHttpClient.HttpResponse execute = mHttpClient.execute(httpPost);
+            mResString = execute.getEntity().toString(CharEncoding.UTF_8);
+            mHttpRetCode = execute.getResponseCode();
+            dispHttpRes("post return :: <" + mHttpRetCode + "> '" + mResString + "'\n");
             return 0;
             return 0;
         } catch (Exception e) {
         } catch (Exception e) {
             EPLog.w("epson_connect", "error in HttpPost: " + e.toString());
             EPLog.w("epson_connect", "error in HttpPost: " + e.toString());
@@ -72,8 +72,8 @@ public class HttpApache extends HttpAccess {
     }
     }
 
 
     public int PostFile(String str, String str2, String str3, String str4, int i, int i2) {
     public int PostFile(String str, String str2, String str3, String str4, int i, int i2) {
-        this.mResString = null;
-        this.mHttpRetCode = 0;
+        mResString = null;
+        mHttpRetCode = 0;
         dispHttpRes("[post file]:: " + str + " :: file: <" + str4 + "> offset: <" + i + "> dataSize: <" + i2 + ">");
         dispHttpRes("[post file]:: " + str + " :: file: <" + str4 + "> offset: <" + i + "> dataSize: <" + i2 + ">");
         if (this.mCanceled) {
         if (this.mCanceled) {
             return -2;
             return -2;
@@ -83,16 +83,16 @@ public class HttpApache extends HttpAccess {
             httpPost.setEntityFile(str4, i, i2);
             httpPost.setEntityFile(str4, i, i2);
             httpPost.setContentType(str3);
             httpPost.setContentType(str3);
             httpPost.setContentLength(Integer.valueOf(i2));
             httpPost.setContentLength(Integer.valueOf(i2));
-            this.mHttpClient = new IAHttpClient();
-            IAHttpClient.HttpResponse executeFile = this.mHttpClient.executeFile(httpPost);
+            mHttpClient = new IAHttpClient();
+            IAHttpClient.HttpResponse executeFile = mHttpClient.executeFile(httpPost);
             int responseCode = executeFile.getResponseCode();
             int responseCode = executeFile.getResponseCode();
             if (responseCode != 200) {
             if (responseCode != 200) {
                 EPLog.w("epson_connect", "error in PostFile: status = <" + responseCode + ">");
                 EPLog.w("epson_connect", "error in PostFile: status = <" + responseCode + ">");
                 return -1100;
                 return -1100;
             }
             }
-            this.mResString = executeFile.getEntity().toString(CharEncoding.UTF_8);
-            this.mHttpRetCode = executeFile.getResponseCode();
-            dispHttpRes("post file return :: <" + this.mHttpRetCode + "> '" + this.mResString + "'\n");
+            mResString = executeFile.getEntity().toString(CharEncoding.UTF_8);
+            mHttpRetCode = executeFile.getResponseCode();
+            dispHttpRes("post file return :: <" + mHttpRetCode + "> '" + mResString + "'\n");
             return 0;
             return 0;
         } catch (Exception e) {
         } catch (Exception e) {
             EPLog.w("epson_connect", "exception in HttpPost: " + e.toString());
             EPLog.w("epson_connect", "exception in HttpPost: " + e.toString());
@@ -102,8 +102,8 @@ public class HttpApache extends HttpAccess {
 
 
     public int GetFile(String str, String str2) {
     public int GetFile(String str, String str2) {
         dispHttpRes("[get file]::" + str + " file <" + str2 + ">");
         dispHttpRes("[get file]::" + str + " file <" + str2 + ">");
-        this.mResString = null;
-        this.mHttpRetCode = 0;
+        mResString = null;
+        mHttpRetCode = 0;
         if (this.mCanceled) {
         if (this.mCanceled) {
             return -2;
             return -2;
         }
         }
@@ -116,8 +116,8 @@ public class HttpApache extends HttpAccess {
                 EPLog.w("epson_connect", "error in HttpGet(): ");
                 EPLog.w("epson_connect", "error in HttpGet(): ");
                 return -1100;
                 return -1100;
             }
             }
-            this.mHttpRetCode = executeFile.getResponseCode();
-            dispHttpRes("getFile return :: <" + this.mHttpRetCode + ">\n");
+            mHttpRetCode = executeFile.getResponseCode();
+            dispHttpRes("getFile return :: <" + mHttpRetCode + ">\n");
             return 0;
             return 0;
         } catch (Exception e) {
         } catch (Exception e) {
             EPLog.w("epson_connect", "error in HttpGet: " + e.toString());
             EPLog.w("epson_connect", "error in HttpGet: " + e.toString());
@@ -127,16 +127,16 @@ public class HttpApache extends HttpAccess {
 
 
     public void cancel() {
     public void cancel() {
         EPLog.i("epson_connect", "cancel called()");
         EPLog.i("epson_connect", "cancel called()");
-        this.mCanceled = true;
+        mCanceled = true;
         shutdown();
         shutdown();
     }
     }
 
 
     public void resetCancel() {
     public void resetCancel() {
-        this.mCanceled = false;
+        mCanceled = false;
     }
     }
 
 
     private void shutdown() {
     private void shutdown() {
-        IAHttpClient iAHttpClient = this.mHttpClient;
+        IAHttpClient iAHttpClient = mHttpClient;
         if (iAHttpClient != null) {
         if (iAHttpClient != null) {
             iAHttpClient.disconnect();
             iAHttpClient.disconnect();
         }
         }

+ 5 - 5
app/src/main/java/epson/print/ecclient/HttpNonSsl.java

@@ -12,12 +12,12 @@ public class HttpNonSsl extends HttpAccess {
     private volatile boolean mCanceled = false;
     private volatile boolean mCanceled = false;
 
 
     public void setDisplay(DebugDisplay debugDisplay) {
     public void setDisplay(DebugDisplay debugDisplay) {
-        this.mDisplay = debugDisplay;
+        mDisplay = debugDisplay;
     }
     }
 
 
     private void dispHttpRes(String str) {
     private void dispHttpRes(String str) {
         if (this.mDisplay != null) {
         if (this.mDisplay != null) {
-            DebugDisplay debugDisplay = this.mDisplay;
+            DebugDisplay debugDisplay = mDisplay;
             debugDisplay.addResText(str + Constants.BREAK_LINE);
             debugDisplay.addResText(str + Constants.BREAK_LINE);
         }
         }
         Log.v("epson_connect", str);
         Log.v("epson_connect", str);
@@ -25,7 +25,7 @@ public class HttpNonSsl extends HttpAccess {
 
 
     private void dispHttpCmd(URL url) {
     private void dispHttpCmd(URL url) {
         if (this.mDisplay != null) {
         if (this.mDisplay != null) {
-            DebugDisplay debugDisplay = this.mDisplay;
+            DebugDisplay debugDisplay = mDisplay;
             debugDisplay.addResText("=> " + url.toString() + Constants.BREAK_LINE);
             debugDisplay.addResText("=> " + url.toString() + Constants.BREAK_LINE);
         }
         }
         Log.v("epson_connect", url.toString());
         Log.v("epson_connect", url.toString());
@@ -684,10 +684,10 @@ public class HttpNonSsl extends HttpAccess {
     }
     }
 
 
     public void cancel() {
     public void cancel() {
-        this.mCanceled = true;
+        mCanceled = true;
     }
     }
 
 
     public void resetCancel() {
     public void resetCancel() {
-        this.mCanceled = false;
+        mCanceled = false;
     }
     }
 }
 }

+ 8 - 8
app/src/main/java/epson/print/gdconv/ConvertProgressActivity.java

@@ -37,13 +37,13 @@ public class ConvertProgressActivity extends AppCompatActivity implements Conver
     protected void onCreate(Bundle bundle) {
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         super.onCreate(bundle);
         setContentView((int) R.layout.activity_convert_progress);
         setContentView((int) R.layout.activity_convert_progress);
-        this.mIprintGoogleSignIn = new IprintGoogleSignIn();
+        mIprintGoogleSignIn = new IprintGoogleSignIn();
         ((Button) findViewById(R.id.close_btn)).setOnClickListener(new View.OnClickListener() {
         ((Button) findViewById(R.id.close_btn)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
             public void onClick(View view) {
                 ConvertProgressActivity.this.cancelTaskAndFinish();
                 ConvertProgressActivity.this.cancelTaskAndFinish();
             }
             }
         });
         });
-        this.mMessageText = (TextView) findViewById(R.id.loading_tv);
+        mMessageText = (TextView) findViewById(R.id.loading_tv);
         changeMessageText(ConvertStatus.INIT);
         changeMessageText(ConvertStatus.INIT);
         if (!setLocalOfficePathFromIntent(getIntent())) {
         if (!setLocalOfficePathFromIntent(getIntent())) {
             setResult(101);
             setResult(101);
@@ -62,7 +62,7 @@ public class ConvertProgressActivity extends AppCompatActivity implements Conver
     /* access modifiers changed from: private */
     /* access modifiers changed from: private */
     @UiThread
     @UiThread
     public void cancelTaskAndFinish() {
     public void cancelTaskAndFinish() {
-        ConvertTask convertTask = this.mConvertTask;
+        ConvertTask convertTask = mConvertTask;
         if (convertTask != null) {
         if (convertTask != null) {
             convertTask.cancel(true);
             convertTask.cancel(true);
         }
         }
@@ -74,7 +74,7 @@ public class ConvertProgressActivity extends AppCompatActivity implements Conver
         if (intent == null) {
         if (intent == null) {
             return false;
             return false;
         }
         }
-        this.mLocalOfficePath = intent.getStringExtra(CommonDefine.FILE_NAME);
+        mLocalOfficePath = intent.getStringExtra(CommonDefine.FILE_NAME);
         if (this.mLocalOfficePath != null) {
         if (this.mLocalOfficePath != null) {
             return true;
             return true;
         }
         }
@@ -93,8 +93,8 @@ public class ConvertProgressActivity extends AppCompatActivity implements Conver
     }
     }
 
 
     private void startConvertTask() {
     private void startConvertTask() {
-        this.mConvertTask = new ConvertTask(getApplicationContext(), this);
-        this.mConvertTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new String[]{this.mLocalOfficePath});
+        mConvertTask = new ConvertTask(getApplicationContext(), this);
+        mConvertTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new String[]{this.mLocalOfficePath});
     }
     }
 
 
     public void changeMessageText(ConvertStatus convertStatus) {
     public void changeMessageText(ConvertStatus convertStatus) {
@@ -110,7 +110,7 @@ public class ConvertProgressActivity extends AppCompatActivity implements Conver
                 i = R.string.convert_google_docs_convert;
                 i = R.string.convert_google_docs_convert;
                 break;
                 break;
         }
         }
-        this.mMessageText.setText(i);
+        mMessageText.setText(i);
     }
     }
 
 
     public void onBackPressed() {
     public void onBackPressed() {
@@ -124,7 +124,7 @@ public class ConvertProgressActivity extends AppCompatActivity implements Conver
     public void notifyTaskEnd(int i) {
     public void notifyTaskEnd(int i) {
         if (i == 100) {
         if (i == 100) {
             Intent intent = getIntent();
             Intent intent = getIntent();
-            intent.putExtra(CommonDefine.DOWNLOAD_PATH, this.mConvertTask.getOutFile().getAbsolutePath());
+            intent.putExtra(CommonDefine.DOWNLOAD_PATH, mConvertTask.getOutFile().getAbsolutePath());
             setResult(100, intent);
             setResult(100, intent);
         } else {
         } else {
             setResult(i);
             setResult(i);

+ 7 - 7
app/src/main/java/epson/print/gdconv/ConvertTask.java

@@ -30,12 +30,12 @@ public class ConvertTask extends AsyncTask<String, ConvertStatus, Integer> {
 
 
     @Nullable
     @Nullable
     public synchronized File getOutFile() {
     public synchronized File getOutFile() {
-        return this.mOutFile;
+        return mOutFile;
     }
     }
 
 
     public ConvertTask(@NonNull Context context, TaskCallback taskCallback) {
     public ConvertTask(@NonNull Context context, TaskCallback taskCallback) {
-        this.mContextReference = new WeakReference<>(context.getApplicationContext());
-        this.mTaskCallbackWeakReference = new WeakReference<>(taskCallback);
+        mContextReference = new WeakReference<>(context.getApplicationContext());
+        mTaskCallbackWeakReference = new WeakReference<>(taskCallback);
     }
     }
 
 
     protected Integer doInBackground(String[] strArr) {
     protected Integer doInBackground(String[] strArr) {
@@ -43,7 +43,7 @@ public class ConvertTask extends AsyncTask<String, ConvertStatus, Integer> {
             return 101;
             return 101;
         }
         }
         String str = strArr[0];
         String str = strArr[0];
-        Context context = (Context) this.mContextReference.get();
+        Context context = (Context) mContextReference.get();
         if (context == null) {
         if (context == null) {
             return 103;
             return 103;
         }
         }
@@ -60,7 +60,7 @@ public class ConvertTask extends AsyncTask<String, ConvertStatus, Integer> {
             publishProgress(new ConvertStatus[]{ConvertStatus.UPLOAD});
             publishProgress(new ConvertStatus[]{ConvertStatus.UPLOAD});
             File createOutFilename = createOutFilename(context, str);
             File createOutFilename = createOutFilename(context, str);
             synchronized (this) {
             synchronized (this) {
-                this.mOutFile = createOutFilename;
+                mOutFile = createOutFilename;
             }
             }
             createDriveWriter.convertFileToPdf(str, mimeType, createDriveWriter.findOrCreateFolder("Epson iPrint"), createOutFilename, new DriveWriter.ConvertStatusNotifier() {
             createDriveWriter.convertFileToPdf(str, mimeType, createDriveWriter.findOrCreateFolder("Epson iPrint"), createOutFilename, new DriveWriter.ConvertStatusNotifier() {
                 public void changeStatus(ConvertStatus convertStatus) {
                 public void changeStatus(ConvertStatus convertStatus) {
@@ -81,14 +81,14 @@ public class ConvertTask extends AsyncTask<String, ConvertStatus, Integer> {
     }
     }
 
 
     protected void onProgressUpdate(ConvertStatus... convertStatusArr) {
     protected void onProgressUpdate(ConvertStatus... convertStatusArr) {
-        TaskCallback taskCallback = (TaskCallback) this.mTaskCallbackWeakReference.get();
+        TaskCallback taskCallback = (TaskCallback) mTaskCallbackWeakReference.get();
         if (taskCallback != null && convertStatusArr != null && convertStatusArr[0] != null) {
         if (taskCallback != null && convertStatusArr != null && convertStatusArr[0] != null) {
             taskCallback.messageChange(convertStatusArr[0]);
             taskCallback.messageChange(convertStatusArr[0]);
         }
         }
     }
     }
 
 
     private void doNotifyTaskEnd(int i) {
     private void doNotifyTaskEnd(int i) {
-        TaskCallback taskCallback = (TaskCallback) this.mTaskCallbackWeakReference.get();
+        TaskCallback taskCallback = (TaskCallback) mTaskCallbackWeakReference.get();
         if (taskCallback != null) {
         if (taskCallback != null) {
             taskCallback.notifyTaskEnd(i);
             taskCallback.notifyTaskEnd(i);
         }
         }

+ 19 - 19
app/src/main/java/epson/print/imgsel/Alt2ViewImageAdapter.java

@@ -33,37 +33,37 @@ public class Alt2ViewImageAdapter extends BaseAdapter implements CommonDefine {
     }
     }
 
 
     public Alt2ViewImageAdapter(ImageGridFragment imageGridFragment) {
     public Alt2ViewImageAdapter(ImageGridFragment imageGridFragment) {
-        this.mFragmentReference = new WeakReference<>(imageGridFragment);
-        this.mContext = imageGridFragment.getActivity();
-        this.mLayoutInflater = LayoutInflater.from(this.mContext);
-        this.mLayoutParams = new AbsListView.LayoutParams(-1, -1);
+        mFragmentReference = new WeakReference<>(imageGridFragment);
+        mContext = imageGridFragment.getActivity();
+        mLayoutInflater = LayoutInflater.from(this.mContext);
+        mLayoutParams = new AbsListView.LayoutParams(-1, -1);
         BitmapFactory.Options options = new BitmapFactory.Options();
         BitmapFactory.Options options = new BitmapFactory.Options();
         options.inPurgeable = true;
         options.inPurgeable = true;
         options.inScaled = false;
         options.inScaled = false;
         try {
         try {
-            this.mSelectPictureBitmap = BitmapFactory.decodeResource(this.mContext.getResources(), R.drawable.select_picture, options);
+            mSelectPictureBitmap = BitmapFactory.decodeResource(this.mContext.getResources(), R.drawable.select_picture, options);
         } catch (OutOfMemoryError e) {
         } catch (OutOfMemoryError e) {
             EPLog.e(TAG, "BitmapFactory.decodeResource Error " + e.getMessage());
             EPLog.e(TAG, "BitmapFactory.decodeResource Error " + e.getMessage());
         }
         }
     }
     }
 
 
     public void setHeight(int i) {
     public void setHeight(int i) {
-        this.mLayoutParams = new AbsListView.LayoutParams(-1, i);
+        mLayoutParams = new AbsListView.LayoutParams(-1, i);
     }
     }
 
 
     public View getView(int i, View view, ViewGroup viewGroup) {
     public View getView(int i, View view, ViewGroup viewGroup) {
         ImageItem imageItem;
         ImageItem imageItem;
         int i2 = 0;
         int i2 = 0;
         if (view == null) {
         if (view == null) {
-            view = this.mLayoutInflater.inflate(R.layout.grid_item_imgsel, viewGroup, false);
+            view = mLayoutInflater.inflate(R.layout.grid_item_imgsel, viewGroup, false);
             view.setLayoutParams(this.mLayoutParams);
             view.setLayoutParams(this.mLayoutParams);
         }
         }
         ImageView imageView = (ImageView) view.findViewById(R.id.imageThumbnail);
         ImageView imageView = (ImageView) view.findViewById(R.id.imageThumbnail);
-        if (this.mImageItemList.size() < 0 || this.mImageItemList.size() <= i) {
+        if (this.mImageItemList.size() < 0 || mImageItemList.size() <= i) {
             imageItem = null;
             imageItem = null;
         } else {
         } else {
             try {
             try {
-                imageItem = this.mImageItemList.get(i);
+                imageItem = mImageItemList.get(i);
             } catch (NullPointerException e) {
             } catch (NullPointerException e) {
                 e.printStackTrace();
                 e.printStackTrace();
                 return view;
                 return view;
@@ -79,7 +79,7 @@ public class Alt2ViewImageAdapter extends BaseAdapter implements CommonDefine {
                 imageView.setImageBitmap((Bitmap) null);
                 imageView.setImageBitmap((Bitmap) null);
                 imageView.setBackgroundColor(-3355444);
                 imageView.setBackgroundColor(-3355444);
                 EPLog.v("null", "bitmap is null");
                 EPLog.v("null", "bitmap is null");
-                ImageGridFragment imageGridFragment = (ImageGridFragment) this.mFragmentReference.get();
+                ImageGridFragment imageGridFragment = (ImageGridFragment) mFragmentReference.get();
                 if (imageGridFragment != null) {
                 if (imageGridFragment != null) {
                     imageGridFragment.changeThumnailPriority(imageItem);
                     imageGridFragment.changeThumnailPriority(imageItem);
                 }
                 }
@@ -97,39 +97,39 @@ public class Alt2ViewImageAdapter extends BaseAdapter implements CommonDefine {
     }
     }
 
 
     public int getCount() {
     public int getCount() {
-        return this.mImageItemList.size();
+        return mImageItemList.size();
     }
     }
 
 
     public Object getItem(int i) {
     public Object getItem(int i) {
-        return this.mImageItemList.get(i);
+        return mImageItemList.get(i);
     }
     }
 
 
     public ImageItem getImageItem(int i) {
     public ImageItem getImageItem(int i) {
-        return this.mImageItemList.get(i);
+        return mImageItemList.get(i);
     }
     }
 
 
     public int getPosition(ImageItem imageItem) {
     public int getPosition(ImageItem imageItem) {
-        return this.mImageItemList.indexOf(imageItem);
+        return mImageItemList.indexOf(imageItem);
     }
     }
 
 
     public void add(ImageItem imageItem) {
     public void add(ImageItem imageItem) {
-        this.mImageItemList.add(imageItem);
+        mImageItemList.add(imageItem);
     }
     }
 
 
     public void clearImageItem() {
     public void clearImageItem() {
-        this.mImageItemList.clear();
+        mImageItemList.clear();
     }
     }
 
 
     public void recycleBitmap() {
     public void recycleBitmap() {
-        for (ImageItem release : this.mImageItemList) {
+        for (ImageItem release : mImageItemList) {
             release.release();
             release.release();
         }
         }
-        this.mImageItemList.clear();
+        mImageItemList.clear();
     }
     }
 
 
     public ArrayList<String> getFileList() {
     public ArrayList<String> getFileList() {
         ArrayList<String> arrayList = new ArrayList<>();
         ArrayList<String> arrayList = new ArrayList<>();
-        for (ImageItem path : this.mImageItemList) {
+        for (ImageItem path : mImageItemList) {
             arrayList.add(path.getPath());
             arrayList.add(path.getPath());
         }
         }
         return arrayList;
         return arrayList;

+ 6 - 6
app/src/main/java/epson/print/imgsel/AltThumbnailCache.java

@@ -60,9 +60,9 @@ public class AltThumbnailCache extends File {
         if (isDirectory()) {
         if (isDirectory()) {
             for (File file : listFiles()) {
             for (File file : listFiles()) {
                 if (!file.isDirectory()) {
                 if (!file.isDirectory()) {
-                    this.realObject = file;
+                    realObject = file;
                     try {
                     try {
-                        this.modified = Long.parseLong(file.getName());
+                        modified = Long.parseLong(file.getName());
                     } catch (NumberFormatException e) {
                     } catch (NumberFormatException e) {
                         EPLog.e(TAG, e.getMessage());
                         EPLog.e(TAG, e.getMessage());
                     }
                     }
@@ -75,20 +75,20 @@ public class AltThumbnailCache extends File {
 
 
     public boolean setLastModified(long j) {
     public boolean setLastModified(long j) {
         delete();
         delete();
-        this.modified = j;
-        this.realObject = new File(getPath(), String.valueOf(j));
+        modified = j;
+        realObject = new File(getPath(), String.valueOf(j));
         return true;
         return true;
     }
     }
 
 
     public long lastModified() {
     public long lastModified() {
-        return this.modified;
+        return modified;
     }
     }
 
 
     public String getCachePath() {
     public String getCachePath() {
         if (!exists()) {
         if (!exists()) {
             mkdir();
             mkdir();
         }
         }
-        return this.realObject.getPath();
+        return realObject.getPath();
     }
     }
 
 
     static File getCacheDirectory() {
     static File getCacheDirectory() {

+ 26 - 26
app/src/main/java/epson/print/imgsel/BitmapCache.java

@@ -35,7 +35,7 @@ public class BitmapCache {
     }
     }
 
 
     public boolean initialize(File file, int i) {
     public boolean initialize(File file, int i) {
-        this.mCacheSizeLimit = (long) i;
+        mCacheSizeLimit = (long) i;
         return initialize(file);
         return initialize(file);
     }
     }
 
 
@@ -48,7 +48,7 @@ public class BitmapCache {
     }
     }
 
 
     public boolean setCacheDirectory(File file) {
     public boolean setCacheDirectory(File file) {
-        this.mCacheDirectory = null;
+        mCacheDirectory = null;
         if (file.exists()) {
         if (file.exists()) {
             if (!file.isDirectory() || !file.canRead()) {
             if (!file.isDirectory() || !file.canRead()) {
                 return false;
                 return false;
@@ -56,7 +56,7 @@ public class BitmapCache {
         } else if (!file.mkdirs()) {
         } else if (!file.mkdirs()) {
             return false;
             return false;
         }
         }
-        this.mCacheDirectory = file;
+        mCacheDirectory = file;
         return true;
         return true;
     }
     }
 
 
@@ -144,31 +144,31 @@ public class BitmapCache {
     }
     }
 
 
     private synchronized void calcTotalSizeAndDeleteNotExistEntry() {
     private synchronized void calcTotalSizeAndDeleteNotExistEntry() {
-        this.mTotalCacheSize = 0;
-        Set<File> keySet = this.mCacheFileInfoMap.keySet();
+        mTotalCacheSize = 0;
+        Set<File> keySet = mCacheFileInfoMap.keySet();
         HashSet<File> hashSet = new HashSet<>();
         HashSet<File> hashSet = new HashSet<>();
         for (File next : keySet) {
         for (File next : keySet) {
             File cacheFile = getCacheFile(next.toString());
             File cacheFile = getCacheFile(next.toString());
             if (!cacheFile.exists()) {
             if (!cacheFile.exists()) {
                 hashSet.add(next);
                 hashSet.add(next);
             } else {
             } else {
-                this.mTotalCacheSize += cacheFile.length();
+                mTotalCacheSize += cacheFile.length();
             }
             }
         }
         }
         for (File remove : hashSet) {
         for (File remove : hashSet) {
-            this.mCacheFileInfoMap.remove(remove);
+            mCacheFileInfoMap.remove(remove);
         }
         }
         trimToSize();
         trimToSize();
     }
     }
 
 
     private synchronized void deleteNoEntryCacheFile() {
     private synchronized void deleteNoEntryCacheFile() {
         if (this.mCacheDirectory == null) {
         if (this.mCacheDirectory == null) {
-            Set<File> keySet = this.mCacheFileInfoMap.keySet();
+            Set<File> keySet = mCacheFileInfoMap.keySet();
             HashSet hashSet = new HashSet(keySet.size());
             HashSet hashSet = new HashSet(keySet.size());
             for (File file : keySet) {
             for (File file : keySet) {
                 hashSet.add(getCacheFile(file.toString()));
                 hashSet.add(getCacheFile(file.toString()));
             }
             }
-            for (File file2 : this.mCacheDirectory.listFiles()) {
+            for (File file2 : mCacheDirectory.listFiles()) {
                 if (!hashSet.contains(file2)) {
                 if (!hashSet.contains(file2)) {
                     file2.delete();
                     file2.delete();
                 }
                 }
@@ -177,7 +177,7 @@ public class BitmapCache {
     }
     }
 
 
     public synchronized void trimToSize() {
     public synchronized void trimToSize() {
-        while (this.mTotalCacheSize > this.mCacheSizeLimit) {
+        while (this.mTotalCacheSize > mCacheSizeLimit) {
             removeCacheFile(this.mCacheFileInfoMap.keySet().iterator().next());
             removeCacheFile(this.mCacheFileInfoMap.keySet().iterator().next());
         }
         }
     }
     }
@@ -189,15 +189,15 @@ public class BitmapCache {
             j = cacheFile.length();
             j = cacheFile.length();
             cacheFile.delete();
             cacheFile.delete();
         }
         }
-        this.mTotalCacheSize -= j;
-        this.mCacheFileInfoMap.remove(file);
+        mTotalCacheSize -= j;
+        mCacheFileInfoMap.remove(file);
     }
     }
 
 
     private synchronized void clearCacheFileInfoMap() {
     private synchronized void clearCacheFileInfoMap() {
-        this.mCacheFileInfoMap.clear();
-        this.mTotalCacheSize = 0;
+        mCacheFileInfoMap.clear();
+        mTotalCacheSize = 0;
         if (this.mCacheDirectory != null) {
         if (this.mCacheDirectory != null) {
-            for (File delete : this.mCacheDirectory.listFiles()) {
+            for (File delete : mCacheDirectory.listFiles()) {
                 delete.delete();
                 delete.delete();
             }
             }
         }
         }
@@ -288,7 +288,7 @@ public class BitmapCache {
     }
     }
 
 
     public synchronized File getFile(File file) {
     public synchronized File getFile(File file) {
-        FileAttribute fileAttribute = this.mCacheFileInfoMap.get(file);
+        FileAttribute fileAttribute = mCacheFileInfoMap.get(file);
         if (fileAttribute == null) {
         if (fileAttribute == null) {
             return null;
             return null;
         }
         }
@@ -312,7 +312,7 @@ public class BitmapCache {
         private Bitmap mBitmap;
         private Bitmap mBitmap;
 
 
         public BitmapDataWrite(Bitmap bitmap) {
         public BitmapDataWrite(Bitmap bitmap) {
-            this.mBitmap = bitmap;
+            mBitmap = bitmap;
         }
         }
 
 
         /* JADX WARNING: Removed duplicated region for block: B:15:0x0023 A[SYNTHETIC, Splitter:B:15:0x0023] */
         /* JADX WARNING: Removed duplicated region for block: B:15:0x0023 A[SYNTHETIC, Splitter:B:15:0x0023] */
@@ -372,21 +372,21 @@ public class BitmapCache {
                 if (cacheFile.exists()) {
                 if (cacheFile.exists()) {
                     cacheFile.delete();
                     cacheFile.delete();
                 }
                 }
-                this.mCacheFileInfoMap.remove(file);
-                this.mTotalCacheSize -= j;
+                mCacheFileInfoMap.remove(file);
+                mTotalCacheSize -= j;
                 return;
                 return;
             }
             }
             long length = cacheFile.length();
             long length = cacheFile.length();
-            this.mCacheFileInfoMap.put(file, new FileAttribute(file));
-            this.mTotalCacheSize += length - j;
+            mCacheFileInfoMap.put(file, new FileAttribute(file));
+            mTotalCacheSize += length - j;
             trimToSize();
             trimToSize();
         }
         }
     }
     }
 
 
     private File getCacheFile(String str) {
     private File getCacheFile(String str) {
-        File file = this.mCacheDirectory;
+        File file = mCacheDirectory;
         String uuid = UUID.nameUUIDFromBytes(str.getBytes()).toString();
         String uuid = UUID.nameUUIDFromBytes(str.getBytes()).toString();
-        File file2 = this.mCacheDirectory;
+        File file2 = mCacheDirectory;
         return new File(file2, uuid + ".jpg");
         return new File(file2, uuid + ".jpg");
     }
     }
 
 
@@ -396,13 +396,13 @@ public class BitmapCache {
 
 
         public FileAttribute(File file) {
         public FileAttribute(File file) {
             if (file != null) {
             if (file != null) {
-                this.mFileSize = file.length();
-                this.mModifiedTime = file.lastModified();
+                mFileSize = file.length();
+                mModifiedTime = file.lastModified();
             }
             }
         }
         }
 
 
         public boolean isSameAttribute(long j, long j2) {
         public boolean isSameAttribute(long j, long j2) {
-            return this.mFileSize == j && this.mModifiedTime == j2;
+            return mFileSize == j && mModifiedTime == j2;
         }
         }
 
 
         public boolean isSameAttribute(File file) {
         public boolean isSameAttribute(File file) {

+ 6 - 6
app/src/main/java/epson/print/imgsel/FolderFindTask.java

@@ -13,12 +13,12 @@ class FolderFindTask extends AsyncTask<ImageFinder, Object, Void> implements Ima
     private WeakReference<ImageFolderListFragment> mFragmentReference;
     private WeakReference<ImageFolderListFragment> mFragmentReference;
 
 
     public FolderFindTask(ImageFolderListFragment imageFolderListFragment) {
     public FolderFindTask(ImageFolderListFragment imageFolderListFragment) {
-        this.mFragmentReference = new WeakReference<>(imageFolderListFragment);
-        this.mApplicationContext = imageFolderListFragment.getActivity().getApplicationContext();
+        mFragmentReference = new WeakReference<>(imageFolderListFragment);
+        mApplicationContext = imageFolderListFragment.getActivity().getApplicationContext();
     }
     }
 
 
     protected void onPostExecute(Void voidR) {
     protected void onPostExecute(Void voidR) {
-        ImageFolderListFragment imageFolderListFragment = (ImageFolderListFragment) this.mFragmentReference.get();
+        ImageFolderListFragment imageFolderListFragment = (ImageFolderListFragment) mFragmentReference.get();
         if (imageFolderListFragment != null) {
         if (imageFolderListFragment != null) {
             imageFolderListFragment.onFolderFindTaskEnd();
             imageFolderListFragment.onFolderFindTaskEnd();
         }
         }
@@ -26,7 +26,7 @@ class FolderFindTask extends AsyncTask<ImageFinder, Object, Void> implements Ima
 
 
     protected Void doInBackground(ImageFinder... imageFinderArr) {
     protected Void doInBackground(ImageFinder... imageFinderArr) {
         Collection<ImageFolderInfo> folderPhotoList;
         Collection<ImageFolderInfo> folderPhotoList;
-        if (!isCancelled() && imageFinderArr != null && imageFinderArr.length > 0 && (folderPhotoList = imageFinderArr[0].getFolderPhotoList(this, this.mApplicationContext.getContentResolver())) != null) {
+        if (!isCancelled() && imageFinderArr != null && imageFinderArr.length > 0 && (folderPhotoList = imageFinderArr[0].getFolderPhotoList(this, mApplicationContext.getContentResolver())) != null) {
             for (ImageFolderInfo next : folderPhotoList) {
             for (ImageFolderInfo next : folderPhotoList) {
                 if (isCancelled()) {
                 if (isCancelled()) {
                     return null;
                     return null;
@@ -48,7 +48,7 @@ class FolderFindTask extends AsyncTask<ImageFinder, Object, Void> implements Ima
     private void taskAddItem(ImageFolderInfo imageFolderInfo) {
     private void taskAddItem(ImageFolderInfo imageFolderInfo) {
         Bitmap bitmap;
         Bitmap bitmap;
         try {
         try {
-            bitmap = AltThumbnailCache.createThumbnail(imageFolderInfo.getFileName(0), this.mApplicationContext.getContentResolver(), imageFolderInfo.getId(0));
+            bitmap = AltThumbnailCache.createThumbnail(imageFolderInfo.getFileName(0), mApplicationContext.getContentResolver(), imageFolderInfo.getId(0));
         } catch (IOException e) {
         } catch (IOException e) {
             e.printStackTrace();
             e.printStackTrace();
             bitmap = null;
             bitmap = null;
@@ -58,7 +58,7 @@ class FolderFindTask extends AsyncTask<ImageFinder, Object, Void> implements Ima
 
 
     protected void onProgressUpdate(Object... objArr) {
     protected void onProgressUpdate(Object... objArr) {
         ImageFolderListFragment imageFolderListFragment;
         ImageFolderListFragment imageFolderListFragment;
-        if (!isCancelled() && (imageFolderListFragment = (ImageFolderListFragment) this.mFragmentReference.get()) != null) {
+        if (!isCancelled() && (imageFolderListFragment = (ImageFolderListFragment) mFragmentReference.get()) != null) {
             imageFolderListFragment.addItem(objArr[0], objArr[1]);
             imageFolderListFragment.addItem(objArr[0], objArr[1]);
         }
         }
     }
     }

+ 2 - 2
app/src/main/java/epson/print/imgsel/ImageFileInfo.java

@@ -5,7 +5,7 @@ public class ImageFileInfo {
     public long mMediaInfoId;
     public long mMediaInfoId;
 
 
     public ImageFileInfo(String str, long j) {
     public ImageFileInfo(String str, long j) {
-        this.mCanonicalPath = str;
-        this.mMediaInfoId = j;
+        mCanonicalPath = str;
+        mMediaInfoId = j;
     }
     }
 }
 }

+ 8 - 8
app/src/main/java/epson/print/imgsel/ImageFindTask.java

@@ -16,8 +16,8 @@ class ImageFindTask extends AsyncTask<ImageFinder, List<ImageItem>, Void> implem
     WeakReference<ImageGridFragment> mFragmentReference;
     WeakReference<ImageGridFragment> mFragmentReference;
 
 
     public ImageFindTask(ImageGridFragment imageGridFragment, String str) {
     public ImageFindTask(ImageGridFragment imageGridFragment, String str) {
-        this.mFragmentReference = new WeakReference<>(imageGridFragment);
-        this.mFolderPath = str;
+        mFragmentReference = new WeakReference<>(imageGridFragment);
+        mFolderPath = str;
     }
     }
 
 
     protected Void doInBackground(ImageFinder... imageFinderArr) {
     protected Void doInBackground(ImageFinder... imageFinderArr) {
@@ -27,7 +27,7 @@ class ImageFindTask extends AsyncTask<ImageFinder, List<ImageItem>, Void> implem
             return null;
             return null;
         }
         }
         ImageFinder imageFinder = imageFinderArr[0];
         ImageFinder imageFinder = imageFinderArr[0];
-        if (!(isCancelled() || imageFinder == null || (imageGridFragment = (ImageGridFragment) this.mFragmentReference.get()) == null || imageGridFragment.getActivity() == null || isCancelled() || (findImageInDirectory = imageFinder.findImageInDirectory(this.mFolderPath, getResolver(), this)) == null)) {
+        if (!(isCancelled() || imageFinder == null || (imageGridFragment = (ImageGridFragment) mFragmentReference.get()) == null || imageGridFragment.getActivity() == null || isCancelled() || (findImageInDirectory = imageFinder.findImageInDirectory(this.mFolderPath, getResolver(), this)) == null)) {
             ArrayList arrayList = new ArrayList();
             ArrayList arrayList = new ArrayList();
             for (ImageFileInfo next : findImageInDirectory) {
             for (ImageFileInfo next : findImageInDirectory) {
                 if (isCancelled()) {
                 if (isCancelled()) {
@@ -49,7 +49,7 @@ class ImageFindTask extends AsyncTask<ImageFinder, List<ImageItem>, Void> implem
 
 
     private ContentResolver getResolver() {
     private ContentResolver getResolver() {
         FragmentActivity activity;
         FragmentActivity activity;
-        ImageGridFragment imageGridFragment = (ImageGridFragment) this.mFragmentReference.get();
+        ImageGridFragment imageGridFragment = (ImageGridFragment) mFragmentReference.get();
         if (imageGridFragment == null || (activity = imageGridFragment.getActivity()) == null) {
         if (imageGridFragment == null || (activity = imageGridFragment.getActivity()) == null) {
             return null;
             return null;
         }
         }
@@ -57,7 +57,7 @@ class ImageFindTask extends AsyncTask<ImageFinder, List<ImageItem>, Void> implem
     }
     }
 
 
     private boolean isImageSelected(String str) {
     private boolean isImageSelected(String str) {
-        ImageGridFragment imageGridFragment = (ImageGridFragment) this.mFragmentReference.get();
+        ImageGridFragment imageGridFragment = (ImageGridFragment) mFragmentReference.get();
         if (imageGridFragment == null) {
         if (imageGridFragment == null) {
             return false;
             return false;
         }
         }
@@ -69,21 +69,21 @@ class ImageFindTask extends AsyncTask<ImageFinder, List<ImageItem>, Void> implem
     }
     }
 
 
     protected void onPreExecute() {
     protected void onPreExecute() {
-        ImageGridFragment imageGridFragment = (ImageGridFragment) this.mFragmentReference.get();
+        ImageGridFragment imageGridFragment = (ImageGridFragment) mFragmentReference.get();
         if (imageGridFragment != null) {
         if (imageGridFragment != null) {
             imageGridFragment.clearItem();
             imageGridFragment.clearItem();
         }
         }
     }
     }
 
 
     protected void onProgressUpdate(List<ImageItem>... listArr) {
     protected void onProgressUpdate(List<ImageItem>... listArr) {
-        ImageGridFragment imageGridFragment = (ImageGridFragment) this.mFragmentReference.get();
+        ImageGridFragment imageGridFragment = (ImageGridFragment) mFragmentReference.get();
         if (imageGridFragment != null && listArr != null && listArr.length > 0) {
         if (imageGridFragment != null && listArr != null && listArr.length > 0) {
             imageGridFragment.addItem(listArr[0]);
             imageGridFragment.addItem(listArr[0]);
         }
         }
     }
     }
 
 
     protected void onPostExecute(Void voidR) {
     protected void onPostExecute(Void voidR) {
-        ImageGridFragment imageGridFragment = (ImageGridFragment) this.mFragmentReference.get();
+        ImageGridFragment imageGridFragment = (ImageGridFragment) mFragmentReference.get();
         if (imageGridFragment != null) {
         if (imageGridFragment != null) {
             imageGridFragment.updateData();
             imageGridFragment.updateData();
         }
         }

+ 12 - 12
app/src/main/java/epson/print/imgsel/ImageFolderAdapter.java

@@ -26,19 +26,19 @@ public class ImageFolderAdapter extends BaseAdapter {
     }
     }
 
 
     public int getCount() {
     public int getCount() {
-        return this.mFolderList.size();
+        return mFolderList.size();
     }
     }
 
 
     public Object getItem(int i) {
     public Object getItem(int i) {
-        return this.mFolderList.get(i);
+        return mFolderList.get(i);
     }
     }
 
 
     public View getView(int i, View view, ViewGroup viewGroup) {
     public View getView(int i, View view, ViewGroup viewGroup) {
         if (view == null) {
         if (view == null) {
-            view = this.mLayoutInflater.inflate(R.layout.listitem_image_folder, viewGroup, false);
+            view = mLayoutInflater.inflate(R.layout.listitem_image_folder, viewGroup, false);
         }
         }
         TextView textView = (TextView) view.findViewById(R.id.folderNameText);
         TextView textView = (TextView) view.findViewById(R.id.folderNameText);
-        FolderInfoAndThumbnail folderInfoAndThumbnail = this.mFolderList.get(i);
+        FolderInfoAndThumbnail folderInfoAndThumbnail = mFolderList.get(i);
         if (folderInfoAndThumbnail == null) {
         if (folderInfoAndThumbnail == null) {
             return view;
             return view;
         }
         }
@@ -54,27 +54,27 @@ public class ImageFolderAdapter extends BaseAdapter {
     }
     }
 
 
     public ImageFolderAdapter(Context context) {
     public ImageFolderAdapter(Context context) {
-        this.mLayoutInflater = LayoutInflater.from(context);
-        this.mResources = context.getResources();
+        mLayoutInflater = LayoutInflater.from(context);
+        mResources = context.getResources();
     }
     }
 
 
     public void addItem(ImageFolderInfo imageFolderInfo, Bitmap bitmap) {
     public void addItem(ImageFolderInfo imageFolderInfo, Bitmap bitmap) {
-        this.mFolderList.add(new FolderInfoAndThumbnail(imageFolderInfo, bitmap));
+        mFolderList.add(new FolderInfoAndThumbnail(imageFolderInfo, bitmap));
         notifyDataSetChanged();
         notifyDataSetChanged();
     }
     }
 
 
     public ImageFolderInfo getFolderInfo(int i) {
     public ImageFolderInfo getFolderInfo(int i) {
-        return this.mFolderList.get(i).mImageFolderInfo;
+        return mFolderList.get(i).mImageFolderInfo;
     }
     }
 
 
     public void releaseResource() {
     public void releaseResource() {
-        for (FolderInfoAndThumbnail next : this.mFolderList) {
+        for (FolderInfoAndThumbnail next : mFolderList) {
             if (next.mBitmap != null) {
             if (next.mBitmap != null) {
                 next.mBitmap.recycle();
                 next.mBitmap.recycle();
                 next.mBitmap = null;
                 next.mBitmap = null;
             }
             }
         }
         }
-        this.mFolderList.clear();
+        mFolderList.clear();
     }
     }
 
 
     static class FolderInfoAndThumbnail {
     static class FolderInfoAndThumbnail {
@@ -82,8 +82,8 @@ public class ImageFolderAdapter extends BaseAdapter {
         public ImageFolderInfo mImageFolderInfo;
         public ImageFolderInfo mImageFolderInfo;
 
 
         public FolderInfoAndThumbnail(ImageFolderInfo imageFolderInfo, Bitmap bitmap) {
         public FolderInfoAndThumbnail(ImageFolderInfo imageFolderInfo, Bitmap bitmap) {
-            this.mImageFolderInfo = imageFolderInfo;
-            this.mBitmap = bitmap;
+            mImageFolderInfo = imageFolderInfo;
+            mBitmap = bitmap;
         }
         }
     }
     }
 }
 }

+ 13 - 13
app/src/main/java/epson/print/imgsel/ImageFolderInfo.java

@@ -12,47 +12,47 @@ class ImageFolderInfo {
     private int mMiniDatabaseOrder;
     private int mMiniDatabaseOrder;
 
 
     public ImageFolderInfo(String str) {
     public ImageFolderInfo(String str) {
-        this.mCanonicalName = str;
-        this.mMiniDatabaseOrder = -1;
+        mCanonicalName = str;
+        mMiniDatabaseOrder = -1;
     }
     }
 
 
     public boolean addImageLastIfPossible(long j, String str, int i) {
     public boolean addImageLastIfPossible(long j, String str, int i) {
         if (this.mMiniDatabaseOrder < 0) {
         if (this.mMiniDatabaseOrder < 0) {
-            this.mMiniDatabaseOrder = i;
+            mMiniDatabaseOrder = i;
         }
         }
-        this.mImageCount++;
+        mImageCount++;
         if (this.mImageIdList.size() >= 4) {
         if (this.mImageIdList.size() >= 4) {
             return false;
             return false;
         }
         }
-        this.mImageIdList.add(Long.valueOf(j));
-        this.mImageNameList.add(str);
+        mImageIdList.add(Long.valueOf(j));
+        mImageNameList.add(str);
         return true;
         return true;
     }
     }
 
 
     public long getId(int i) {
     public long getId(int i) {
-        if (i >= this.mImageIdList.size() || i < 0) {
+        if (i >= mImageIdList.size() || i < 0) {
             return -1;
             return -1;
         }
         }
-        return this.mImageIdList.get(i).longValue();
+        return mImageIdList.get(i).longValue();
     }
     }
 
 
     public String getFileName(int i) {
     public String getFileName(int i) {
-        if (i >= this.mImageNameList.size() || i < 0) {
+        if (i >= mImageNameList.size() || i < 0) {
             return null;
             return null;
         }
         }
-        return this.mImageNameList.get(i);
+        return mImageNameList.get(i);
     }
     }
 
 
     public int getFileIdCount() {
     public int getFileIdCount() {
-        return this.mImageIdList.size();
+        return mImageIdList.size();
     }
     }
 
 
     public int getImageCount() {
     public int getImageCount() {
-        return this.mImageCount;
+        return mImageCount;
     }
     }
 
 
     public int getMiniDatabaseOrder() {
     public int getMiniDatabaseOrder() {
-        return this.mMiniDatabaseOrder;
+        return mMiniDatabaseOrder;
     }
     }
 
 
     static class DatabaseOrderComparator implements Comparator<ImageFolderInfo> {
     static class DatabaseOrderComparator implements Comparator<ImageFolderInfo> {

+ 18 - 18
app/src/main/java/epson/print/imgsel/ImageFolderListFragment.java

@@ -32,20 +32,20 @@ public class ImageFolderListFragment extends ListFragment {
 
 
     public void onActivityCreated(Bundle bundle) {
     public void onActivityCreated(Bundle bundle) {
         super.onActivityCreated(bundle);
         super.onActivityCreated(bundle);
-        this.mAdapter = new ImageFolderAdapter(getActivity());
+        mAdapter = new ImageFolderAdapter(getActivity());
         setListAdapter(this.mAdapter);
         setListAdapter(this.mAdapter);
     }
     }
 
 
     public void addItem(ImageFolderInfo imageFolderInfo, Bitmap bitmap) {
     public void addItem(ImageFolderInfo imageFolderInfo, Bitmap bitmap) {
-        ImageFolderAdapter imageFolderAdapter = this.mAdapter;
+        ImageFolderAdapter imageFolderAdapter = mAdapter;
         if (imageFolderAdapter != null) {
         if (imageFolderAdapter != null) {
             imageFolderAdapter.addItem(imageFolderInfo, bitmap);
             imageFolderAdapter.addItem(imageFolderInfo, bitmap);
-            this.mAdapter.notifyDataSetChanged();
+            mAdapter.notifyDataSetChanged();
         }
         }
     }
     }
 
 
     public int getItemSize() {
     public int getItemSize() {
-        ImageFolderAdapter imageFolderAdapter = this.mAdapter;
+        ImageFolderAdapter imageFolderAdapter = mAdapter;
         if (imageFolderAdapter == null) {
         if (imageFolderAdapter == null) {
             return 0;
             return 0;
         }
         }
@@ -54,20 +54,20 @@ public class ImageFolderListFragment extends ListFragment {
 
 
     public void onPause() {
     public void onPause() {
         super.onPause();
         super.onPause();
-        this.mIsFragmentForground = false;
-        FolderFindTask folderFindTask = this.mFolderFindTask;
+        mIsFragmentForground = false;
+        FolderFindTask folderFindTask = mFolderFindTask;
         if (folderFindTask != null) {
         if (folderFindTask != null) {
             folderFindTask.cancel(true);
             folderFindTask.cancel(true);
-            this.mFolderFindTask = null;
-            this.mAdapter.releaseResource();
-            this.mAdapter.notifyDataSetChanged();
+            mFolderFindTask = null;
+            mAdapter.releaseResource();
+            mAdapter.notifyDataSetChanged();
         }
         }
     }
     }
 
 
     public void onResume() {
     public void onResume() {
         super.onResume();
         super.onResume();
         dismissNoImageDialog();
         dismissNoImageDialog();
-        this.mIsFragmentForground = true;
+        mIsFragmentForground = true;
         if (ActivityRequestPermissions.isRuntimePermissionSupported()) {
         if (ActivityRequestPermissions.isRuntimePermissionSupported()) {
             String[] strArr = {"android.permission.WRITE_EXTERNAL_STORAGE"};
             String[] strArr = {"android.permission.WRITE_EXTERNAL_STORAGE"};
             ActivityRequestPermissions.Permission permission = new ActivityRequestPermissions.Permission(strArr[0], new String[]{getString(R.string.permission_dialog_title), getString(R.string.permission_dialog_title)}, new String[]{ActivityRequestPermissions.DialogParameter.setMessage2((Fragment) this, getString(R.string.permission_dialog_message_storage)), ActivityRequestPermissions.DialogParameter.setMessage3A((Fragment) this, getString(R.string.permission_dialog_message_storage), getString(R.string.permission_function_storage))});
             ActivityRequestPermissions.Permission permission = new ActivityRequestPermissions.Permission(strArr[0], new String[]{getString(R.string.permission_dialog_title), getString(R.string.permission_dialog_title)}, new String[]{ActivityRequestPermissions.DialogParameter.setMessage2((Fragment) this, getString(R.string.permission_dialog_message_storage)), ActivityRequestPermissions.DialogParameter.setMessage3A((Fragment) this, getString(R.string.permission_dialog_message_storage), getString(R.string.permission_function_storage))});
@@ -108,10 +108,10 @@ public class ImageFolderListFragment extends ListFragment {
 
 
     public void onDetach() {
     public void onDetach() {
         super.onDetach();
         super.onDetach();
-        ImageFolderAdapter imageFolderAdapter = this.mAdapter;
+        ImageFolderAdapter imageFolderAdapter = mAdapter;
         if (imageFolderAdapter != null) {
         if (imageFolderAdapter != null) {
             imageFolderAdapter.releaseResource();
             imageFolderAdapter.releaseResource();
-            this.mAdapter = null;
+            mAdapter = null;
             setListAdapter((ListAdapter) null);
             setListAdapter((ListAdapter) null);
         }
         }
     }
     }
@@ -119,20 +119,20 @@ public class ImageFolderListFragment extends ListFragment {
     private void startFolderFindTask() {
     private void startFolderFindTask() {
         FolderSelectedListener folderSelectedListener = (FolderSelectedListener) getActivity();
         FolderSelectedListener folderSelectedListener = (FolderSelectedListener) getActivity();
         if (folderSelectedListener != null) {
         if (folderSelectedListener != null) {
-            FolderFindTask folderFindTask = this.mFolderFindTask;
+            FolderFindTask folderFindTask = mFolderFindTask;
             if (folderFindTask != null) {
             if (folderFindTask != null) {
                 folderFindTask.cancel(true);
                 folderFindTask.cancel(true);
-                this.mAdapter.releaseResource();
-                this.mAdapter.notifyDataSetChanged();
+                mAdapter.releaseResource();
+                mAdapter.notifyDataSetChanged();
             }
             }
-            this.mFolderFindTask = new FolderFindTask(this);
-            this.mFolderFindTask.execute(new ImageFinder[]{folderSelectedListener.getImageFinder()});
+            mFolderFindTask = new FolderFindTask(this);
+            mFolderFindTask.execute(new ImageFinder[]{folderSelectedListener.getImageFinder()});
         }
         }
     }
     }
 
 
     public void onFolderFindTaskEnd() {
     public void onFolderFindTaskEnd() {
         FragmentActivity activity = getActivity();
         FragmentActivity activity = getActivity();
-        if (activity != null && this.mIsFragmentForground && getItemSize() <= 0) {
+        if (activity != null && mIsFragmentForground && getItemSize() <= 0) {
             LocalAlertDialogFragment.newInstance(activity.getResources().getString(R.string.str_no_photo), R.string.unknow_error_title, 1).show(getChildFragmentManager(), FRAGMENT_TAG_NO_IMAGE_DIALOG);
             LocalAlertDialogFragment.newInstance(activity.getResources().getString(R.string.str_no_photo), R.string.unknow_error_title, 1).show(getChildFragmentManager(), FRAGMENT_TAG_NO_IMAGE_DIALOG);
         }
         }
     }
     }

+ 69 - 69
app/src/main/java/epson/print/imgsel/ImageGridFragment.java

@@ -58,32 +58,32 @@ public class ImageGridFragment extends Fragment implements AdapterView.OnItemCli
     }
     }
 
 
     public int getPhotoSelectionMode() {
     public int getPhotoSelectionMode() {
-        return this.mPhotoSelectionMode;
+        return mPhotoSelectionMode;
     }
     }
 
 
     public void setPhotoSelectionMode(int i) {
     public void setPhotoSelectionMode(int i) {
-        this.mPhotoSelectionMode = i;
+        mPhotoSelectionMode = i;
         SharedPreferences.Editor edit = getPreferences(getActivity()).edit();
         SharedPreferences.Editor edit = getPreferences(getActivity()).edit();
-        edit.putInt(Constants.PHOTO_SELECT_MODE, this.mPhotoSelectionMode);
+        edit.putInt(Constants.PHOTO_SELECT_MODE, mPhotoSelectionMode);
         edit.commit();
         edit.commit();
     }
     }
 
 
     public void onCreate(Bundle bundle) {
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         super.onCreate(bundle);
         if (getArguments() != null) {
         if (getArguments() != null) {
-            this.mPhotoFolderPath = getArguments().getString(ARG_PHOTO_FOLDER_PATH);
+            mPhotoFolderPath = getArguments().getString(ARG_PHOTO_FOLDER_PATH);
         }
         }
-        this.mPhotoSelectionMode = getPreferences(getActivity()).getInt(Constants.PHOTO_SELECT_MODE, 0);
+        mPhotoSelectionMode = getPreferences(getActivity()).getInt(Constants.PHOTO_SELECT_MODE, 0);
     }
     }
 
 
     public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
     public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
         View inflate = layoutInflater.inflate(R.layout.fragment_image_grid, viewGroup, false);
         View inflate = layoutInflater.inflate(R.layout.fragment_image_grid, viewGroup, false);
-        this.mGridView = (GridView) inflate.findViewById(R.id.gridView);
-        this.mAdapter = new Alt2ViewImageAdapter(this);
-        this.mGridView.setAdapter(this.mAdapter);
-        this.mGridView.setOnItemClickListener(this);
-        this.mGridView.getViewTreeObserver().addOnGlobalLayoutListener(new MyGridLayoutListener(this.mGridView, this.mAdapter, getActivity().getResources().getDimensionPixelSize(R.dimen.image_selector_grid_thumbnail_spacing)));
-        this.mImageSelector = ((ImageGridListener) getActivity()).getImageSelector();
+        mGridView = (GridView) inflate.findViewById(R.id.gridView);
+        mAdapter = new Alt2ViewImageAdapter(this);
+        mGridView.setAdapter(this.mAdapter);
+        mGridView.setOnItemClickListener(this);
+        mGridView.getViewTreeObserver().addOnGlobalLayoutListener(new MyGridLayoutListener(this.mGridView, mAdapter, getActivity().getResources().getDimensionPixelSize(R.dimen.image_selector_grid_thumbnail_spacing)));
+        mImageSelector = ((ImageGridListener) getActivity()).getImageSelector();
         getActivity().invalidateOptionsMenu();
         getActivity().invalidateOptionsMenu();
         restartImageFindTask();
         restartImageFindTask();
         return inflate;
         return inflate;
@@ -94,35 +94,35 @@ public class ImageGridFragment extends Fragment implements AdapterView.OnItemCli
     }
     }
 
 
     public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
     public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
-        Alt2ViewImageAdapter alt2ViewImageAdapter = this.mAdapter;
+        Alt2ViewImageAdapter alt2ViewImageAdapter = mAdapter;
         if (alt2ViewImageAdapter != null && !this.mDoubleClickGuard) {
         if (alt2ViewImageAdapter != null && !this.mDoubleClickGuard) {
             int i2 = 1;
             int i2 = 1;
-            this.mDoubleClickGuard = true;
+            mDoubleClickGuard = true;
             ImageItem imageItem = alt2ViewImageAdapter.getImageItem(i);
             ImageItem imageItem = alt2ViewImageAdapter.getImageItem(i);
-            if (imageItem == null || this.mImageSelector == null) {
-                this.mDoubleClickGuard = false;
+            if (imageItem == null || mImageSelector == null) {
+                mDoubleClickGuard = false;
                 return;
                 return;
             }
             }
             ImageSelectActivity imageSelectActivity = (ImageSelectActivity) getActivity();
             ImageSelectActivity imageSelectActivity = (ImageSelectActivity) getActivity();
             if (this.mPhotoSelectionMode != 1 || imageSelectActivity.singleImageMode()) {
             if (this.mPhotoSelectionMode != 1 || imageSelectActivity.singleImageMode()) {
                 startViewPagerActivity(i);
                 startViewPagerActivity(i);
-            } else if (imageItem.getSelected() != 0 || this.mImageSelector.canAdd()) {
-                this.mImageSelector.toggleSelect(imageItem.getPath());
+            } else if (imageItem.getSelected() != 0 || mImageSelector.canAdd()) {
+                mImageSelector.toggleSelect(imageItem.getPath());
                 if (imageItem.getSelected() != 0) {
                 if (imageItem.getSelected() != 0) {
                     i2 = 0;
                     i2 = 0;
                 }
                 }
                 imageItem.setSelected(i2);
                 imageItem.setSelected(i2);
-                this.mAdapter.notifyDataSetChanged();
+                mAdapter.notifyDataSetChanged();
                 getActivity().invalidateOptionsMenu();
                 getActivity().invalidateOptionsMenu();
             } else {
             } else {
                 try {
                 try {
                     LocalAlertDialogFragment.newInstance(getString(R.string.max_image), 3).show(getChildFragmentManager(), "alert dialog");
                     LocalAlertDialogFragment.newInstance(getString(R.string.max_image), 3).show(getChildFragmentManager(), "alert dialog");
                 } catch (IllegalStateException unused) {
                 } catch (IllegalStateException unused) {
                 }
                 }
-                this.mDoubleClickGuard = false;
+                mDoubleClickGuard = false;
                 return;
                 return;
             }
             }
-            this.mDoubleClickGuard = false;
+            mDoubleClickGuard = false;
         }
         }
     }
     }
 
 
@@ -133,21 +133,21 @@ public class ImageGridFragment extends Fragment implements AdapterView.OnItemCli
     public void onDetach() {
     public void onDetach() {
         super.onDetach();
         super.onDetach();
         Log.d("ImageGridFragment", "onDetach()");
         Log.d("ImageGridFragment", "onDetach()");
-        ImageFindTask imageFindTask = this.mImageFindTask;
+        ImageFindTask imageFindTask = mImageFindTask;
         if (imageFindTask != null) {
         if (imageFindTask != null) {
             imageFindTask.cancel(true);
             imageFindTask.cancel(true);
-            this.mImageFindTask = null;
+            mImageFindTask = null;
         }
         }
-        ImageThumbnailTask imageThumbnailTask = this.mImageThumbnailTask;
+        ImageThumbnailTask imageThumbnailTask = mImageThumbnailTask;
         if (imageThumbnailTask != null) {
         if (imageThumbnailTask != null) {
             imageThumbnailTask.cancel(true);
             imageThumbnailTask.cancel(true);
-            this.mImageThumbnailTask = null;
+            mImageThumbnailTask = null;
         }
         }
-        Alt2ViewImageAdapter alt2ViewImageAdapter = this.mAdapter;
+        Alt2ViewImageAdapter alt2ViewImageAdapter = mAdapter;
         if (alt2ViewImageAdapter != null) {
         if (alt2ViewImageAdapter != null) {
             alt2ViewImageAdapter.recycleBitmap();
             alt2ViewImageAdapter.recycleBitmap();
-            this.mAdapter = null;
-            this.mGridView.setAdapter((ListAdapter) null);
+            mAdapter = null;
+            mGridView.setAdapter((ListAdapter) null);
         }
         }
         FragmentActivity activity = getActivity();
         FragmentActivity activity = getActivity();
         if (activity != null) {
         if (activity != null) {
@@ -156,14 +156,14 @@ public class ImageGridFragment extends Fragment implements AdapterView.OnItemCli
     }
     }
 
 
     private void startViewPagerActivity(int i) {
     private void startViewPagerActivity(int i) {
-        Alt2ViewImageAdapter alt2ViewImageAdapter = this.mAdapter;
-        if (alt2ViewImageAdapter != null && this.mImageSelector != null) {
+        Alt2ViewImageAdapter alt2ViewImageAdapter = mAdapter;
+        if (alt2ViewImageAdapter != null && mImageSelector != null) {
             ArrayList<String> fileList = alt2ViewImageAdapter.getFileList();
             ArrayList<String> fileList = alt2ViewImageAdapter.getFileList();
             ImageSelectActivity imageSelectActivity = (ImageSelectActivity) getActivity();
             ImageSelectActivity imageSelectActivity = (ImageSelectActivity) getActivity();
             if (imageSelectActivity != null) {
             if (imageSelectActivity != null) {
                 Intent intent = new Intent(imageSelectActivity, imageSelectActivity.showNfcInvalidMessageOnPagerActivity() ? ImageViewPagerWithNfcInvalidPrintMessageActivity.class : ImageViewPagerActivity.class);
                 Intent intent = new Intent(imageSelectActivity, imageSelectActivity.showNfcInvalidMessageOnPagerActivity() ? ImageViewPagerWithNfcInvalidPrintMessageActivity.class : ImageViewPagerActivity.class);
                 intent.putExtra(ImageViewPagerActivity.PARAMS_KEY_POSITION, i);
                 intent.putExtra(ImageViewPagerActivity.PARAMS_KEY_POSITION, i);
-                intent.putExtra(ImageViewPagerActivity.PARAMS_KEY_SELECTOR, this.mImageSelector.getFileArrayList());
+                intent.putExtra(ImageViewPagerActivity.PARAMS_KEY_SELECTOR, mImageSelector.getFileArrayList());
                 intent.putExtra(ImageViewPagerActivity.PARAMS_SINGLE_FILE_MODE, imageSelectActivity.singleImageMode());
                 intent.putExtra(ImageViewPagerActivity.PARAMS_SINGLE_FILE_MODE, imageSelectActivity.singleImageMode());
                 intent.putExtra(ImageViewPagerActivity.PARAMS_MESSAGE_TYPE, imageSelectActivity.getMessageType());
                 intent.putExtra(ImageViewPagerActivity.PARAMS_MESSAGE_TYPE, imageSelectActivity.getMessageType());
                 ImageViewPagerActivity.setFileList(fileList);
                 ImageViewPagerActivity.setFileList(fileList);
@@ -178,15 +178,15 @@ public class ImageGridFragment extends Fragment implements AdapterView.OnItemCli
 
 
     public void updateImageSelector(ArrayList<String> arrayList) {
     public void updateImageSelector(ArrayList<String> arrayList) {
         if (arrayList != null) {
         if (arrayList != null) {
-            this.mImageSelector.replaceFiles(arrayList);
-            Alt2ViewImageAdapter alt2ViewImageAdapter = this.mAdapter;
+            mImageSelector.replaceFiles(arrayList);
+            Alt2ViewImageAdapter alt2ViewImageAdapter = mAdapter;
             if (alt2ViewImageAdapter != null) {
             if (alt2ViewImageAdapter != null) {
                 int count = alt2ViewImageAdapter.getCount();
                 int count = alt2ViewImageAdapter.getCount();
                 for (int i = 0; i < count; i++) {
                 for (int i = 0; i < count; i++) {
-                    ImageItem imageItem = this.mAdapter.getImageItem(i);
+                    ImageItem imageItem = mAdapter.getImageItem(i);
                     imageItem.setSelected(this.mImageSelector.isSelected(imageItem.getPath()) ? 1 : 0);
                     imageItem.setSelected(this.mImageSelector.isSelected(imageItem.getPath()) ? 1 : 0);
                 }
                 }
-                this.mAdapter.notifyDataSetChanged();
+                mAdapter.notifyDataSetChanged();
             }
             }
             FragmentActivity activity = getActivity();
             FragmentActivity activity = getActivity();
             if (activity != null) {
             if (activity != null) {
@@ -209,8 +209,8 @@ public class ImageGridFragment extends Fragment implements AdapterView.OnItemCli
 
 
     public void onResume() {
     public void onResume() {
         super.onResume();
         super.onResume();
-        this.mDoubleClickGuard = false;
-        ImageThumbnailTask imageThumbnailTask = this.mImageThumbnailTask;
+        mDoubleClickGuard = false;
+        ImageThumbnailTask imageThumbnailTask = mImageThumbnailTask;
         if (imageThumbnailTask != null) {
         if (imageThumbnailTask != null) {
             imageThumbnailTask.setSuspend(false);
             imageThumbnailTask.setSuspend(false);
         }
         }
@@ -218,7 +218,7 @@ public class ImageGridFragment extends Fragment implements AdapterView.OnItemCli
 
 
     public void onPause() {
     public void onPause() {
         super.onPause();
         super.onPause();
-        ImageThumbnailTask imageThumbnailTask = this.mImageThumbnailTask;
+        ImageThumbnailTask imageThumbnailTask = mImageThumbnailTask;
         if (imageThumbnailTask != null) {
         if (imageThumbnailTask != null) {
             imageThumbnailTask.setSuspend(true);
             imageThumbnailTask.setSuspend(true);
         }
         }
@@ -227,29 +227,29 @@ public class ImageGridFragment extends Fragment implements AdapterView.OnItemCli
     private void restartImageFindTask() {
     private void restartImageFindTask() {
         ImageGridListener imageGridListener = (ImageGridListener) getActivity();
         ImageGridListener imageGridListener = (ImageGridListener) getActivity();
         if (imageGridListener != null) {
         if (imageGridListener != null) {
-            this.mImageFindTask = new ImageFindTask(this, this.mPhotoFolderPath);
-            this.mImageFindTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new ImageFinder[]{imageGridListener.getImageFinder()});
-            this.mImageThumbnailTask = new ImageThumbnailTask(this);
+            mImageFindTask = new ImageFindTask(this, mPhotoFolderPath);
+            mImageFindTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new ImageFinder[]{imageGridListener.getImageFinder()});
+            mImageThumbnailTask = new ImageThumbnailTask(this);
         }
         }
     }
     }
 
 
     public boolean isImageSelected(String str) {
     public boolean isImageSelected(String str) {
-        return this.mImageSelector.isSelected(str);
+        return mImageSelector.isSelected(str);
     }
     }
 
 
     public String getFolderName() {
     public String getFolderName() {
-        return this.mPhotoFolderPath;
+        return mPhotoFolderPath;
     }
     }
 
 
     public void addItem(List<ImageItem> list) {
     public void addItem(List<ImageItem> list) {
-        if (list != null && this.mAdapter != null && this.mImageThumbnailTask != null) {
+        if (list != null && mAdapter != null && mImageThumbnailTask != null) {
             for (ImageItem next : list) {
             for (ImageItem next : list) {
-                this.mAdapter.add(next);
-                this.mImageThumbnailTask.addLast(next);
+                mAdapter.add(next);
+                mImageThumbnailTask.addLast(next);
             }
             }
-            this.mAdapter.notifyDataSetChanged();
+            mAdapter.notifyDataSetChanged();
             if (this.mImageThumbnailTask.getStatus() == AsyncTask.Status.PENDING) {
             if (this.mImageThumbnailTask.getStatus() == AsyncTask.Status.PENDING) {
-                this.mImageThumbnailTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
+                mImageThumbnailTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
             }
             }
         }
         }
     }
     }
@@ -257,36 +257,36 @@ public class ImageGridFragment extends Fragment implements AdapterView.OnItemCli
     public void updateItem(ImageItem imageItem) {
     public void updateItem(ImageItem imageItem) {
         Alt2ViewImageAdapter alt2ViewImageAdapter;
         Alt2ViewImageAdapter alt2ViewImageAdapter;
         int position;
         int position;
-        if (imageItem != null && (alt2ViewImageAdapter = this.mAdapter) != null && this.mGridView != null && (position = alt2ViewImageAdapter.getPosition(imageItem)) != -1) {
-            this.mAdapter.getImageItem(position).setBitmap(imageItem.getBitmap());
-            int firstVisiblePosition = this.mGridView.getFirstVisiblePosition();
-            int lastVisiblePosition = this.mGridView.getLastVisiblePosition();
+        if (imageItem != null && (alt2ViewImageAdapter = mAdapter) != null && mGridView != null && (position = alt2ViewImageAdapter.getPosition(imageItem)) != -1) {
+            mAdapter.getImageItem(position).setBitmap(imageItem.getBitmap());
+            int firstVisiblePosition = mGridView.getFirstVisiblePosition();
+            int lastVisiblePosition = mGridView.getLastVisiblePosition();
             if (firstVisiblePosition <= position && lastVisiblePosition >= position) {
             if (firstVisiblePosition <= position && lastVisiblePosition >= position) {
-                this.mAdapter.notifyDataSetChanged();
+                mAdapter.notifyDataSetChanged();
             }
             }
         }
         }
     }
     }
 
 
     public void updateData() {
     public void updateData() {
-        Alt2ViewImageAdapter alt2ViewImageAdapter = this.mAdapter;
-        if (alt2ViewImageAdapter != null && this.mGridView != null && this.mImageThumbnailTask != null) {
+        Alt2ViewImageAdapter alt2ViewImageAdapter = mAdapter;
+        if (alt2ViewImageAdapter != null && mGridView != null && mImageThumbnailTask != null) {
             alt2ViewImageAdapter.notifyDataSetChanged();
             alt2ViewImageAdapter.notifyDataSetChanged();
-            this.mImageThumbnailTask.setFinish(true);
+            mImageThumbnailTask.setFinish(true);
         }
         }
     }
     }
 
 
     public void changeThumnailPriority(ImageItem imageItem) {
     public void changeThumnailPriority(ImageItem imageItem) {
-        ImageThumbnailTask imageThumbnailTask = this.mImageThumbnailTask;
+        ImageThumbnailTask imageThumbnailTask = mImageThumbnailTask;
         if (imageThumbnailTask != null) {
         if (imageThumbnailTask != null) {
             imageThumbnailTask.moveToFirst(imageItem);
             imageThumbnailTask.moveToFirst(imageItem);
         }
         }
     }
     }
 
 
     public void clearItem() {
     public void clearItem() {
-        Alt2ViewImageAdapter alt2ViewImageAdapter = this.mAdapter;
+        Alt2ViewImageAdapter alt2ViewImageAdapter = mAdapter;
         if (alt2ViewImageAdapter != null) {
         if (alt2ViewImageAdapter != null) {
             alt2ViewImageAdapter.clearImageItem();
             alt2ViewImageAdapter.clearImageItem();
-            this.mAdapter.notifyDataSetChanged();
+            mAdapter.notifyDataSetChanged();
         }
         }
     }
     }
 
 
@@ -296,32 +296,32 @@ public class ImageGridFragment extends Fragment implements AdapterView.OnItemCli
         private int mHorizontalSpacing;
         private int mHorizontalSpacing;
 
 
         public MyGridLayoutListener(GridView gridView, Alt2ViewImageAdapter alt2ViewImageAdapter, int i) {
         public MyGridLayoutListener(GridView gridView, Alt2ViewImageAdapter alt2ViewImageAdapter, int i) {
-            this.mGridView = gridView;
-            this.mAdapter = alt2ViewImageAdapter;
-            this.mHorizontalSpacing = i;
+            mGridView = gridView;
+            mAdapter = alt2ViewImageAdapter;
+            mHorizontalSpacing = i;
         }
         }
 
 
         @TargetApi(16)
         @TargetApi(16)
         public void onGlobalLayout() {
         public void onGlobalLayout() {
-            int numColumns = this.mGridView.getNumColumns();
+            int numColumns = mGridView.getNumColumns();
             if (numColumns <= 0) {
             if (numColumns <= 0) {
                 return;
                 return;
             }
             }
             if (Build.VERSION.SDK_INT >= 16) {
             if (Build.VERSION.SDK_INT >= 16) {
                 setNewVerticalParams();
                 setNewVerticalParams();
-                this.mGridView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                mGridView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
                 return;
                 return;
             }
             }
-            int width = this.mGridView.getWidth();
-            int i = this.mHorizontalSpacing;
-            this.mAdapter.setHeight(((width + i) / numColumns) - i);
-            this.mGridView.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+            int width = mGridView.getWidth();
+            int i = mHorizontalSpacing;
+            mAdapter.setHeight(((width + i) / numColumns) - i);
+            mGridView.getViewTreeObserver().removeGlobalOnLayoutListener(this);
         }
         }
 
 
         @TargetApi(16)
         @TargetApi(16)
         private void setNewVerticalParams() {
         private void setNewVerticalParams() {
-            this.mGridView.setVerticalSpacing(this.mGridView.getHorizontalSpacing());
-            this.mAdapter.setHeight(this.mGridView.getColumnWidth());
+            mGridView.setVerticalSpacing(this.mGridView.getHorizontalSpacing());
+            mAdapter.setHeight(this.mGridView.getColumnWidth());
         }
         }
     }
     }
 }
 }

+ 12 - 12
app/src/main/java/epson/print/imgsel/ImageResizer.java

@@ -35,25 +35,25 @@ public class ImageResizer {
     }
     }
 
 
     private ImageResizer(int i, File file) {
     private ImageResizer(int i, File file) {
-        this.mReqSize = i;
-        this.mBitmapCache.initialize(file);
+        mReqSize = i;
+        mBitmapCache.initialize(file);
     }
     }
 
 
     public void setActivityForeground(boolean z) {
     public void setActivityForeground(boolean z) {
-        this.mIsTargetActivityForeground = z;
+        mIsTargetActivityForeground = z;
         if (!z) {
         if (!z) {
-            this.mBitmapCache.saveJournal();
+            mBitmapCache.saveJournal();
         }
         }
     }
     }
 
 
     public ResizeTask load(String str, BitmapDrawer bitmapDrawer) {
     public ResizeTask load(String str, BitmapDrawer bitmapDrawer) {
         File file = new File(str);
         File file = new File(str);
-        Bitmap bitmap = this.mBitmapCache.getBitmap(file);
+        Bitmap bitmap = mBitmapCache.getBitmap(file);
         if (bitmap != null) {
         if (bitmap != null) {
             updateImageViewBitmap(bitmap, bitmapDrawer);
             updateImageViewBitmap(bitmap, bitmapDrawer);
             return null;
             return null;
         }
         }
-        ResizeTask resizeTask = new ResizeTask(file, bitmapDrawer, this.mReqSize);
+        ResizeTask resizeTask = new ResizeTask(file, bitmapDrawer, mReqSize);
         resizeTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
         resizeTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
         return resizeTask;
         return resizeTask;
     }
     }
@@ -70,19 +70,19 @@ public class ImageResizer {
         private int mReqSize;
         private int mReqSize;
 
 
         public ResizeTask(File file, BitmapDrawer bitmapDrawer, int i) {
         public ResizeTask(File file, BitmapDrawer bitmapDrawer, int i) {
-            this.mOrgFile = file;
-            this.mImageImageDrawerReference = new WeakReference<>(bitmapDrawer);
-            this.mReqSize = i;
+            mOrgFile = file;
+            mImageImageDrawerReference = new WeakReference<>(bitmapDrawer);
+            mReqSize = i;
         }
         }
 
 
         protected Bitmap doInBackground(Void... voidArr) {
         protected Bitmap doInBackground(Void... voidArr) {
             File file;
             File file;
             Bitmap bitmap;
             Bitmap bitmap;
-            if (isCancelled() || !ImageResizer.this.mIsTargetActivityForeground || (file = this.mOrgFile) == null) {
+            if (isCancelled() || !ImageResizer.this.mIsTargetActivityForeground || (file = mOrgFile) == null) {
                 return null;
                 return null;
             }
             }
             try {
             try {
-                bitmap = ImageUtil.loadBitmap(file.toString(), this.mReqSize, this.mReqSize, true, true);
+                bitmap = ImageUtil.loadBitmap(file.toString(), mReqSize, mReqSize, true, true);
             } catch (OutOfMemoryError e) {
             } catch (OutOfMemoryError e) {
                 Log.w("ImageResizer", "doInBackground:" + e.toString());
                 Log.w("ImageResizer", "doInBackground:" + e.toString());
                 bitmap = null;
                 bitmap = null;
@@ -135,7 +135,7 @@ public class ImageResizer {
         }
         }
 
 
         protected void onPostExecute(Bitmap bitmap) {
         protected void onPostExecute(Bitmap bitmap) {
-            BitmapDrawer bitmapDrawer = (BitmapDrawer) this.mImageImageDrawerReference.get();
+            BitmapDrawer bitmapDrawer = (BitmapDrawer) mImageImageDrawerReference.get();
             if (bitmap != null && bitmapDrawer != null) {
             if (bitmap != null && bitmapDrawer != null) {
                 bitmapDrawer.setBitmap(bitmap);
                 bitmapDrawer.setBitmap(bitmap);
             }
             }

+ 8 - 8
app/src/main/java/epson/print/imgsel/ImageSelectActivity.java

@@ -45,16 +45,16 @@ public abstract class ImageSelectActivity extends ActivityIACommon implements Im
         if (bundle == null) {
         if (bundle == null) {
             getSupportFragmentManager().beginTransaction().add(R.id.container, new ImageFolderListFragment(), TAG_FRAGMENT_FOLDER_LIST).commit();
             getSupportFragmentManager().beginTransaction().add(R.id.container, new ImageFolderListFragment(), TAG_FRAGMENT_FOLDER_LIST).commit();
         }
         }
-        this.mImageSelector = new ImageSelector();
+        mImageSelector = new ImageSelector();
         if (bundle != null) {
         if (bundle != null) {
             ArrayList<String> stringArrayList = bundle.getStringArrayList(STATE_SELECT_LIST);
             ArrayList<String> stringArrayList = bundle.getStringArrayList(STATE_SELECT_LIST);
             if (stringArrayList != null) {
             if (stringArrayList != null) {
-                this.mImageSelector.replaceFiles(stringArrayList);
+                mImageSelector.replaceFiles(stringArrayList);
             }
             }
         } else {
         } else {
             ArrayList<String> selectedListFromIntent = getSelectedListFromIntent(getIntent());
             ArrayList<String> selectedListFromIntent = getSelectedListFromIntent(getIntent());
             if (selectedListFromIntent != null) {
             if (selectedListFromIntent != null) {
-                this.mImageSelector.replaceFiles(selectedListFromIntent);
+                mImageSelector.replaceFiles(selectedListFromIntent);
             }
             }
         }
         }
         if (!Utils.isMediaMounted()) {
         if (!Utils.isMediaMounted()) {
@@ -72,7 +72,7 @@ public abstract class ImageSelectActivity extends ActivityIACommon implements Im
     }
     }
 
 
     public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onCreateOptionsMenu(Menu menu) {
-        int selectedNumber = this.mImageSelector.selectedNumber();
+        int selectedNumber = mImageSelector.selectedNumber();
         getMenuInflater().inflate(R.C2138menu.menu_image_selector, menu);
         getMenuInflater().inflate(R.C2138menu.menu_image_selector, menu);
         MenuItem findItem = menu.findItem(R.id.action_go_preview);
         MenuItem findItem = menu.findItem(R.id.action_go_preview);
         if (!singleImageMode()) {
         if (!singleImageMode()) {
@@ -144,7 +144,7 @@ public abstract class ImageSelectActivity extends ActivityIACommon implements Im
     }
     }
 
 
     protected void onSaveInstanceState(Bundle bundle) {
     protected void onSaveInstanceState(Bundle bundle) {
-        bundle.putStringArrayList(STATE_SELECT_LIST, this.mImageSelector.getFileArrayList());
+        bundle.putStringArrayList(STATE_SELECT_LIST, mImageSelector.getFileArrayList());
         super.onSaveInstanceState(bundle);
         super.onSaveInstanceState(bundle);
     }
     }
 
 
@@ -165,7 +165,7 @@ public abstract class ImageSelectActivity extends ActivityIACommon implements Im
 
 
     protected void refreshSelector(ArrayList<String> arrayList) {
     protected void refreshSelector(ArrayList<String> arrayList) {
         if (arrayList != null) {
         if (arrayList != null) {
-            this.mImageSelector.replaceFiles(arrayList);
+            mImageSelector.replaceFiles(arrayList);
             if (getGridFragment() != null) {
             if (getGridFragment() != null) {
                 getGridFragment().updateImageSelector(arrayList);
                 getGridFragment().updateImageSelector(arrayList);
             }
             }
@@ -178,7 +178,7 @@ public abstract class ImageSelectActivity extends ActivityIACommon implements Im
     }
     }
 
 
     public ImageSelector getImageSelector() {
     public ImageSelector getImageSelector() {
-        return this.mImageSelector;
+        return mImageSelector;
     }
     }
 
 
     public void onDialogCallback(int i) {
     public void onDialogCallback(int i) {
@@ -220,7 +220,7 @@ public abstract class ImageSelectActivity extends ActivityIACommon implements Im
 
 
         public Dialog onCreateDialog(Bundle bundle) {
         public Dialog onCreateDialog(Bundle bundle) {
             CharSequence[] charSequenceArr = {getActivity().getString(R.string.str_use_mediastorage_thumbnail)};
             CharSequence[] charSequenceArr = {getActivity().getString(R.string.str_use_mediastorage_thumbnail)};
-            this.mUseMediaStoreThumbnail = AltThumbnailCache.isUseMediaStoreThumbnail();
+            mUseMediaStoreThumbnail = AltThumbnailCache.isUseMediaStoreThumbnail();
             boolean[] zArr = {this.mUseMediaStoreThumbnail};
             boolean[] zArr = {this.mUseMediaStoreThumbnail};
             AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
             AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
             builder.setPositiveButton(R.string.f343ok, new DialogInterface.OnClickListener() {
             builder.setPositiveButton(R.string.f343ok, new DialogInterface.OnClickListener() {

+ 14 - 14
app/src/main/java/epson/print/imgsel/ImageSelector.java

@@ -7,62 +7,62 @@ public class ImageSelector {
     private ArrayList<String> mImageFilenameList;
     private ArrayList<String> mImageFilenameList;
 
 
     public ImageSelector() {
     public ImageSelector() {
-        this.mImageFilenameList = new ArrayList<>();
+        mImageFilenameList = new ArrayList<>();
     }
     }
 
 
     public ImageSelector(ArrayList<String> arrayList) {
     public ImageSelector(ArrayList<String> arrayList) {
-        this.mImageFilenameList = arrayList;
+        mImageFilenameList = arrayList;
         if (this.mImageFilenameList == null) {
         if (this.mImageFilenameList == null) {
-            this.mImageFilenameList = new ArrayList<>();
+            mImageFilenameList = new ArrayList<>();
         }
         }
     }
     }
 
 
     public void replaceFiles(ArrayList<String> arrayList) {
     public void replaceFiles(ArrayList<String> arrayList) {
-        this.mImageFilenameList = arrayList;
+        mImageFilenameList = arrayList;
     }
     }
 
 
     public boolean toggleSelect(String str) {
     public boolean toggleSelect(String str) {
         if (this.mImageFilenameList.contains(str)) {
         if (this.mImageFilenameList.contains(str)) {
-            this.mImageFilenameList.remove(str);
+            mImageFilenameList.remove(str);
             return false;
             return false;
         } else if (selectedNumber() >= 30) {
         } else if (selectedNumber() >= 30) {
             return false;
             return false;
         } else {
         } else {
-            this.mImageFilenameList.add(str);
+            mImageFilenameList.add(str);
             return true;
             return true;
         }
         }
     }
     }
 
 
     public boolean add(String str) {
     public boolean add(String str) {
-        if (selectedNumber() >= 30 || this.mImageFilenameList.contains(str)) {
+        if (selectedNumber() >= 30 || mImageFilenameList.contains(str)) {
             return false;
             return false;
         }
         }
-        this.mImageFilenameList.add(str);
+        mImageFilenameList.add(str);
         return true;
         return true;
     }
     }
 
 
     public boolean remove(String str) {
     public boolean remove(String str) {
-        this.mImageFilenameList.remove(str);
+        mImageFilenameList.remove(str);
         return true;
         return true;
     }
     }
 
 
     public void clear() {
     public void clear() {
-        this.mImageFilenameList.clear();
+        mImageFilenameList.clear();
     }
     }
 
 
     public boolean isSelected(String str) {
     public boolean isSelected(String str) {
-        return this.mImageFilenameList.contains(str);
+        return mImageFilenameList.contains(str);
     }
     }
 
 
     public ArrayList<String> getFileArrayList() {
     public ArrayList<String> getFileArrayList() {
-        return this.mImageFilenameList;
+        return mImageFilenameList;
     }
     }
 
 
     public int selectedNumber() {
     public int selectedNumber() {
-        return this.mImageFilenameList.size();
+        return mImageFilenameList.size();
     }
     }
 
 
     public boolean canAdd() {
     public boolean canAdd() {
-        return this.mImageFilenameList.size() < 30;
+        return mImageFilenameList.size() < 30;
     }
     }
 }
 }

+ 8 - 8
app/src/main/java/epson/print/imgsel/ImageThumbnailTask.java

@@ -21,8 +21,8 @@ public class ImageThumbnailTask extends AsyncTask<Void, ImageItem, Void> impleme
     private volatile boolean suspend = false;
     private volatile boolean suspend = false;
 
 
     public ImageThumbnailTask(ImageGridFragment imageGridFragment) {
     public ImageThumbnailTask(ImageGridFragment imageGridFragment) {
-        this.mFragmentReference = new WeakReference<>(imageGridFragment);
-        this.imageItems = new LinkedList<>();
+        mFragmentReference = new WeakReference<>(imageGridFragment);
+        imageItems = new LinkedList<>();
     }
     }
 
 
     protected Void doInBackground(Void... voidArr) {
     protected Void doInBackground(Void... voidArr) {
@@ -66,7 +66,7 @@ public class ImageThumbnailTask extends AsyncTask<Void, ImageItem, Void> impleme
     }
     }
 
 
     protected void onProgressUpdate(ImageItem... imageItemArr) {
     protected void onProgressUpdate(ImageItem... imageItemArr) {
-        ImageGridFragment imageGridFragment = (ImageGridFragment) this.mFragmentReference.get();
+        ImageGridFragment imageGridFragment = (ImageGridFragment) mFragmentReference.get();
         if (imageGridFragment != null && imageItemArr != null && imageItemArr.length > 0) {
         if (imageGridFragment != null && imageItemArr != null && imageItemArr.length > 0) {
             imageGridFragment.updateItem(imageItemArr[0]);
             imageGridFragment.updateItem(imageItemArr[0]);
         }
         }
@@ -75,7 +75,7 @@ public class ImageThumbnailTask extends AsyncTask<Void, ImageItem, Void> impleme
     private synchronized ImageItem getFirst() {
     private synchronized ImageItem getFirst() {
         if (this.imageItems != null) {
         if (this.imageItems != null) {
             if (this.imageItems.size() > 0) {
             if (this.imageItems.size() > 0) {
-                return this.imageItems.remove(0);
+                return imageItems.remove(0);
             }
             }
         }
         }
         return null;
         return null;
@@ -127,21 +127,21 @@ public class ImageThumbnailTask extends AsyncTask<Void, ImageItem, Void> impleme
 
 
     private synchronized void addLast(ImageItem imageItem) {
     private synchronized void addLast(ImageItem imageItem) {
         if (this.imageItems != null) {
         if (this.imageItems != null) {
-            this.imageItems.addLast(imageItem);
+            imageItems.addLast(imageItem);
         }
         }
     }
     }
 
 
     public void setFinish(boolean z) {
     public void setFinish(boolean z) {
-        this.finish = z;
+        finish = z;
     }
     }
 
 
     public void setSuspend(boolean z) {
     public void setSuspend(boolean z) {
-        this.suspend = z;
+        suspend = z;
     }
     }
 
 
     private ContentResolver getResolver() {
     private ContentResolver getResolver() {
         FragmentActivity activity;
         FragmentActivity activity;
-        ImageGridFragment imageGridFragment = (ImageGridFragment) this.mFragmentReference.get();
+        ImageGridFragment imageGridFragment = (ImageGridFragment) mFragmentReference.get();
         if (imageGridFragment == null || (activity = imageGridFragment.getActivity()) == null) {
         if (imageGridFragment == null || (activity = imageGridFragment.getActivity()) == null) {
             return null;
             return null;
         }
         }

+ 14 - 14
app/src/main/java/epson/print/imgsel/ImageViewBaseFragment.java

@@ -38,17 +38,17 @@ public class ImageViewBaseFragment extends Fragment implements ImageResizer.Bitm
     public void onCreate(Bundle bundle) {
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         super.onCreate(bundle);
         if (getArguments() != null) {
         if (getArguments() != null) {
-            this.mFileName = getArguments().getString("file_name");
+            mFileName = getArguments().getString("file_name");
         }
         }
     }
     }
 
 
     public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
     public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
         if (bundle != null) {
         if (bundle != null) {
-            ScalableImageView scalableImageView = this.mImageView;
+            ScalableImageView scalableImageView = mImageView;
             scalableImageView.setmScaleFactor(bundle.getFloat(paramScale, scalableImageView.getmScaleFactor()));
             scalableImageView.setmScaleFactor(bundle.getFloat(paramScale, scalableImageView.getmScaleFactor()));
-            ScalableImageView scalableImageView2 = this.mImageView;
+            ScalableImageView scalableImageView2 = mImageView;
             scalableImageView2.setmOffsetX(bundle.getFloat(paramOffsetX, scalableImageView2.getmOffsetX()));
             scalableImageView2.setmOffsetX(bundle.getFloat(paramOffsetX, scalableImageView2.getmOffsetX()));
-            ScalableImageView scalableImageView3 = this.mImageView;
+            ScalableImageView scalableImageView3 = mImageView;
             scalableImageView3.setmOffsetY(bundle.getFloat(paramOffsetY, scalableImageView3.getmOffsetY()));
             scalableImageView3.setmOffsetY(bundle.getFloat(paramOffsetY, scalableImageView3.getmOffsetY()));
         }
         }
         return super.onCreateView(layoutInflater, viewGroup, bundle);
         return super.onCreateView(layoutInflater, viewGroup, bundle);
@@ -56,20 +56,20 @@ public class ImageViewBaseFragment extends Fragment implements ImageResizer.Bitm
 
 
     public void onSaveInstanceState(Bundle bundle) {
     public void onSaveInstanceState(Bundle bundle) {
         super.onSaveInstanceState(bundle);
         super.onSaveInstanceState(bundle);
-        bundle.putFloat(paramScale, this.mImageView.getmScaleFactor());
-        bundle.putFloat(paramOffsetX, this.mImageView.getmOffsetX());
-        bundle.putFloat(paramOffsetY, this.mImageView.getmOffsetY());
+        bundle.putFloat(paramScale, mImageView.getmScaleFactor());
+        bundle.putFloat(paramOffsetX, mImageView.getmOffsetX());
+        bundle.putFloat(paramOffsetY, mImageView.getmOffsetY());
     }
     }
 
 
     public void onActivityCreated(Bundle bundle) {
     public void onActivityCreated(Bundle bundle) {
         super.onActivityCreated(bundle);
         super.onActivityCreated(bundle);
-        this.mLoadTask = ((ImageViewPagerActivity) getActivity()).getImageResizer().load(this.mFileName, this);
+        mLoadTask = ((ImageViewPagerActivity) getActivity()).getImageResizer().load(this.mFileName, this);
     }
     }
 
 
     public void onAttach(Context context) {
     public void onAttach(Context context) {
         super.onAttach(context);
         super.onAttach(context);
         try {
         try {
-            this.mListener = (OnFragmentInteractionListener) context;
+            mListener = (OnFragmentInteractionListener) context;
         } catch (ClassCastException unused) {
         } catch (ClassCastException unused) {
             throw new ClassCastException(context.toString() + " must implement OnFragmentInteractionListener");
             throw new ClassCastException(context.toString() + " must implement OnFragmentInteractionListener");
         }
         }
@@ -77,7 +77,7 @@ public class ImageViewBaseFragment extends Fragment implements ImageResizer.Bitm
 
 
     public void onDestroy() {
     public void onDestroy() {
         super.onDestroy();
         super.onDestroy();
-        ImageResizer.ResizeTask resizeTask = this.mLoadTask;
+        ImageResizer.ResizeTask resizeTask = mLoadTask;
         if (resizeTask != null) {
         if (resizeTask != null) {
             resizeTask.cancel(true);
             resizeTask.cancel(true);
         }
         }
@@ -85,15 +85,15 @@ public class ImageViewBaseFragment extends Fragment implements ImageResizer.Bitm
 
 
     public void onDetach() {
     public void onDetach() {
         super.onDetach();
         super.onDetach();
-        this.mListener = null;
+        mListener = null;
     }
     }
 
 
     public void setBitmap(Bitmap bitmap) {
     public void setBitmap(Bitmap bitmap) {
-        ScalableImageView scalableImageView = this.mImageView;
+        ScalableImageView scalableImageView = mImageView;
         if (scalableImageView != null && bitmap != null) {
         if (scalableImageView != null && bitmap != null) {
             scalableImageView.setImageBitmap(bitmap);
             scalableImageView.setImageBitmap(bitmap);
-            this.mImageView.setVisibility(0);
-            this.mProgressBar.setVisibility(4);
+            mImageView.setVisibility(0);
+            mProgressBar.setVisibility(4);
         }
         }
     }
     }
 }
 }

+ 16 - 16
app/src/main/java/epson/print/imgsel/ImageViewMultiSelectFragment.java

@@ -26,19 +26,19 @@ public class ImageViewMultiSelectFragment extends ImageViewBaseFragment {
 
 
     public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
     public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
         View inflate = layoutInflater.inflate(R.layout.fragment_image_view_multi, viewGroup, false);
         View inflate = layoutInflater.inflate(R.layout.fragment_image_view_multi, viewGroup, false);
-        this.mImageView = (ScalableImageView) inflate.findViewById(R.id.imageView);
-        this.mProgressBar = (ProgressBar) inflate.findViewById(R.id.imageLoadProgressBar);
-        this.mMyToggleButton = new MyToggleButton(this, inflate.findViewById(R.id.myToggle), this.mListener.getSelector().isSelected(this.mFileName));
+        mImageView = (ScalableImageView) inflate.findViewById(R.id.imageView);
+        mProgressBar = (ProgressBar) inflate.findViewById(R.id.imageLoadProgressBar);
+        mMyToggleButton = new MyToggleButton(this, inflate.findViewById(R.id.myToggle), mListener.getSelector().isSelected(this.mFileName));
         super.onCreateView(layoutInflater, viewGroup, bundle);
         super.onCreateView(layoutInflater, viewGroup, bundle);
         return inflate;
         return inflate;
     }
     }
 
 
     private void selectImageOnMultiFileMode(boolean z) {
     private void selectImageOnMultiFileMode(boolean z) {
-        ImageSelector selector = this.mListener.getSelector();
+        ImageSelector selector = mListener.getSelector();
         if (!z) {
         if (!z) {
             selector.remove(this.mFileName);
             selector.remove(this.mFileName);
         } else if (!selector.canAdd()) {
         } else if (!selector.canAdd()) {
-            MyToggleButton myToggleButton = this.mMyToggleButton;
+            MyToggleButton myToggleButton = mMyToggleButton;
             if (myToggleButton != null) {
             if (myToggleButton != null) {
                 myToggleButton.forceSetChecked(false);
                 myToggleButton.forceSetChecked(false);
             }
             }
@@ -61,15 +61,15 @@ public class ImageViewMultiSelectFragment extends ImageViewBaseFragment {
         private TextView mToggleText;
         private TextView mToggleText;
 
 
         public MyToggleButton(ImageViewMultiSelectFragment imageViewMultiSelectFragment, View view, boolean z) {
         public MyToggleButton(ImageViewMultiSelectFragment imageViewMultiSelectFragment, View view, boolean z) {
-            this.mImageViewMultiSelectFragment = imageViewMultiSelectFragment;
+            mImageViewMultiSelectFragment = imageViewMultiSelectFragment;
             init(view, z);
             init(view, z);
         }
         }
 
 
         public void init(View view, boolean z) {
         public void init(View view, boolean z) {
-            this.mToggleImage = (ImageView) view.findViewById(R.id.myToggleImage);
-            this.mToggleImage.setClickable(false);
-            this.mToggleText = (TextView) view.findViewById(R.id.myToggleText);
-            this.mToggleText.setClickable(false);
+            mToggleImage = (ImageView) view.findViewById(R.id.myToggleImage);
+            mToggleImage.setClickable(false);
+            mToggleText = (TextView) view.findViewById(R.id.myToggleText);
+            mToggleText.setClickable(false);
             view.setOnClickListener(new View.OnClickListener() {
             view.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                 public void onClick(View view) {
                     MyToggleButton.this.toggleCheckStatus();
                     MyToggleButton.this.toggleCheckStatus();
@@ -83,20 +83,20 @@ public class ImageViewMultiSelectFragment extends ImageViewBaseFragment {
         }
         }
 
 
         public void forceSetChecked(boolean z) {
         public void forceSetChecked(boolean z) {
-            this.mMyToggleChecked = z;
+            mMyToggleChecked = z;
             syncTextState();
             syncTextState();
-            this.mToggleImage.setSelected(this.mMyToggleChecked);
+            mToggleImage.setSelected(this.mMyToggleChecked);
         }
         }
 
 
         private void setMyChecked(boolean z) {
         private void setMyChecked(boolean z) {
-            if (z != this.mMyToggleChecked) {
+            if (z != mMyToggleChecked) {
                 forceSetChecked(z);
                 forceSetChecked(z);
                 execCallback();
                 execCallback();
             }
             }
         }
         }
 
 
         private void execCallback() {
         private void execCallback() {
-            ImageViewMultiSelectFragment imageViewMultiSelectFragment = this.mImageViewMultiSelectFragment;
+            ImageViewMultiSelectFragment imageViewMultiSelectFragment = mImageViewMultiSelectFragment;
             if (imageViewMultiSelectFragment != null) {
             if (imageViewMultiSelectFragment != null) {
                 imageViewMultiSelectFragment.selectImageOnMultiFileMode(this.mMyToggleChecked);
                 imageViewMultiSelectFragment.selectImageOnMultiFileMode(this.mMyToggleChecked);
             }
             }
@@ -104,9 +104,9 @@ public class ImageViewMultiSelectFragment extends ImageViewBaseFragment {
 
 
         private void syncTextState() {
         private void syncTextState() {
             if (this.mMyToggleChecked) {
             if (this.mMyToggleChecked) {
-                this.mToggleText.setText(R.string.imgsel_view_pager_toggle_on);
+                mToggleText.setText(R.string.imgsel_view_pager_toggle_on);
             } else {
             } else {
-                this.mToggleText.setText(R.string.imgsel_view_pager_toggle_off);
+                mToggleText.setText(R.string.imgsel_view_pager_toggle_off);
             }
             }
         }
         }
     }
     }

+ 18 - 18
app/src/main/java/epson/print/imgsel/ImageViewPagerActivity.java

@@ -45,10 +45,10 @@ public class ImageViewPagerActivity extends ActivityIACommon implements ImageVie
             returnAndRefreshSelection();
             returnAndRefreshSelection();
             return;
             return;
         }
         }
-        this.mImageResizer = ImageResizer.getInstance(getFullscreenImageSize(), getCacheDirectory());
+        mImageResizer = ImageResizer.getInstance(getFullscreenImageSize(), getCacheDirectory());
         ViewPager viewPager = (ViewPager) findViewById(R.id.pager);
         ViewPager viewPager = (ViewPager) findViewById(R.id.pager);
         viewPager.setOffscreenPageLimit(2);
         viewPager.setOffscreenPageLimit(2);
-        viewPager.setAdapter(new PagerAdapter(getSupportFragmentManager(), this.mFileList));
+        viewPager.setAdapter(new PagerAdapter(getSupportFragmentManager(), mFileList));
         viewPager.setCurrentItem(this.mFirstPosition);
         viewPager.setCurrentItem(this.mFirstPosition);
     }
     }
 
 
@@ -76,19 +76,19 @@ public class ImageViewPagerActivity extends ActivityIACommon implements ImageVie
 
 
     private void getParamsFromIntent(Intent intent, Bundle bundle) {
     private void getParamsFromIntent(Intent intent, Bundle bundle) {
         ArrayList<String> stringArrayList;
         ArrayList<String> stringArrayList;
-        this.mFileList = null;
+        mFileList = null;
         if (intent != null) {
         if (intent != null) {
             ArrayList<String> stringArrayListExtra = intent.getStringArrayListExtra(PARAMS_KEY_SELECTOR);
             ArrayList<String> stringArrayListExtra = intent.getStringArrayListExtra(PARAMS_KEY_SELECTOR);
             if (!(bundle == null || (stringArrayList = bundle.getStringArrayList(STATE_SELECTED_FILE_LIST)) == null)) {
             if (!(bundle == null || (stringArrayList = bundle.getStringArrayList(STATE_SELECTED_FILE_LIST)) == null)) {
                 stringArrayListExtra = stringArrayList;
                 stringArrayListExtra = stringArrayList;
             }
             }
-            this.mImageSelector = new ImageSelector(stringArrayListExtra);
+            mImageSelector = new ImageSelector(stringArrayListExtra);
             if (bundle == null) {
             if (bundle == null) {
-                this.mFileList = sParamFileList;
+                mFileList = sParamFileList;
                 sParamFileList = null;
                 sParamFileList = null;
-                this.mFirstPosition = intent.getIntExtra(PARAMS_KEY_POSITION, 0);
-                this.mSingleFileMode = intent.getBooleanExtra(PARAMS_SINGLE_FILE_MODE, false);
-                this.mMessageType = intent.getIntExtra(PARAMS_MESSAGE_TYPE, 0);
+                mFirstPosition = intent.getIntExtra(PARAMS_KEY_POSITION, 0);
+                mSingleFileMode = intent.getBooleanExtra(PARAMS_SINGLE_FILE_MODE, false);
+                mMessageType = intent.getIntExtra(PARAMS_MESSAGE_TYPE, 0);
             }
             }
         }
         }
     }
     }
@@ -102,12 +102,12 @@ public class ImageViewPagerActivity extends ActivityIACommon implements ImageVie
     }
     }
 
 
     protected void onSaveInstanceState(Bundle bundle) {
     protected void onSaveInstanceState(Bundle bundle) {
-        bundle.putStringArrayList(STATE_SELECTED_FILE_LIST, this.mImageSelector.getFileArrayList());
+        bundle.putStringArrayList(STATE_SELECTED_FILE_LIST, mImageSelector.getFileArrayList());
         super.onSaveInstanceState(bundle);
         super.onSaveInstanceState(bundle);
     }
     }
 
 
     public ImageSelector getSelector() {
     public ImageSelector getSelector() {
-        return this.mImageSelector;
+        return mImageSelector;
     }
     }
 
 
     public void onSingleModeItemSelected() {
     public void onSingleModeItemSelected() {
@@ -117,7 +117,7 @@ public class ImageViewPagerActivity extends ActivityIACommon implements ImageVie
     public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.C2138menu.menu_image_view_pager, menu);
         getMenuInflater().inflate(R.C2138menu.menu_image_view_pager, menu);
         MenuItem findItem = menu.findItem(R.id.action_go_preview);
         MenuItem findItem = menu.findItem(R.id.action_go_preview);
-        int selectedNumber = this.mImageSelector.selectedNumber();
+        int selectedNumber = mImageSelector.selectedNumber();
         findItem.setEnabled(selectedNumber > 0);
         findItem.setEnabled(selectedNumber > 0);
         if (this.mSingleFileMode) {
         if (this.mSingleFileMode) {
             setTitle("");
             setTitle("");
@@ -138,30 +138,30 @@ public class ImageViewPagerActivity extends ActivityIACommon implements ImageVie
 
 
     private void returnAndGoNext() {
     private void returnAndGoNext() {
         Intent intent = new Intent();
         Intent intent = new Intent();
-        intent.putStringArrayListExtra(RETURN_KEY_SELECTOR, this.mImageSelector.getFileArrayList());
+        intent.putStringArrayListExtra(RETURN_KEY_SELECTOR, mImageSelector.getFileArrayList());
         setResult(10, intent);
         setResult(10, intent);
         finish();
         finish();
     }
     }
 
 
     private void returnAndRefreshSelection() {
     private void returnAndRefreshSelection() {
         Intent intent = new Intent();
         Intent intent = new Intent();
-        intent.putStringArrayListExtra(RETURN_KEY_SELECTOR, this.mImageSelector.getFileArrayList());
+        intent.putStringArrayListExtra(RETURN_KEY_SELECTOR, mImageSelector.getFileArrayList());
         setResult(-1, intent);
         setResult(-1, intent);
         finish();
         finish();
     }
     }
 
 
     protected void onResume() {
     protected void onResume() {
         super.onResume();
         super.onResume();
-        this.mImageResizer.setActivityForeground(true);
+        mImageResizer.setActivityForeground(true);
     }
     }
 
 
     protected void onPause() {
     protected void onPause() {
         super.onPause();
         super.onPause();
-        this.mImageResizer.setActivityForeground(false);
+        mImageResizer.setActivityForeground(false);
     }
     }
 
 
     public ImageResizer getImageResizer() {
     public ImageResizer getImageResizer() {
-        return this.mImageResizer;
+        return mImageResizer;
     }
     }
 
 
     public void onDialogCallback(int i) {
     public void onDialogCallback(int i) {
@@ -175,7 +175,7 @@ public class ImageViewPagerActivity extends ActivityIACommon implements ImageVie
 
 
         public PagerAdapter(FragmentManager fragmentManager, ArrayList<String> arrayList) {
         public PagerAdapter(FragmentManager fragmentManager, ArrayList<String> arrayList) {
             super(fragmentManager);
             super(fragmentManager);
-            this.mFileList = arrayList;
+            mFileList = arrayList;
         }
         }
 
 
         public Fragment getItem(int i) {
         public Fragment getItem(int i) {
@@ -183,7 +183,7 @@ public class ImageViewPagerActivity extends ActivityIACommon implements ImageVie
         }
         }
 
 
         public int getCount() {
         public int getCount() {
-            return this.mFileList.size();
+            return mFileList.size();
         }
         }
     }
     }
 
 

+ 5 - 5
app/src/main/java/epson/print/imgsel/ImageViewSingleFragment.java

@@ -25,15 +25,15 @@ public class ImageViewSingleFragment extends ImageViewBaseFragment implements Vi
     public void onCreate(Bundle bundle) {
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         super.onCreate(bundle);
         if (getArguments() != null) {
         if (getArguments() != null) {
-            this.mFileName = getArguments().getString(ImagePreviewActivity.PARAM_PICTURE_FILENAME);
+            mFileName = getArguments().getString(ImagePreviewActivity.PARAM_PICTURE_FILENAME);
         }
         }
     }
     }
 
 
     public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
     public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
         int i = 0;
         int i = 0;
         View inflate = layoutInflater.inflate(R.layout.fragment_image_view_single, viewGroup, false);
         View inflate = layoutInflater.inflate(R.layout.fragment_image_view_single, viewGroup, false);
-        this.mImageView = (ScalableImageView) inflate.findViewById(R.id.imageView);
-        this.mProgressBar = (ProgressBar) inflate.findViewById(R.id.imageLoadProgressBar);
+        mImageView = (ScalableImageView) inflate.findViewById(R.id.imageView);
+        mProgressBar = (ProgressBar) inflate.findViewById(R.id.imageLoadProgressBar);
         Button button = (Button) inflate.findViewById(R.id.selectButton);
         Button button = (Button) inflate.findViewById(R.id.selectButton);
         button.setOnClickListener(this);
         button.setOnClickListener(this);
         Bundle arguments = getArguments();
         Bundle arguments = getArguments();
@@ -52,7 +52,7 @@ public class ImageViewSingleFragment extends ImageViewBaseFragment implements Vi
     }
     }
 
 
     private void selectImageOnSingleFileMode() {
     private void selectImageOnSingleFileMode() {
-        ImageSelector selector = this.mListener.getSelector();
+        ImageSelector selector = mListener.getSelector();
         selector.clear();
         selector.clear();
         if (selector.add(this.mFileName)) {
         if (selector.add(this.mFileName)) {
             onSingleModeItemSelected();
             onSingleModeItemSelected();
@@ -61,7 +61,7 @@ public class ImageViewSingleFragment extends ImageViewBaseFragment implements Vi
 
 
     private void onSingleModeItemSelected() {
     private void onSingleModeItemSelected() {
         if (this.mListener != null) {
         if (this.mListener != null) {
-            this.mListener.onSingleModeItemSelected();
+            mListener.onSingleModeItemSelected();
         }
         }
     }
     }
 }
 }

+ 1 - 1
app/src/main/java/epson/print/imgsel/LocalAlertDialogFragment.java

@@ -46,7 +46,7 @@ public class LocalAlertDialogFragment extends DialogFragment {
         }
         }
         int i = arguments.getInt(KEY_TITLE, 0);
         int i = arguments.getInt(KEY_TITLE, 0);
         boolean z = arguments.getBoolean(KEY_NO_TITLE, false);
         boolean z = arguments.getBoolean(KEY_NO_TITLE, false);
-        this.mDialogCode = arguments.getInt(KEY_DIALOG_CODE);
+        mDialogCode = arguments.getInt(KEY_DIALOG_CODE);
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setMessage(string).setPositiveButton(getActivity().getString(R.string.str_ok), new DialogInterface.OnClickListener() {
         builder.setMessage(string).setPositiveButton(getActivity().getString(R.string.str_ok), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
             public void onClick(DialogInterface dialogInterface, int i) {

+ 20 - 20
app/src/main/java/epson/print/inkrpln/InkReplenishSystem.java

@@ -27,17 +27,17 @@ public class InkReplenishSystem {
 
 
     @VisibleForTesting
     @VisibleForTesting
     InkReplenishSystem(PrinterAdapter printerAdapter, InkRplnRepository inkRplnRepository, GoEpsonClient goEpsonClient, InkRplnInfoClient inkRplnInfoClient) {
     InkReplenishSystem(PrinterAdapter printerAdapter, InkRplnRepository inkRplnRepository, GoEpsonClient goEpsonClient, InkRplnInfoClient inkRplnInfoClient) {
-        this.mPrinterAdapter = printerAdapter;
-        this.mIrsRepository = inkRplnRepository;
-        this.mGoEpsonClient = goEpsonClient;
-        this.mInkRsInfoClient = inkRplnInfoClient;
+        mPrinterAdapter = printerAdapter;
+        mIrsRepository = inkRplnRepository;
+        mGoEpsonClient = goEpsonClient;
+        mInkRsInfoClient = inkRplnInfoClient;
     }
     }
 
 
     public InkReplenishSystem(PrinterAdapter printerAdapter, InkRplnRepository inkRplnRepository) {
     public InkReplenishSystem(PrinterAdapter printerAdapter, InkRplnRepository inkRplnRepository) {
-        this.mPrinterAdapter = printerAdapter;
-        this.mIrsRepository = inkRplnRepository;
-        this.mGoEpsonClient = new GoEpsonClient();
-        this.mInkRsInfoClient = new InkRplnInfoClient();
+        mPrinterAdapter = printerAdapter;
+        mIrsRepository = inkRplnRepository;
+        mGoEpsonClient = new GoEpsonClient();
+        mInkRsInfoClient = new InkRplnInfoClient();
     }
     }
 
 
     /* access modifiers changed from: package-private */
     /* access modifiers changed from: package-private */
@@ -48,8 +48,8 @@ public class InkReplenishSystem {
         Locale locale = Locale.getDefault();
         Locale locale = Locale.getDefault();
         readyInkParams.country = locale.getCountry();
         readyInkParams.country = locale.getCountry();
         readyInkParams.language = locale.getLanguage();
         readyInkParams.language = locale.getLanguage();
-        readyInkParams.printerSerial = this.mPrinterAdapter.getSerialNo(context);
-        readyInkParams.printerName = this.mPrinterAdapter.getNonRemotePrinterDeviceId(context);
+        readyInkParams.printerSerial = mPrinterAdapter.getSerialNo(context);
+        readyInkParams.printerName = mPrinterAdapter.getNonRemotePrinterDeviceId(context);
         readyInkParams.androidModel = Build.MODEL;
         readyInkParams.androidModel = Build.MODEL;
         return readyInkParams;
         return readyInkParams;
     }
     }
@@ -62,29 +62,29 @@ public class InkReplenishSystem {
         if (!checkPrinterAndNetworkConnectivity(context)) {
         if (!checkPrinterAndNetworkConnectivity(context)) {
             return false;
             return false;
         }
         }
-        String serialNo = this.mPrinterAdapter.getSerialNo(context);
+        String serialNo = mPrinterAdapter.getSerialNo(context);
         if (serialNo == null) {
         if (serialNo == null) {
             return false;
             return false;
         }
         }
-        EPS_REDYINKINFO readyInkInfo = this.mPrinterAdapter.getReadyInkInfo();
+        EPS_REDYINKINFO readyInkInfo = mPrinterAdapter.getReadyInkInfo();
         if (readyInkInfo == null) {
         if (readyInkInfo == null) {
             return false;
             return false;
         }
         }
         if (readyInkInfo.subscriptionStatus != 0) {
         if (readyInkInfo.subscriptionStatus != 0) {
-            this.mIrsRepository.saveBuyInkButtonOffReadyInkOff(context);
+            mIrsRepository.saveBuyInkButtonOffReadyInkOff(context);
             return false;
             return false;
         }
         }
-        String redirectLocation = this.mGoEpsonClient.getRedirectLocation(getGoEpsonParams(context), useGoEpsonTls(context));
-        this.mIrsRepository.saveInkReplenishServerUrl(context, redirectLocation);
+        String redirectLocation = mGoEpsonClient.getRedirectLocation(getGoEpsonParams(context), useGoEpsonTls(context));
+        mIrsRepository.saveInkReplenishServerUrl(context, redirectLocation);
         if (redirectLocation == null) {
         if (redirectLocation == null) {
             return false;
             return false;
         }
         }
-        this.mPrinterAdapter.activateEma(readyInkInfo);
-        InkRplnInfoClient.InkRsInfo inkDsInfo = this.mInkRsInfoClient.getInkDsInfo(serialNo, redirectLocation);
+        mPrinterAdapter.activateEma(readyInkInfo);
+        InkRplnInfoClient.InkRsInfo inkDsInfo = mInkRsInfoClient.getInkDsInfo(serialNo, redirectLocation);
         if (inkDsInfo == null) {
         if (inkDsInfo == null) {
             return false;
             return false;
         }
         }
-        this.mIrsRepository.saveData(context, inkDsInfo);
+        mIrsRepository.saveData(context, inkDsInfo);
         return true;
         return true;
     }
     }
 
 
@@ -98,7 +98,7 @@ public class InkReplenishSystem {
     }
     }
 
 
     public synchronized void clearServerReplyPrinterInfo(Context context) {
     public synchronized void clearServerReplyPrinterInfo(Context context) {
-        this.mIrsRepository.clearServerData(context);
+        mIrsRepository.clearServerData(context);
     }
     }
 
 
     /* JADX WARNING: Code restructure failed: missing block: B:14:0x001c, code lost:
     /* JADX WARNING: Code restructure failed: missing block: B:14:0x001c, code lost:
@@ -134,7 +134,7 @@ public class InkReplenishSystem {
     }
     }
 
 
     public synchronized void setServerCheckDisabled(@NonNull Context context) {
     public synchronized void setServerCheckDisabled(@NonNull Context context) {
-        this.mIrsRepository.saveInvitationDialogDisableValue(context, true);
+        mIrsRepository.saveInvitationDialogDisableValue(context, true);
     }
     }
 
 
     /* JADX WARNING: Code restructure failed: missing block: B:24:0x0035, code lost:
     /* JADX WARNING: Code restructure failed: missing block: B:24:0x0035, code lost:

+ 6 - 6
app/src/main/java/epson/print/inkrpln/InkRplnInfoClient.java

@@ -73,19 +73,19 @@ public class InkRplnInfoClient {
 
 
         public void copy(InkRsInfo inkRsInfo) {
         public void copy(InkRsInfo inkRsInfo) {
             if (inkRsInfo != null) {
             if (inkRsInfo != null) {
-                this.landingUrl = inkRsInfo.landingUrl;
-                this.buttonType = inkRsInfo.buttonType;
-                this.showInvitation = inkRsInfo.showInvitation;
-                this.appendSerial = inkRsInfo.appendSerial;
+                landingUrl = inkRsInfo.landingUrl;
+                buttonType = inkRsInfo.buttonType;
+                showInvitation = inkRsInfo.showInvitation;
+                appendSerial = inkRsInfo.appendSerial;
             }
             }
         }
         }
 
 
         public boolean needToDisplayInvitationDialog() {
         public boolean needToDisplayInvitationDialog() {
-            return this.showInvitation && this.landingUrl != null;
+            return showInvitation && landingUrl != null;
         }
         }
 
 
         public int getButtonType() {
         public int getButtonType() {
-            return this.buttonType;
+            return buttonType;
         }
         }
     }
     }
 }
 }

+ 3 - 3
app/src/main/java/epson/print/inkrpln/InkRplnProgressDialog.java

@@ -22,16 +22,16 @@ public class InkRplnProgressDialog extends AppCompatActivity implements ThreeBut
             finish();
             finish();
             return;
             return;
         }
         }
-        this.mInkDsFragment = InkRplnProgressFragment.getInstance(getSupportFragmentManager(), (DependencyBuilder) getIntent().getSerializableExtra(PARAM_KEY_PARAM_CLASS_BUILDER));
+        mInkDsFragment = InkRplnProgressFragment.getInstance(getSupportFragmentManager(), (DependencyBuilder) getIntent().getSerializableExtra(PARAM_KEY_PARAM_CLASS_BUILDER));
     }
     }
 
 
     public void callback(int i) {
     public void callback(int i) {
         if (i == 1) {
         if (i == 1) {
-            this.mInkDsFragment.launchWebBrowseAndFinishActivity();
+            mInkDsFragment.launchWebBrowseAndFinishActivity();
         } else if (i != 3) {
         } else if (i != 3) {
             finish();
             finish();
         } else {
         } else {
-            this.mInkDsFragment.setInkDsServerCheckDisable(this);
+            mInkDsFragment.setInkDsServerCheckDisable(this);
             finish();
             finish();
         }
         }
     }
     }

+ 15 - 15
app/src/main/java/epson/print/inkrpln/InkRplnProgressFragment.java

@@ -49,7 +49,7 @@ public class InkRplnProgressFragment extends Fragment {
     }
     }
 
 
     private InkReplenishSystem getIPrintInkDsManager() {
     private InkReplenishSystem getIPrintInkDsManager() {
-        return this.mInkReplenishSystem;
+        return mInkReplenishSystem;
     }
     }
 
 
     private void requestToShowDialogOrFinish() {
     private void requestToShowDialogOrFinish() {
@@ -63,7 +63,7 @@ public class InkRplnProgressFragment extends Fragment {
     private void requestToShowDialog() {
     private void requestToShowDialog() {
         FragmentActivity activity = getActivity();
         FragmentActivity activity = getActivity();
         if (activity == null || !this.mFragmentForeground) {
         if (activity == null || !this.mFragmentForeground) {
-            this.mFragmentStatus = 2;
+            mFragmentStatus = 2;
             return;
             return;
         }
         }
         ThreeButtonDialog threeButtonDialog = (ThreeButtonDialog) activity.getSupportFragmentManager().findFragmentByTag(DIALOG_TAG_THREE_BUTTON);
         ThreeButtonDialog threeButtonDialog = (ThreeButtonDialog) activity.getSupportFragmentManager().findFragmentByTag(DIALOG_TAG_THREE_BUTTON);
@@ -71,28 +71,28 @@ public class InkRplnProgressFragment extends Fragment {
             threeButtonDialog.dismiss();
             threeButtonDialog.dismiss();
         }
         }
         ThreeButtonDialog.newInstance(R.layout.dialog_inkrpln_invitation).show(activity.getSupportFragmentManager(), DIALOG_TAG_THREE_BUTTON);
         ThreeButtonDialog.newInstance(R.layout.dialog_inkrpln_invitation).show(activity.getSupportFragmentManager(), DIALOG_TAG_THREE_BUTTON);
-        this.mFragmentStatus = 3;
+        mFragmentStatus = 3;
     }
     }
 
 
     /* access modifiers changed from: package-private */
     /* access modifiers changed from: package-private */
     @UiThread
     @UiThread
     public void launchWebBrowseAndFinishActivity() {
     public void launchWebBrowseAndFinishActivity() {
-        Uri readyInkUriFromSavedData = this.mInkReplenishSystem.getReadyInkUriFromSavedData(IprintApplication.getInstance());
+        Uri readyInkUriFromSavedData = mInkReplenishSystem.getReadyInkUriFromSavedData(IprintApplication.getInstance());
         if (readyInkUriFromSavedData != null) {
         if (readyInkUriFromSavedData != null) {
             startActivity(new Intent("android.intent.action.VIEW", readyInkUriFromSavedData));
             startActivity(new Intent("android.intent.action.VIEW", readyInkUriFromSavedData));
-            this.mFragmentStatus = 1;
+            mFragmentStatus = 1;
             return;
             return;
         }
         }
         localFinishActivity();
         localFinishActivity();
     }
     }
 
 
     private void setInkDsServerCheckDisable(@NonNull Context context) {
     private void setInkDsServerCheckDisable(@NonNull Context context) {
-        this.mInkReplenishSystem.setServerCheckDisabled(context);
+        mInkReplenishSystem.setServerCheckDisabled(context);
     }
     }
 
 
     public void onResume() {
     public void onResume() {
         super.onResume();
         super.onResume();
-        this.mFragmentForeground = true;
+        mFragmentForeground = true;
         switch (this.mFragmentStatus) {
         switch (this.mFragmentStatus) {
             case 1:
             case 1:
                 localFinishActivity();
                 localFinishActivity();
@@ -107,11 +107,11 @@ public class InkRplnProgressFragment extends Fragment {
 
 
     public void onPause() {
     public void onPause() {
         super.onPause();
         super.onPause();
-        this.mFragmentForeground = false;
+        mFragmentForeground = false;
     }
     }
 
 
     private void localFinishActivity() {
     private void localFinishActivity() {
-        this.mFragmentStatus = 1;
+        mFragmentStatus = 1;
         FragmentActivity activity = getActivity();
         FragmentActivity activity = getActivity();
         if (activity != null) {
         if (activity != null) {
             activity.finish();
             activity.finish();
@@ -125,12 +125,12 @@ public class InkRplnProgressFragment extends Fragment {
         if (dependencyBuilder == null) {
         if (dependencyBuilder == null) {
             dependencyBuilder = new DependencyBuilder();
             dependencyBuilder = new DependencyBuilder();
         }
         }
-        this.mInkReplenishSystem = new InkReplenishSystem(dependencyBuilder.createPrinterAdapter(), dependencyBuilder.createInkRplnRepository());
-        this.mFragmentForeground = false;
-        this.mFragmentStatus = getFragmentStatusFromSavedInstanceState(bundle);
+        mInkReplenishSystem = new InkReplenishSystem(dependencyBuilder.createPrinterAdapter(), dependencyBuilder.createInkRplnRepository());
+        mFragmentForeground = false;
+        mFragmentStatus = getFragmentStatusFromSavedInstanceState(bundle);
         if (this.mFragmentStatus == 0) {
         if (this.mFragmentStatus == 0) {
-            this.mInkDeliverySystemTask = new InkDeliverySystemTask();
-            this.mInkDeliverySystemTask.execute(new Void[0]);
+            mInkDeliverySystemTask = new InkDeliverySystemTask();
+            mInkDeliverySystemTask.execute(new Void[0]);
         }
         }
     }
     }
 
 
@@ -152,7 +152,7 @@ public class InkRplnProgressFragment extends Fragment {
 
 
     public void onSaveInstanceState(Bundle bundle) {
     public void onSaveInstanceState(Bundle bundle) {
         super.onSaveInstanceState(bundle);
         super.onSaveInstanceState(bundle);
-        bundle.putInt(KEY_FRAGMENT_STATUS, this.mFragmentStatus);
+        bundle.putInt(KEY_FRAGMENT_STATUS, mFragmentStatus);
     }
     }
 
 
     private class InkDeliverySystemTask extends AsyncTask<Void, Void, Void> {
     private class InkDeliverySystemTask extends AsyncTask<Void, Void, Void> {

+ 2 - 2
app/src/main/java/epson/print/inkrpln/InkRplnRepository.java

@@ -16,7 +16,7 @@ public class InkRplnRepository {
     private boolean mTemporallySave = false;
     private boolean mTemporallySave = false;
 
 
     public InkRplnRepository(boolean z) {
     public InkRplnRepository(boolean z) {
-        this.mTemporallySave = z;
+        mTemporallySave = z;
     }
     }
 
 
     public void clearServerData(@NonNull Context context) {
     public void clearServerData(@NonNull Context context) {
@@ -53,7 +53,7 @@ public class InkRplnRepository {
     }
     }
 
 
     private SharedPreferences getPrinterInfoPreferences(@NonNull Context context) {
     private SharedPreferences getPrinterInfoPreferences(@NonNull Context context) {
-        return getPrinterInfoPreferences(context, this.mTemporallySave);
+        return getPrinterInfoPreferences(context, mTemporallySave);
     }
     }
 
 
     private SharedPreferences getPrinterInfoPreferences(@NonNull Context context, boolean z) {
     private SharedPreferences getPrinterInfoPreferences(@NonNull Context context, boolean z) {

+ 15 - 15
app/src/main/java/epson/print/inkrpln/JumpUrlFragment.java

@@ -46,10 +46,10 @@ public class JumpUrlFragment extends Fragment {
     public void onCreate(Bundle bundle) {
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         super.onCreate(bundle);
         setRetainInstance(true);
         setRetainInstance(true);
-        this.mFragmentStatus = FragmentStatus.WAITE_THREAD_END;
+        mFragmentStatus = FragmentStatus.WAITE_THREAD_END;
         if (bundle != null) {
         if (bundle != null) {
-            this.mFragmentStatus = getFragmentState(bundle);
-            this.mResultUrl = (Uri) bundle.getParcelable(KEY_RESULT_URL);
+            mFragmentStatus = getFragmentState(bundle);
+            mResultUrl = (Uri) bundle.getParcelable(KEY_RESULT_URL);
         }
         }
         if (this.mFragmentStatus == FragmentStatus.WAITE_THREAD_END) {
         if (this.mFragmentStatus == FragmentStatus.WAITE_THREAD_END) {
             DependencyBuilder dependencyBuilder = null;
             DependencyBuilder dependencyBuilder = null;
@@ -72,7 +72,7 @@ public class JumpUrlFragment extends Fragment {
 
 
     public void onResume() {
     public void onResume() {
         super.onResume();
         super.onResume();
-        this.mFragmentForeground = true;
+        mFragmentForeground = true;
         switch (this.mFragmentStatus) {
         switch (this.mFragmentStatus) {
             case WAITE_START_BROWSE_ACTIVITY:
             case WAITE_START_BROWSE_ACTIVITY:
                 requestStartBrowser(this.mResultUrl);
                 requestStartBrowser(this.mResultUrl);
@@ -90,7 +90,7 @@ public class JumpUrlFragment extends Fragment {
 
 
     public void onPause() {
     public void onPause() {
         super.onPause();
         super.onPause();
-        this.mFragmentForeground = false;
+        mFragmentForeground = false;
     }
     }
 
 
     public void onActivityResult(int i, int i2, Intent intent) {
     public void onActivityResult(int i, int i2, Intent intent) {
@@ -103,13 +103,13 @@ public class JumpUrlFragment extends Fragment {
 
 
     public void onSaveInstanceState(Bundle bundle) {
     public void onSaveInstanceState(Bundle bundle) {
         super.onSaveInstanceState(bundle);
         super.onSaveInstanceState(bundle);
-        bundle.putInt(KEY_FRAGMENT_STATE, this.mFragmentStatus.ordinal());
-        bundle.putParcelable(KEY_RESULT_URL, this.mResultUrl);
+        bundle.putInt(KEY_FRAGMENT_STATE, mFragmentStatus.ordinal());
+        bundle.putParcelable(KEY_RESULT_URL, mResultUrl);
     }
     }
 
 
     private void requestShowErrorDialogAndFinishActivity() {
     private void requestShowErrorDialogAndFinishActivity() {
         if (!this.mFragmentForeground) {
         if (!this.mFragmentForeground) {
-            this.mFragmentStatus = FragmentStatus.WAITE_DIALOG_SHOW;
+            mFragmentStatus = FragmentStatus.WAITE_DIALOG_SHOW;
         } else if (((LocalAlertDialogFragment) getFragmentManager().findFragmentByTag(DIALOG_TAG)) == null) {
         } else if (((LocalAlertDialogFragment) getFragmentManager().findFragmentByTag(DIALOG_TAG)) == null) {
             LocalAlertDialogFragment.newInstance(getString(R.string.EC_ERR_COMM_ERROR), R.string.fw_error_connect_server, 0).show(getFragmentManager(), DIALOG_TAG);
             LocalAlertDialogFragment.newInstance(getString(R.string.EC_ERR_COMM_ERROR), R.string.fw_error_connect_server, 0).show(getFragmentManager(), DIALOG_TAG);
         }
         }
@@ -117,19 +117,19 @@ public class JumpUrlFragment extends Fragment {
 
 
     private void requestStartBrowser(Uri uri) {
     private void requestStartBrowser(Uri uri) {
         if (getActivity() == null) {
         if (getActivity() == null) {
-            this.mFragmentStatus = FragmentStatus.WAITE_START_BROWSE_ACTIVITY;
-            this.mResultUrl = uri;
+            mFragmentStatus = FragmentStatus.WAITE_START_BROWSE_ACTIVITY;
+            mResultUrl = uri;
             return;
             return;
         }
         }
-        this.mFragmentStatus = FragmentStatus.WAITE_RETURN_FROM_BROWSER;
-        this.mResultUrl = null;
+        mFragmentStatus = FragmentStatus.WAITE_RETURN_FROM_BROWSER;
+        mResultUrl = null;
         startActivityForResult(new Intent("android.intent.action.VIEW", uri), 1);
         startActivityForResult(new Intent("android.intent.action.VIEW", uri), 1);
     }
     }
 
 
     private void requestFinishActivity() {
     private void requestFinishActivity() {
         FragmentActivity activity = getActivity();
         FragmentActivity activity = getActivity();
         if (activity == null) {
         if (activity == null) {
-            this.mFragmentStatus = FragmentStatus.WAITE_ACTIVITY_FINISH;
+            mFragmentStatus = FragmentStatus.WAITE_ACTIVITY_FINISH;
         } else {
         } else {
             activity.finish();
             activity.finish();
         }
         }
@@ -139,11 +139,11 @@ public class JumpUrlFragment extends Fragment {
         private DependencyBuilder mDependencyBuilder;
         private DependencyBuilder mDependencyBuilder;
 
 
         public InkDeliverySystemTask(DependencyBuilder dependencyBuilder) {
         public InkDeliverySystemTask(DependencyBuilder dependencyBuilder) {
-            this.mDependencyBuilder = dependencyBuilder;
+            mDependencyBuilder = dependencyBuilder;
         }
         }
 
 
         protected Uri doInBackground(Void... voidArr) {
         protected Uri doInBackground(Void... voidArr) {
-            DependencyBuilder dependencyBuilder = this.mDependencyBuilder;
+            DependencyBuilder dependencyBuilder = mDependencyBuilder;
             if (dependencyBuilder == null) {
             if (dependencyBuilder == null) {
                 dependencyBuilder = new DependencyBuilder();
                 dependencyBuilder = new DependencyBuilder();
             }
             }

+ 8 - 8
app/src/main/java/epson/print/inkrpln/LocalSSLSocketFactory.java

@@ -16,43 +16,43 @@ public class LocalSSLSocketFactory extends SSLSocketFactory {
     private SSLSocketFactory mOrigSSLSocketFactory;
     private SSLSocketFactory mOrigSSLSocketFactory;
 
 
     public LocalSSLSocketFactory(SSLSocketFactory sSLSocketFactory) {
     public LocalSSLSocketFactory(SSLSocketFactory sSLSocketFactory) {
-        this.mOrigSSLSocketFactory = sSLSocketFactory;
+        mOrigSSLSocketFactory = sSLSocketFactory;
     }
     }
 
 
     public String[] getDefaultCipherSuites() {
     public String[] getDefaultCipherSuites() {
-        return this.mOrigSSLSocketFactory.getDefaultCipherSuites();
+        return mOrigSSLSocketFactory.getDefaultCipherSuites();
     }
     }
 
 
     public String[] getSupportedCipherSuites() {
     public String[] getSupportedCipherSuites() {
-        return this.mOrigSSLSocketFactory.getSupportedCipherSuites();
+        return mOrigSSLSocketFactory.getSupportedCipherSuites();
     }
     }
 
 
     public Socket createSocket(Socket socket, String str, int i, boolean z) throws IOException {
     public Socket createSocket(Socket socket, String str, int i, boolean z) throws IOException {
-        SSLSocket sSLSocket = (SSLSocket) this.mOrigSSLSocketFactory.createSocket(socket, str, i, z);
+        SSLSocket sSLSocket = (SSLSocket) mOrigSSLSocketFactory.createSocket(socket, str, i, z);
         localEnableProtocols(sSLSocket);
         localEnableProtocols(sSLSocket);
         return sSLSocket;
         return sSLSocket;
     }
     }
 
 
     public Socket createSocket(String str, int i) throws IOException, UnknownHostException {
     public Socket createSocket(String str, int i) throws IOException, UnknownHostException {
-        SSLSocket sSLSocket = (SSLSocket) this.mOrigSSLSocketFactory.createSocket(str, i);
+        SSLSocket sSLSocket = (SSLSocket) mOrigSSLSocketFactory.createSocket(str, i);
         localEnableProtocols(sSLSocket);
         localEnableProtocols(sSLSocket);
         return sSLSocket;
         return sSLSocket;
     }
     }
 
 
     public Socket createSocket(String str, int i, InetAddress inetAddress, int i2) throws IOException, UnknownHostException {
     public Socket createSocket(String str, int i, InetAddress inetAddress, int i2) throws IOException, UnknownHostException {
-        SSLSocket sSLSocket = (SSLSocket) this.mOrigSSLSocketFactory.createSocket(str, i, inetAddress, i2);
+        SSLSocket sSLSocket = (SSLSocket) mOrigSSLSocketFactory.createSocket(str, i, inetAddress, i2);
         localEnableProtocols(sSLSocket);
         localEnableProtocols(sSLSocket);
         return sSLSocket;
         return sSLSocket;
     }
     }
 
 
     public Socket createSocket(InetAddress inetAddress, int i) throws IOException {
     public Socket createSocket(InetAddress inetAddress, int i) throws IOException {
-        SSLSocket sSLSocket = (SSLSocket) this.mOrigSSLSocketFactory.createSocket(inetAddress, i);
+        SSLSocket sSLSocket = (SSLSocket) mOrigSSLSocketFactory.createSocket(inetAddress, i);
         localEnableProtocols(sSLSocket);
         localEnableProtocols(sSLSocket);
         return sSLSocket;
         return sSLSocket;
     }
     }
 
 
     public Socket createSocket(InetAddress inetAddress, int i, InetAddress inetAddress2, int i2) throws IOException {
     public Socket createSocket(InetAddress inetAddress, int i, InetAddress inetAddress2, int i2) throws IOException {
-        SSLSocket sSLSocket = (SSLSocket) this.mOrigSSLSocketFactory.createSocket(inetAddress, i, inetAddress2, i2);
+        SSLSocket sSLSocket = (SSLSocket) mOrigSSLSocketFactory.createSocket(inetAddress, i, inetAddress2, i2);
         localEnableProtocols(sSLSocket);
         localEnableProtocols(sSLSocket);
         return sSLSocket;
         return sSLSocket;
     }
     }

+ 5 - 5
app/src/main/java/epson/print/inkrpln/PrintSettingDependencyBuilder.java

@@ -14,11 +14,11 @@ public class PrintSettingDependencyBuilder extends DependencyBuilder {
     private final String mPrinterSerialNumber;
     private final String mPrinterSerialNumber;
 
 
     public PrintSettingDependencyBuilder(String str, String str2, String str3, int i, String str4) {
     public PrintSettingDependencyBuilder(String str, String str2, String str3, int i, String str4) {
-        this.mEscprLibPrinterId = str;
-        this.mPrinterIpAddress = str2;
-        this.mPrinterSerialNumber = str3;
-        this.mPrinterLocation = i;
-        this.mPrinterModelName = str4;
+        mEscprLibPrinterId = str;
+        mPrinterIpAddress = str2;
+        mPrinterSerialNumber = str3;
+        mPrinterLocation = i;
+        mPrinterModelName = str4;
     }
     }
 
 
     public PrinterAdapter createPrinterAdapter() {
     public PrinterAdapter createPrinterAdapter() {

+ 19 - 19
app/src/main/java/epson/print/pdf/AdobePdfContainer.java

@@ -49,9 +49,9 @@ public class AdobePdfContainer {
     }
     }
 
 
     public AdobePdfContainer(Context context) {
     public AdobePdfContainer(Context context) {
-        this.mContext = context;
+        mContext = context;
         EPLog.v(TAG, "adpbeMPSInterface.MPSInit()");
         EPLog.v(TAG, "adpbeMPSInterface.MPSInit()");
-        this.adpbeMPSInterface.MPSInit("com/adobe/mps/ARAESCryptor", "com/adobe/mps/ARSHADigest");
+        adpbeMPSInterface.MPSInit("com/adobe/mps/ARAESCryptor", "com/adobe/mps/ARSHADigest");
     }
     }
 
 
     protected void finalize() {
     protected void finalize() {
@@ -61,9 +61,9 @@ public class AdobePdfContainer {
     public void LoadDocument(String str, String str2) throws PasswordException, NoPdfException {
     public void LoadDocument(String str, String str2) throws PasswordException, NoPdfException {
         EPLog.v(TAG, "call LoadDocument()");
         EPLog.v(TAG, "call LoadDocument()");
         if (str2 == null || str2.length() == 0) {
         if (str2 == null || str2.length() == 0) {
-            this.pageCount = this.adpbeMPSInterface.PDFDocInit(str);
+            pageCount = adpbeMPSInterface.PDFDocInit(str);
         } else {
         } else {
-            this.pageCount = this.adpbeMPSInterface.PDFDocInit(str, str2);
+            pageCount = adpbeMPSInterface.PDFDocInit(str, str2);
         }
         }
         switch (this.pageCount) {
         switch (this.pageCount) {
             case -2:
             case -2:
@@ -78,23 +78,23 @@ public class AdobePdfContainer {
     }
     }
 
 
     public int CountPages() {
     public int CountPages() {
-        return this.pageCount;
+        return pageCount;
     }
     }
 
 
     public int hasPrintPermission() {
     public int hasPrintPermission() {
-        return this.adpbeMPSInterface.PDFHasPrintPermission((String) null);
+        return adpbeMPSInterface.PDFHasPrintPermission((String) null);
     }
     }
 
 
     public int GetPageSizeX(int i) throws ParameterException {
     public int GetPageSizeX(int i) throws ParameterException {
         if (CountPages() >= i) {
         if (CountPages() >= i) {
-            return this.adpbeMPSInterface.PDFGetPageAttributes(i)[0];
+            return adpbeMPSInterface.PDFGetPageAttributes(i)[0];
         }
         }
         throw new ParameterException();
         throw new ParameterException();
     }
     }
 
 
     public int GetPageSizeY(int i) throws ParameterException {
     public int GetPageSizeY(int i) throws ParameterException {
         if (CountPages() >= i) {
         if (CountPages() >= i) {
-            return this.adpbeMPSInterface.PDFGetPageAttributes(i)[1];
+            return adpbeMPSInterface.PDFGetPageAttributes(i)[1];
         }
         }
         throw new ParameterException();
         throw new ParameterException();
     }
     }
@@ -102,32 +102,32 @@ public class AdobePdfContainer {
     public Bitmap getPageBitmap(int i, int i2, int i3, int i4) throws Exception {
     public Bitmap getPageBitmap(int i, int i2, int i3, int i4) throws Exception {
         EPLog.v(TAG, "getPageBitmap() Start");
         EPLog.v(TAG, "getPageBitmap() Start");
         if (CountPages() >= i) {
         if (CountPages() >= i) {
-            Bitmap bitmap = this.f385bm;
+            Bitmap bitmap = f385bm;
             if (bitmap != null) {
             if (bitmap != null) {
                 bitmap.recycle();
                 bitmap.recycle();
-                this.f385bm = null;
+                f385bm = null;
             }
             }
             System.gc();
             System.gc();
-            this.f385bm = Bitmap.createBitmap(i2, i3, Bitmap.Config.ARGB_8888);
-            this.rawBuffer = ByteBuffer.allocateDirect(i2 * i3 * this.colorComponent);
+            f385bm = Bitmap.createBitmap(i2, i3, Bitmap.Config.ARGB_8888);
+            rawBuffer = ByteBuffer.allocateDirect(i2 * i3 * colorComponent);
             int[] iArr = {0, 0, 0, 0};
             int[] iArr = {0, 0, 0, 0};
-            ByteBuffer byteBuffer = this.rawBuffer;
+            ByteBuffer byteBuffer = rawBuffer;
             if (byteBuffer != null) {
             if (byteBuffer != null) {
                 if (this.adpbeMPSInterface.PDFPageRender(i, i2, i3, 1, byteBuffer, 0, iArr) == 0) {
                 if (this.adpbeMPSInterface.PDFPageRender(i, i2, i3, 1, byteBuffer, 0, iArr) == 0) {
-                    this.f385bm.copyPixelsFromBuffer(this.rawBuffer);
+                    f385bm.copyPixelsFromBuffer(this.rawBuffer);
                     if (i4 != 0) {
                     if (i4 != 0) {
                         Matrix matrix = new Matrix();
                         Matrix matrix = new Matrix();
                         matrix.postRotate((float) i4);
                         matrix.postRotate((float) i4);
-                        this.f385bm = Bitmap.createBitmap(this.f385bm, 0, 0, i2, i3, matrix, false);
+                        f385bm = Bitmap.createBitmap(this.f385bm, 0, 0, i2, i3, matrix, false);
                     }
                     }
                 }
                 }
-                this.rawBuffer.clear();
-                this.rawBuffer = null;
+                rawBuffer.clear();
+                rawBuffer = null;
             } else {
             } else {
                 EPLog.e(TAG, "Failed ByteBuffer.allocateDirect()");
                 EPLog.e(TAG, "Failed ByteBuffer.allocateDirect()");
             }
             }
             EPLog.v(TAG, "getPageBitmap() End");
             EPLog.v(TAG, "getPageBitmap() End");
-            return this.f385bm;
+            return f385bm;
         }
         }
         throw new ParameterException();
         throw new ParameterException();
     }
     }
@@ -154,7 +154,7 @@ public class AdobePdfContainer {
 
 
     public boolean decodeToJpegFile(String str, int i, int i2, int i3) throws ParameterException {
     public boolean decodeToJpegFile(String str, int i, int i2, int i3) throws ParameterException {
         if (CountPages() >= i) {
         if (CountPages() >= i) {
-            return this.adpbeMPSInterface.PDFPagetoImage(i, str, i2, i3, 0) == 0;
+            return adpbeMPSInterface.PDFPagetoImage(i, str, i2, i3, 0) == 0;
         }
         }
         throw new ParameterException();
         throw new ParameterException();
     }
     }

+ 7 - 7
app/src/main/java/epson/print/pdf/AreaPdfRenderer.java

@@ -14,16 +14,16 @@ public class AreaPdfRenderer {
     /* access modifiers changed from: package-private */
     /* access modifiers changed from: package-private */
     @VisibleForTesting
     @VisibleForTesting
     public void setPdfContainer(AdobePdfContainer adobePdfContainer) {
     public void setPdfContainer(AdobePdfContainer adobePdfContainer) {
-        this.mPdfContainer = adobePdfContainer;
+        mPdfContainer = adobePdfContainer;
     }
     }
 
 
     public boolean openPdfFile(String str, String str2, Context context) {
     public boolean openPdfFile(String str, String str2, Context context) {
-        this.mPdfContainer = new AdobePdfContainer(context);
+        mPdfContainer = new AdobePdfContainer(context);
         try {
         try {
             if (!checkFileSize(str)) {
             if (!checkFileSize(str)) {
                 return false;
                 return false;
             }
             }
-            this.mPdfContainer.LoadDocument(str, str2);
+            mPdfContainer.LoadDocument(str, str2);
             return true;
             return true;
         } catch (Exception unused) {
         } catch (Exception unused) {
             return false;
             return false;
@@ -39,7 +39,7 @@ public class AreaPdfRenderer {
     }
     }
 
 
     public int totalPages() {
     public int totalPages() {
-        AdobePdfContainer adobePdfContainer = this.mPdfContainer;
+        AdobePdfContainer adobePdfContainer = mPdfContainer;
         if (adobePdfContainer != null) {
         if (adobePdfContainer != null) {
             return adobePdfContainer.CountPages();
             return adobePdfContainer.CountPages();
         }
         }
@@ -47,12 +47,12 @@ public class AreaPdfRenderer {
     }
     }
 
 
     public boolean isPageLandscape(int i) throws AdobePdfContainer.ParameterException {
     public boolean isPageLandscape(int i) throws AdobePdfContainer.ParameterException {
-        return this.mPdfContainer.GetPageSizeX(i) > this.mPdfContainer.GetPageSizeY(i);
+        return mPdfContainer.GetPageSizeX(i) > mPdfContainer.GetPageSizeY(i);
     }
     }
 
 
     public boolean convertPageForPrint(String str, int i, int[] iArr) throws AdobePdfContainer.ParameterException {
     public boolean convertPageForPrint(String str, int i, int[] iArr) throws AdobePdfContainer.ParameterException {
-        int[] inscribeSize = getInscribeSize(iArr, (float) this.mPdfContainer.GetPageSizeX(i), (float) this.mPdfContainer.GetPageSizeY(i));
-        return this.mPdfContainer.decodeToJpegFile(str, i, inscribeSize[0], inscribeSize[1]);
+        int[] inscribeSize = getInscribeSize(iArr, (float) mPdfContainer.GetPageSizeX(i), (float) mPdfContainer.GetPageSizeY(i));
+        return mPdfContainer.decodeToJpegFile(str, i, inscribeSize[0], inscribeSize[1]);
     }
     }
 
 
     @NonNull
     @NonNull

+ 44 - 44
app/src/main/java/epson/print/pdf/pdfRender.java

@@ -46,14 +46,14 @@ public class pdfRender implements CommonDefine {
     }
     }
 
 
     public pdfRender(Context context, Handler handler) {
     public pdfRender(Context context, Handler handler) {
-        this.mContext = context;
-        this.mUiHandler = handler;
+        mContext = context;
+        mUiHandler = handler;
     }
     }
 
 
     public synchronized void startConvertPage(final int i, final int i2, final int i3) {
     public synchronized void startConvertPage(final int i, final int i2, final int i3) {
         if (this.backgroundThread == null) {
         if (this.backgroundThread == null) {
-            this.mRendererStart = false;
-            this.backgroundThread = new Thread(new Runnable() {
+            mRendererStart = false;
+            backgroundThread = new Thread(new Runnable() {
                 public void run() {
                 public void run() {
                     try {
                     try {
                         if (pdfRender.this.mPdfFile != null) {
                         if (pdfRender.this.mPdfFile != null) {
@@ -75,19 +75,19 @@ public class pdfRender implements CommonDefine {
                     Thread unused = pdfRender.this.backgroundThread = null;
                     Thread unused = pdfRender.this.backgroundThread = null;
                 }
                 }
             });
             });
-            this.backgroundThread.start();
+            backgroundThread.start();
         }
         }
     }
     }
 
 
     public boolean RendererStart() {
     public boolean RendererStart() {
-        return this.mRendererStart;
+        return mRendererStart;
     }
     }
 
 
     public boolean openPdfFile(String str, String str2, Context context) {
     public boolean openPdfFile(String str, String str2, Context context) {
         boolean z;
         boolean z;
-        this.mRotateCheck = false;
-        this.mPdfFile = new AdobePdfContainer(context);
-        this.mPdfFilename = str;
+        mRotateCheck = false;
+        mPdfFile = new AdobePdfContainer(context);
+        mPdfFilename = str;
         try {
         try {
             boolean parsePDF = parsePDF(str, str2);
             boolean parsePDF = parsePDF(str, str2);
             z = true;
             z = true;
@@ -98,8 +98,8 @@ public class pdfRender implements CommonDefine {
                 if (this.mPdfFile == null || z) {
                 if (this.mPdfFile == null || z) {
                     return z;
                     return z;
                 }
                 }
-                this.mTotalPage = this.mPdfFile.CountPages();
-                this.mUiHandler.sendEmptyMessage(2);
+                mTotalPage = mPdfFile.CountPages();
+                mUiHandler.sendEmptyMessage(2);
                 return false;
                 return false;
             } catch (Exception e) {
             } catch (Exception e) {
                 e = e;
                 e = e;
@@ -115,12 +115,12 @@ public class pdfRender implements CommonDefine {
     }
     }
 
 
     public boolean canPrintableDoc() {
     public boolean canPrintableDoc() {
-        return this.mPdfFile.hasPrintPermission() == 0;
+        return mPdfFile.hasPrintPermission() == 0;
     }
     }
 
 
     public void convert4Preview(int i) {
     public void convert4Preview(int i) {
         ExternalFileUtils.getInstance(this.mContext).initPdfDir();
         ExternalFileUtils.getInstance(this.mContext).initPdfDir();
-        this.mIsPreviewCon = true;
+        mIsPreviewCon = true;
         if (convertPage(i, DEF_ZOOM_PREVIEW, 0, 1)) {
         if (convertPage(i, DEF_ZOOM_PREVIEW, 0, 1)) {
             Log.d(TAG, "convertPage Preview Finish :" + i);
             Log.d(TAG, "convertPage Preview Finish :" + i);
             try {
             try {
@@ -134,7 +134,7 @@ public class pdfRender implements CommonDefine {
                 Message message = new Message();
                 Message message = new Message();
                 message.setData(bundle);
                 message.setData(bundle);
                 message.what = 0;
                 message.what = 0;
-                this.mUiHandler.sendMessage(message);
+                mUiHandler.sendMessage(message);
                 return;
                 return;
             }
             }
             Log.e(TAG, "Convert Preview NG : mIsPreviewCon = false");
             Log.e(TAG, "Convert Preview NG : mIsPreviewCon = false");
@@ -144,7 +144,7 @@ public class pdfRender implements CommonDefine {
 
 
     public void convert4Print(int i, int i2) {
     public void convert4Print(int i, int i2) {
         ExternalFileUtils.getInstance(this.mContext).initPrintDir();
         ExternalFileUtils.getInstance(this.mContext).initPrintDir();
-        this.mPrintingCon = true;
+        mPrintingCon = true;
         int i3 = 1;
         int i3 = 1;
         while (this.mPrintingCon) {
         while (this.mPrintingCon) {
             if (i - 1 <= i2 - 1) {
             if (i - 1 <= i2 - 1) {
@@ -152,7 +152,7 @@ public class pdfRender implements CommonDefine {
                     if (this.mPrintingCon) {
                     if (this.mPrintingCon) {
                         ExternalFileUtils.getInstance(this.mContext).initPdfDir();
                         ExternalFileUtils.getInstance(this.mContext).initPdfDir();
                         if (convertPage(i, DEF_ZOOM_PRINT, 1, i3)) {
                         if (convertPage(i, DEF_ZOOM_PRINT, 1, i3)) {
-                            this.mRendererStart = true;
+                            mRendererStart = true;
                             i++;
                             i++;
                             i3++;
                             i3++;
                         } else {
                         } else {
@@ -163,7 +163,7 @@ public class pdfRender implements CommonDefine {
                     e.printStackTrace();
                     e.printStackTrace();
                 }
                 }
             }
             }
-            this.mPrintingCon = false;
+            mPrintingCon = false;
             return;
             return;
         }
         }
     }
     }
@@ -179,24 +179,24 @@ public class pdfRender implements CommonDefine {
                 break;
                 break;
             }
             }
         }
         }
-        return this.mRotate;
+        return mRotate;
     }
     }
 
 
     private boolean convertPage(int i, float f, int i2, int i3) {
     private boolean convertPage(int i, float f, int i2, int i3) {
         int i4;
         int i4;
-        AdobePdfContainer adobePdfContainer = this.mPdfFile;
+        AdobePdfContainer adobePdfContainer = mPdfFile;
         if (adobePdfContainer != null) {
         if (adobePdfContainer != null) {
             try {
             try {
                 float GetPageSizeX = (float) adobePdfContainer.GetPageSizeX(i);
                 float GetPageSizeX = (float) adobePdfContainer.GetPageSizeX(i);
-                float GetPageSizeY = (float) this.mPdfFile.GetPageSizeY(i);
-                EPLog.i(TAG, new File(this.mPdfFilename).getName() + " - " + i + CommonDefine.SLASH + this.mTotalPage + ": " + GetPageSizeX + "x" + GetPageSizeY);
+                float GetPageSizeY = (float) mPdfFile.GetPageSizeY(i);
+                EPLog.i(TAG, new File(this.mPdfFilename).getName() + " - " + i + CommonDefine.SLASH + mTotalPage + ": " + GetPageSizeX + "x" + GetPageSizeY);
                 if (i == 1) {
                 if (i == 1) {
                     if (GetPageSizeX > GetPageSizeY) {
                     if (GetPageSizeX > GetPageSizeY) {
-                        this.mRotate = true;
+                        mRotate = true;
                     } else {
                     } else {
-                        this.mRotate = false;
+                        mRotate = false;
                     }
                     }
-                    this.mRotateCheck = true;
+                    mRotateCheck = true;
                     i4 = 0;
                     i4 = 0;
                 } else if (GetPageSizeX > GetPageSizeY) {
                 } else if (GetPageSizeX > GetPageSizeY) {
                     i4 = !this.mRotate ? 90 : 0;
                     i4 = !this.mRotate ? 90 : 0;
@@ -214,22 +214,22 @@ public class pdfRender implements CommonDefine {
                 float f6 = f4 * GetPageSizeY;
                 float f6 = f4 * GetPageSizeY;
                 EPLog.i(TAG, "scaledWidth = " + f5 + ",scaledHeight = " + f6);
                 EPLog.i(TAG, "scaledWidth = " + f5 + ",scaledHeight = " + f6);
                 System.gc();
                 System.gc();
-                this.mConvertedName = "";
+                mConvertedName = "";
                 if (i2 != 1) {
                 if (i2 != 1) {
-                    Bitmap pageBitmap = this.mPdfFile.getPageBitmap(i, (int) f5, (int) f6, i4);
+                    Bitmap pageBitmap = mPdfFile.getPageBitmap(i, (int) f5, (int) f6, i4);
                     if (pageBitmap == null) {
                     if (pageBitmap == null) {
-                        this.mUiHandler.sendEmptyMessage(6);
+                        mUiHandler.sendEmptyMessage(6);
                         return false;
                         return false;
                     }
                     }
                     String pdfDir = ExternalFileUtils.getInstance(this.mContext).getPdfDir();
                     String pdfDir = ExternalFileUtils.getInstance(this.mContext).getPdfDir();
-                    this.mConvertedName = new File(pdfDir, CommonDefine.UNDER_BAR + i + ".jpg").getPath();
-                    saveImageToJpg(pageBitmap, this.mConvertedName);
+                    mConvertedName = new File(pdfDir, CommonDefine.UNDER_BAR + i + ".jpg").getPath();
+                    saveImageToJpg(pageBitmap, mConvertedName);
                     pageBitmap.recycle();
                     pageBitmap.recycle();
-                    Log.d(TAG, "saveImageToJpg Finish : " + this.mConvertedName);
+                    Log.d(TAG, "saveImageToJpg Finish : " + mConvertedName);
                 } else {
                 } else {
-                    String pageBitmapFile = this.mPdfFile.getPageBitmapFile(i, (int) f5, (int) f6, i4 != 0);
+                    String pageBitmapFile = mPdfFile.getPageBitmapFile(i, (int) f5, (int) f6, i4 != 0);
                     if (pageBitmapFile == null) {
                     if (pageBitmapFile == null) {
-                        this.mUiHandler.sendEmptyMessage(6);
+                        mUiHandler.sendEmptyMessage(6);
                         return false;
                         return false;
                     }
                     }
                     String decodeJpegFilename = getDecodeJpegFilename(i);
                     String decodeJpegFilename = getDecodeJpegFilename(i);
@@ -268,10 +268,10 @@ public class pdfRender implements CommonDefine {
             long length = new File(str).length();
             long length = new File(str).length();
             if (length == 0) {
             if (length == 0) {
                 Log.e(TAG, "file is empty");
                 Log.e(TAG, "file is empty");
-                this.mUiHandler.sendEmptyMessage(6);
+                mUiHandler.sendEmptyMessage(6);
                 return false;
                 return false;
             }
             }
-            Log.i(TAG, "file: " + this.mPdfFilename + "has" + length + "byte");
+            Log.i(TAG, "file: " + mPdfFilename + "has" + length + "byte");
             openFile(str, str2);
             openFile(str, str2);
             return false;
             return false;
         } catch (AdobePdfContainer.PasswordException unused) {
         } catch (AdobePdfContainer.PasswordException unused) {
@@ -279,14 +279,14 @@ public class pdfRender implements CommonDefine {
             return true;
             return true;
         } catch (Throwable th) {
         } catch (Throwable th) {
             th.printStackTrace();
             th.printStackTrace();
-            this.mUiHandler.sendEmptyMessage(6);
-            this.mOpenError = true;
+            mUiHandler.sendEmptyMessage(6);
+            mOpenError = true;
             return false;
             return false;
         }
         }
     }
     }
 
 
     public void openFile(String str, String str2) throws AdobePdfContainer.PasswordException, AdobePdfContainer.NoPdfException {
     public void openFile(String str, String str2) throws AdobePdfContainer.PasswordException, AdobePdfContainer.NoPdfException {
-        this.mPdfFile.LoadDocument(str, str2);
+        mPdfFile.LoadDocument(str, str2);
     }
     }
 
 
     private byte[] readBytes(File file) throws IOException {
     private byte[] readBytes(File file) throws IOException {
@@ -303,11 +303,11 @@ public class pdfRender implements CommonDefine {
     }
     }
 
 
     public boolean isFileExit() {
     public boolean isFileExit() {
-        return this.mPdfFile != null;
+        return mPdfFile != null;
     }
     }
 
 
     public int totalPages() {
     public int totalPages() {
-        AdobePdfContainer adobePdfContainer = this.mPdfFile;
+        AdobePdfContainer adobePdfContainer = mPdfFile;
         if (adobePdfContainer != null) {
         if (adobePdfContainer != null) {
             return adobePdfContainer.CountPages();
             return adobePdfContainer.CountPages();
         }
         }
@@ -315,11 +315,11 @@ public class pdfRender implements CommonDefine {
     }
     }
 
 
     public String getConvertedPagePrint() {
     public String getConvertedPagePrint() {
-        return this.mConvertedNamePrint;
+        return mConvertedNamePrint;
     }
     }
 
 
     public String getConvertedPagePreview() {
     public String getConvertedPagePreview() {
-        return this.mConvertedName;
+        return mConvertedName;
     }
     }
 
 
     public void setPrintingStt(boolean z) {
     public void setPrintingStt(boolean z) {
@@ -328,9 +328,9 @@ public class pdfRender implements CommonDefine {
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }
-        this.mPrintingCon = z;
+        mPrintingCon = z;
         if (!z) {
         if (!z) {
-            while (this.backgroundThread != null && this.backgroundThread.isAlive()) {
+            while (this.backgroundThread != null && backgroundThread.isAlive()) {
                 try {
                 try {
                     Thread.sleep(2000);
                     Thread.sleep(2000);
                     EPLog.d("Convert Preview", "convert4Print shutdown...");
                     EPLog.d("Convert Preview", "convert4Print shutdown...");
@@ -342,6 +342,6 @@ public class pdfRender implements CommonDefine {
     }
     }
 
 
     public void setMIsPreviewCon(boolean z) {
     public void setMIsPreviewCon(boolean z) {
-        this.mIsPreviewCon = z;
+        mIsPreviewCon = z;
     }
     }
 }
 }

Some files were not shown because too many files changed in this diff