liuyuqi-dellpc 3 years ago
parent
commit
14ea22b420
100 changed files with 788 additions and 788 deletions
  1. 1 1
      app/src/main/java/com/epson/cameracopy/device/PortraitCameraView.java
  2. 11 11
      app/src/main/java/com/epson/cameracopy/ui/CameraPrintSettingActivity.java
  3. 9 9
      app/src/main/java/com/epson/iprint/storage/StorageActivity.java
  4. 1 1
      app/src/main/java/com/epson/iprint/storage/StorageProcessUploadActivity.java
  5. 1 1
      app/src/main/java/com/epson/iprint/storage/dropbox/DropboxV2Client.java
  6. 1 1
      app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleV3UploadClient.java
  7. 2 2
      app/src/main/java/com/epson/lib/escani2/ScannerI2Info.java
  8. 2 2
      app/src/main/java/com/epson/mobilephone/common/usb/UsbReciever.java
  9. 13 13
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityControlWiFi.java
  10. 18 18
      app/src/main/java/epson/common/BMPFile.java
  11. 1 1
      app/src/main/java/epson/common/CustomListRowAdapter.java
  12. 1 1
      app/src/main/java/epson/common/EventWrapper.java
  13. 10 10
      app/src/main/java/epson/common/httpclient/IAHttpClient.java
  14. 1 1
      app/src/main/java/epson/epsonconnectregistration/ECBaseTask.java
  15. 1 1
      app/src/main/java/epson/maintain/EfuReader.java
  16. 2 2
      app/src/main/java/epson/maintain/FirmwareManager.java
  17. 2 2
      app/src/main/java/epson/maintain/activity/GetPrinterReplyData.java
  18. 14 14
      app/src/main/java/epson/maintain/activity/MaintainActivity.java
  19. 13 13
      app/src/main/java/epson/maintain/activity/MaintainPrinterSearchActivity.java
  20. 22 22
      app/src/main/java/epson/print/ActivityDocsPrintPreview.java
  21. 4 4
      app/src/main/java/epson/print/ActivityNfcPrinter.java
  22. 15 15
      app/src/main/java/epson/print/ActivityPrintWeb.java
  23. 2 2
      app/src/main/java/epson/print/EPImageCreator.java
  24. 4 4
      app/src/main/java/epson/print/EPImageList.java
  25. 1 1
      app/src/main/java/epson/print/GalleryAdapter.java
  26. 2 2
      app/src/main/java/epson/print/IconTextArrayAdapter.java
  27. 4 4
      app/src/main/java/epson/print/ImageItem.java
  28. 20 20
      app/src/main/java/epson/print/MenudataAdapter.java
  29. 1 1
      app/src/main/java/epson/print/Util/bmpScaler.java
  30. 22 22
      app/src/main/java/epson/print/WebviewActivity.java
  31. 68 68
      app/src/main/java/epson/print/copy/ActivityBase.java
  32. 1 1
      app/src/main/java/epson/print/copy/Component/ecopycomponent/CopyPhotoSettingHandler.java
  33. 6 6
      app/src/main/java/epson/print/copy/Component/ecopycomponent/ECopyComponent.java
  34. 3 3
      app/src/main/java/epson/print/copy/Component/ecopycomponent/ECopyOptionContext.java
  35. 24 24
      app/src/main/java/epson/print/copy/Component/ecopycomponent/ECopyOptionItem.java
  36. 38 38
      app/src/main/java/epson/print/copy/Component/ecopycomponent/ECopyPreview.java
  37. 2 2
      app/src/main/java/epson/print/copy/Component/ecopycomponent/PreviewScanTask.java
  38. 7 7
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyGetOptionTask.java
  39. 2 2
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyPhotoGetOptionTask.java
  40. 6 6
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyPhotoSetOptionTask.java
  41. 12 12
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyPhotoTask.java
  42. 9 9
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopySetOptionTask.java
  43. 17 17
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyTask.java
  44. 3 3
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteDeviceTask.java
  45. 5 5
      app/src/main/java/epson/print/copy/Component/eremoteoperation/ERemoteCombo.java
  46. 7 7
      app/src/main/java/epson/print/copy/Component/eremoteoperation/ERemoteCopy.java
  47. 5 5
      app/src/main/java/epson/print/copy/Component/eremoteoperation/ERemoteCopyPhoto.java
  48. 2 2
      app/src/main/java/epson/print/copy/Component/eremoteoperation/ERemoteDevice.java
  49. 5 5
      app/src/main/java/epson/print/copy/Component/eremoteoperation/ERemoteOperation.java
  50. 3 3
      app/src/main/java/epson/print/copy/Component/eremoteoperation/ERemotePrinter.java
  51. 3 3
      app/src/main/java/epson/print/copy/Component/eremoteoperation/ERemoteScanner.java
  52. 12 12
      app/src/main/java/epson/print/copy/CopyScaleActivity.java
  53. 8 8
      app/src/main/java/epson/print/copy/CopySettingActivity.java
  54. 1 1
      app/src/main/java/epson/print/copy/DisplayUtil.java
  55. 1 1
      app/src/main/java/epson/print/ecclient/EpsonConnectAccess.java
  56. 4 4
      app/src/main/java/epson/print/ecclient/HttpApache.java
  57. 2 2
      app/src/main/java/epson/print/ecclient/HttpNonSsl.java
  58. 16 16
      app/src/main/java/epson/print/fileBrower.java
  59. 2 2
      app/src/main/java/epson/print/gdconv/ConvertProgressActivity.java
  60. 4 4
      app/src/main/java/epson/print/imgsel/Alt2ViewImageAdapter.java
  61. 5 5
      app/src/main/java/epson/print/imgsel/BitmapCache.java
  62. 1 1
      app/src/main/java/epson/print/imgsel/ImageFindTask.java
  63. 1 1
      app/src/main/java/epson/print/imgsel/ImageFolderAdapter.java
  64. 2 2
      app/src/main/java/epson/print/imgsel/ImageFolderInfo.java
  65. 3 3
      app/src/main/java/epson/print/imgsel/ImageFolderListFragment.java
  66. 7 7
      app/src/main/java/epson/print/imgsel/ImageGridFragment.java
  67. 2 2
      app/src/main/java/epson/print/imgsel/ImageResizer.java
  68. 1 1
      app/src/main/java/epson/print/imgsel/ImageSelectActivity.java
  69. 2 2
      app/src/main/java/epson/print/imgsel/ImageSelector.java
  70. 5 5
      app/src/main/java/epson/print/imgsel/ImageThumbnailTask.java
  71. 1 1
      app/src/main/java/epson/print/imgsel/ImageViewBaseFragment.java
  72. 6 6
      app/src/main/java/epson/print/imgsel/ImageViewMultiSelectFragment.java
  73. 4 4
      app/src/main/java/epson/print/imgsel/ImageViewPagerActivity.java
  74. 2 2
      app/src/main/java/epson/print/imgsel/ImageViewSingleFragment.java
  75. 1 1
      app/src/main/java/epson/print/imgsel/LocalAlertDialogFragment.java
  76. 3 3
      app/src/main/java/epson/print/inkrpln/InkRplnProgressFragment.java
  77. 3 3
      app/src/main/java/epson/print/inkrpln/JumpUrlFragment.java
  78. 7 7
      app/src/main/java/epson/print/pdf/AdobePdfContainer.java
  79. 14 14
      app/src/main/java/epson/print/pdf/pdfRender.java
  80. 9 9
      app/src/main/java/epson/print/phlayout/AltRect.java
  81. 6 6
      app/src/main/java/epson/print/phlayout/AltRectF.java
  82. 6 6
      app/src/main/java/epson/print/phlayout/BorderedLayoutPosition.java
  83. 8 8
      app/src/main/java/epson/print/phlayout/BorderlessLayoutPosition.java
  84. 4 4
      app/src/main/java/epson/print/phlayout/CdLayoutPosition.java
  85. 38 38
      app/src/main/java/epson/print/phlayout/PhotoPreview.java
  86. 3 3
      app/src/main/java/epson/print/phlayout/PhotoPreviewImageList.java
  87. 63 63
      app/src/main/java/epson/print/rpcopy/ActivityBase.java
  88. 4 4
      app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/ECopyComponent.java
  89. 3 3
      app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/ECopyOptionContext.java
  90. 26 26
      app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/ECopyOptionItem.java
  91. 7 7
      app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/RemoteCopyGetOptionTask.java
  92. 6 6
      app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/RemoteCopySetOptionTask.java
  93. 20 20
      app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/RemoteCopyTask.java
  94. 7 7
      app/src/main/java/epson/print/rpcopy/Component/eremoteoperation/ERemoteCopy.java
  95. 2 2
      app/src/main/java/epson/print/rpcopy/Component/eremoteoperation/ERemoteDevice.java
  96. 5 5
      app/src/main/java/epson/print/rpcopy/Component/eremoteoperation/ERemoteOperation.java
  97. 3 3
      app/src/main/java/epson/print/rpcopy/Component/eremoteoperation/ERemotePrinter.java
  98. 3 3
      app/src/main/java/epson/print/rpcopy/Component/eremoteoperation/ERemoteScanner.java
  99. 9 9
      app/src/main/java/epson/print/rpcopy/CopyActivity.java
  100. 7 7
      app/src/main/java/epson/print/rpcopy/CopyProcess.java

+ 1 - 1
app/src/main/java/com/epson/cameracopy/device/PortraitCameraView.java

@@ -516,7 +516,7 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
                 synchronized (PortraitCameraView.this) {
                     while (!PortraitCameraView.mCameraFrameReady && !PortraitCameraView.mStopThread) {
                         try {
-                            PortraitCameraView.this.wait();
+                            wait();
                         } catch (InterruptedException e) {
                             e.printStackTrace();
                         }

+ 11 - 11
app/src/main/java/com/epson/cameracopy/ui/CameraPrintSettingActivity.java

@@ -128,7 +128,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         }
 
         public void onFindPrinterResult(String str, String str2, String str3, String str4, String str5) throws RemoteException {
-            String unused = CameraPrintSettingActivity.this.printerIp = str2;
+            String unused = printerIp = str2;
         }
 
         public void onNotifyContinueable(int i) throws RemoteException {
@@ -742,28 +742,28 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     unbindEpsonService();
                     new AsyncTask<Void, Void, Void>() {
                         protected void onPreExecute() {
-                            CameraPrintSettingActivity.this.findViewById(R.id.printer).setClickable(false);
+                            findViewById(R.id.printer).setClickable(false);
                         }
 
                         protected Void doInBackground(Void... voidArr) {
                             CameraPrintSettingActivity cameraPrintSettingActivity = CameraPrintSettingActivity.this;
                             WiFiDirectManager.disconnect(cameraPrintSettingActivity, WiFiDirectManager.DEVICE_TYPE_PRINTER, cameraPrintSettingActivity.printerIp);
                             CameraPrintSettingActivity cameraPrintSettingActivity2 = CameraPrintSettingActivity.this;
-                            WiFiDirectManager.disconnectSimpleAP(cameraPrintSettingActivity2, cameraPrintSettingActivity2.autoConnectSsid, CameraPrintSettingActivity.this.printerIp);
+                            WiFiDirectManager.disconnectSimpleAP(cameraPrintSettingActivity2, cameraPrintSettingActivity2.autoConnectSsid, printerIp);
                             return null;
                         }
 
                         protected void onPostExecute(Void voidR) {
                             Intent intent = new Intent(CameraPrintSettingActivity.this, SearchPrinterScr.class);
                             Bundle bundle = new Bundle();
-                            bundle.putString(Constants.PRINTER_ID, CameraPrintSettingActivity.this.printerId);
-                            bundle.putString(Constants.PRINTER_IP, CameraPrintSettingActivity.this.printerIp);
-                            bundle.putString(Constants.PRINTER_EMAIL_ADDRESS, CameraPrintSettingActivity.this.printerEmailAddress);
-                            bundle.putInt(Constants.PRINTER_LOCATION, CameraPrintSettingActivity.this.printerLocation);
-                            bundle.putString(CameraPrintSettingActivity.EXTRA_SIMPLEAP, CameraPrintSettingActivity.this.autoConnectSsid);
+                            bundle.putString(Constants.PRINTER_ID, printerId);
+                            bundle.putString(Constants.PRINTER_IP, printerIp);
+                            bundle.putString(Constants.PRINTER_EMAIL_ADDRESS, printerEmailAddress);
+                            bundle.putInt(Constants.PRINTER_LOCATION, printerLocation);
+                            bundle.putString(CameraPrintSettingActivity.EXTRA_SIMPLEAP, autoConnectSsid);
                             intent.putExtras(bundle);
-                            CameraPrintSettingActivity.this.startActivityForResult(intent, 0);
-                            CameraPrintSettingActivity.this.findViewById(R.id.printer).setClickable(true);
+                            startActivityForResult(intent, 0);
+                            findViewById(R.id.printer).setClickable(true);
                         }
                     }.execute(new Void[0]);
                     return;
@@ -1205,7 +1205,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     public void showErrorDialog(String str, String str2) {
         new CustomTitleAlertDialogBuilder(this).setCancelable(false).setTitle(str).setMessage(str2).setNegativeButton(getString(R.string.ok_button), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                CameraPrintSettingActivity.this.setScreenState(true);
+                setScreenState(true);
                 dialogInterface.cancel();
             }
         }).create().show();

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

@@ -65,7 +65,7 @@ class StorageActivity extends ActivityIACommon {
                 intent.putExtra(StorageWaitingActivity.EXTRA_CANCEL_ENABLED, true);
                 registerCancelRequestReceiver(cancelRequestCallback);
             }
-            StorageActivity.this.startActivity(intent);
+            startActivity(intent);
             while (z && !StorageWaitingActivity.bShowing) {
                 try {
                     Thread.sleep(200);
@@ -79,7 +79,7 @@ class StorageActivity extends ActivityIACommon {
             Intent intent = new Intent(StorageWaitingActivity.CHANGE_ACTION);
             intent.putExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, mRequestCode);
             intent.putExtra(StorageWaitingActivity.EXTRA_MESSAGE, str);
-            StorageActivity.this.sendBroadcast(intent);
+            sendBroadcast(intent);
         }
 
         private void registerCancelCallback(CancelRequestCallback cancelRequestCallback) {
@@ -87,20 +87,20 @@ class StorageActivity extends ActivityIACommon {
             intent.putExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, mRequestCode);
             intent.putExtra(StorageWaitingActivity.EXTRA_CANCEL_ENABLED, true);
             registerCancelRequestReceiver(cancelRequestCallback);
-            StorageActivity.this.sendBroadcast(intent);
+            sendBroadcast(intent);
         }
 
         public void dismiss() {
             Intent intent = new Intent(StorageWaitingActivity.DISMISS_ACTION);
             intent.putExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, mRequestCode);
-            StorageActivity.this.sendBroadcast(intent);
+            sendBroadcast(intent);
             setCancelReceiver((BroadcastReceiver) null);
         }
 
         private void setCancelReceiver(BroadcastReceiver broadcastReceiver) {
             BroadcastReceiver broadcastReceiver2 = mCancelReceiver;
             if (broadcastReceiver2 != null) {
-                StorageActivity.this.unregisterReceiver(broadcastReceiver2);
+                unregisterReceiver(broadcastReceiver2);
             }
             mCancelReceiver = broadcastReceiver;
         }
@@ -115,7 +115,7 @@ class StorageActivity extends ActivityIACommon {
                     }
                 }
             };
-            StorageActivity.this.registerReceiver(r0, new IntentFilter(StorageWaitingActivity.CANCEL_REQUEST_ACTION));
+            registerReceiver(r0, new IntentFilter(StorageWaitingActivity.CANCEL_REQUEST_ACTION));
             setCancelReceiver(r0);
         }
     }
@@ -141,8 +141,8 @@ class StorageActivity extends ActivityIACommon {
                 dialogInterface.cancel();
                 Intent intent = intent;
                 if (intent != null) {
-                    StorageActivity.this.startActivity(intent);
-                    StorageActivity.this.finish();
+                    startActivity(intent);
+                    finish();
                 }
             }
         });
@@ -156,7 +156,7 @@ class StorageActivity extends ActivityIACommon {
         builder.setPositiveButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 dialogInterface.cancel();
-                StorageActivity.this.finish();
+                finish();
             }
         });
         builder.create().show();

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

@@ -136,7 +136,7 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
                 String str4 = uploadFilename + str;
                 if (size > 1) {
                     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[]{uploadFilename, Integer.valueOf(i + 1), str});
                     } else {
                         str4 = String.format("%s%s", new Object[]{StorageProcessUploadActivity.this.generateUploadFilename(i), str});
                     }

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

@@ -155,7 +155,7 @@ public class DropboxV2Client extends StorageServiceClient {
         }
 
         public void start(StorageServiceClient.DownloadCompletion downloadCompletion) {
-            new DownloadTask(downloadCompletion).execute(new Object[]{this.mStorageItem, mWriteFilename});
+            new DownloadTask(downloadCompletion).execute(new Object[]{mStorageItem, mWriteFilename});
         }
     }
 

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

@@ -74,7 +74,7 @@ public class GoogleV3UploadClient extends StorageServiceClient {
         }
 
         public void start(StorageServiceClient.UploadCompletion uploadCompletion) {
-            new UploadTask(mContext, uploadCompletion).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new UploadInfo[]{this.mUploadInfo});
+            new UploadTask(mContext, uploadCompletion).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new UploadInfo[]{mUploadInfo});
         }
     }
 

+ 2 - 2
app/src/main/java/com/epson/lib/escani2/ScannerI2Info.java

@@ -56,11 +56,11 @@ public class ScannerI2Info implements Serializable {
             if (flatbedInstalled) {
                 return null;
             }
-            return new int[]{this.flatbedSensorWidth, flatbedSensorHeight};
+            return new int[]{flatbedSensorWidth, flatbedSensorHeight};
         } else if (adfInstalled) {
             return null;
         } else {
-            return new int[]{this.adfSensorWidth, adfSensorHeight};
+            return new int[]{adfSensorWidth, adfSensorHeight};
         }
     }
 

+ 2 - 2
app/src/main/java/com/epson/mobilephone/common/usb/UsbReciever.java

@@ -42,14 +42,14 @@ public class UsbReciever extends Activity {
                                     intent.addCategory("android.intent.category.LAUNCHER");
                                     intent.setClassName(context, className);
                                     try {
-                                        UsbReciever.this.startActivity(intent);
+                                        startActivity(intent);
                                         EPLog.d("EPSON", "UsbReciever ACTION_MAIN");
                                     } catch (Exception e) {
                                         e.printStackTrace();
                                     }
                                 }
                                 EPLog.d("EPSON", "UsbReciever finish()");
-                                UsbReciever.this.finish();
+                                finish();
                             }
                         });
                         return;

+ 13 - 13
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityControlWiFi.java

@@ -97,7 +97,7 @@ public class ActivityControlWiFi extends Activity {
     protected Dialog onCreateDialog(int i) {
         return i != 0 ? super.onCreateDialog(i) : new AlertDialog.Builder(this).setPositiveButton(getString(17039370), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                ActivityControlWiFi.this.registerReciever();
+                registerReciever();
                 boolean wifiEnabled = ActivityControlWiFi.mWifiManager.setWifiEnabled(true);
                 EPLog.d(ActivityControlWiFi.TAG, "setWifiEnabled return " + wifiEnabled);
                 if (!wifiEnabled) {
@@ -106,7 +106,7 @@ public class ActivityControlWiFi extends Activity {
             }
         }).setNegativeButton(getString(17039360), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                ActivityControlWiFi.this.onCancel();
+                onCancel();
             }
         }).setMessage(getString(R.string.str_no_wifi)).setCancelable(false).create();
     }
@@ -147,11 +147,11 @@ public class ActivityControlWiFi extends Activity {
                 if (ActivityControlWiFi.mWifiManager.isWifiEnabled()) {
                     switch (C10903.$SwitchMap$android$net$NetworkInfo$State[networkInfo.getState().ordinal()]) {
                         case 1:
-                            ActivityControlWiFi.this.scannigObserver.interrunpt();
-                            ActivityControlWiFi.this.onOK();
+                            scannigObserver.interrunpt();
+                            onOK();
                             return;
                         case 2:
-                            ActivityControlWiFi.this.scannigObserver.interrunpt();
+                            scannigObserver.interrunpt();
                             return;
                         default:
                             return;
@@ -162,23 +162,23 @@ public class ActivityControlWiFi extends Activity {
                 EPLog.d(ActivityControlWiFi.TAG, "Supplicant State Changed: State = " + supplicantState.toString());
                 switch (C10903.$SwitchMap$android$net$wifi$SupplicantState[supplicantState.ordinal()]) {
                     case 1:
-                        ActivityControlWiFi.this.scancount++;
-                        if (ActivityControlWiFi.this.scancount > 5) {
-                            ActivityControlWiFi.this.onOK();
+                        scancount++;
+                        if (scancount > 5) {
+                            onOK();
                             return;
                         } else {
-                            ActivityControlWiFi.this.scannigObserver.start();
+                            scannigObserver.start();
                             return;
                         }
                     case 2:
-                        ActivityControlWiFi.this.scannigObserver.interrunpt();
+                        scannigObserver.interrunpt();
                         return;
                     case 3:
                     case 4:
-                        ActivityControlWiFi.this.onOK();
+                        onOK();
                         return;
                     case 5:
-                        ActivityControlWiFi.this.scannigObserver.start();
+                        scannigObserver.start();
                         return;
                     default:
                         return;
@@ -287,7 +287,7 @@ public class ActivityControlWiFi extends Activity {
 
                 protected void onPostExecute(Void voidR) {
                     EPLog.i(ActivityControlWiFi.TAG, "Timeout ScanningObserver");
-                    ActivityControlWiFi.this.onOK();
+                    onOK();
                 }
             }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
         }

+ 18 - 18
app/src/main/java/epson/common/BMPFile.java

@@ -55,7 +55,7 @@ public class BMPFile {
         bitmap = null;
         int i3 = i * i2;
         bitmap = new int[i3];
-        bitmap2.getPixels(this.bitmap, 0, i, 0, 0, i, i2);
+        bitmap2.getPixels(bitmap, 0, i, 0, 0, i, i2);
         biSizeImage = (i3 * 3) + ((4 - ((i * 3) % 4)) * i2);
         bfSize = biSizeImage + 14 + 40;
         biWidth = i;
@@ -67,7 +67,7 @@ public class BMPFile {
         int i;
         byte[] bArr = new byte[3];
         int i2 = biWidth;
-        int i3 = (this.biHeight * i2) - 1;
+        int i3 = (biHeight * i2) - 1;
         int i4 = 4 - ((i2 * 3) % 4);
         if (i4 == 4) {
             i4 = 0;
@@ -113,11 +113,11 @@ public class BMPFile {
 
     private void writeBitmapFileHeader() {
         try {
-            f331fo.write(this.bfType);
-            f331fo.write(intToDWord(this.bfSize));
-            f331fo.write(intToWord(this.bfReserved1));
-            f331fo.write(intToWord(this.bfReserved2));
-            f331fo.write(intToDWord(this.bfOffBits));
+            f331fo.write(bfType);
+            f331fo.write(intToDWord(bfSize));
+            f331fo.write(intToWord(bfReserved1));
+            f331fo.write(intToWord(bfReserved2));
+            f331fo.write(intToDWord(bfOffBits));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -125,17 +125,17 @@ public class BMPFile {
 
     private void writeBitmapInfoHeader() {
         try {
-            f331fo.write(intToDWord(this.biSize));
-            f331fo.write(intToDWord(this.biWidth));
-            f331fo.write(intToDWord(this.biHeight));
-            f331fo.write(intToWord(this.biPlanes));
-            f331fo.write(intToWord(this.biBitCount));
-            f331fo.write(intToDWord(this.biCompression));
-            f331fo.write(intToDWord(this.biSizeImage));
-            f331fo.write(intToDWord(this.biXPelsPerMeter));
-            f331fo.write(intToDWord(this.biYPelsPerMeter));
-            f331fo.write(intToDWord(this.biClrUsed));
-            f331fo.write(intToDWord(this.biClrImportant));
+            f331fo.write(intToDWord(biSize));
+            f331fo.write(intToDWord(biWidth));
+            f331fo.write(intToDWord(biHeight));
+            f331fo.write(intToWord(biPlanes));
+            f331fo.write(intToWord(biBitCount));
+            f331fo.write(intToDWord(biCompression));
+            f331fo.write(intToDWord(biSizeImage));
+            f331fo.write(intToDWord(biXPelsPerMeter));
+            f331fo.write(intToDWord(biYPelsPerMeter));
+            f331fo.write(intToDWord(biClrUsed));
+            f331fo.write(intToDWord(biClrImportant));
         } catch (Exception e) {
             e.printStackTrace();
         }

+ 1 - 1
app/src/main/java/epson/common/CustomListRowAdapter.java

@@ -34,7 +34,7 @@ public class CustomListRowAdapter extends ArrayAdapter<CustomListRow> {
 
     public View getView(int i, View view, ViewGroup viewGroup) {
         if (view == null) {
-            view = inflater.inflate(this.resourceId, (ViewGroup) null);
+            view = inflater.inflate(resourceId, (ViewGroup) null);
         }
         return populateView(i, view, viewGroup);
     }

+ 1 - 1
app/src/main/java/epson/common/EventWrapper.java

@@ -15,7 +15,7 @@ public class EventWrapper<T> {
 
     @Nullable
     public T getEventContent() {
-        if (this.handled) {
+        if (handled) {
             return null;
         }
         handled = true;

+ 10 - 10
app/src/main/java/epson/common/httpclient/IAHttpClient.java

@@ -94,19 +94,19 @@ public class IAHttpClient {
 
     private HttpURLConnection connect(HttpBase httpBase) throws IOException {
         HttpURLConnection httpURLConnection;
-        synchronized (this.connLockObj) {
+        synchronized (connLockObj) {
             conn = (HttpURLConnection) httpBase.getURI().openConnection();
-            conn.setConnectTimeout(this.connectionTimeout);
-            conn.setReadTimeout(this.readTimeout);
-            conn.setInstanceFollowRedirects(this.followRedirects);
+            conn.setConnectTimeout(connectionTimeout);
+            conn.setReadTimeout(readTimeout);
+            conn.setInstanceFollowRedirects(followRedirects);
             httpURLConnection = conn;
         }
         return httpURLConnection;
     }
 
     public void disconnect() {
-        synchronized (this.connLockObj) {
-            if (this.conn != null) {
+        synchronized (connLockObj) {
+            if (conn != null) {
                 conn.disconnect();
             }
         }
@@ -119,9 +119,9 @@ public class IAHttpClient {
             conn = connect(httpGet);
             conn.setRequestMethod("GET");
             conn.setDoInput(true);
-            makeHeader(this.conn, httpGet);
+            makeHeader(conn, httpGet);
             conn.connect();
-            parseResponse = parseResponse(this.conn, true);
+            parseResponse = parseResponse(conn, true);
             disconnect();
         } catch (IOException e) {
             throw e;
@@ -495,8 +495,8 @@ public class IAHttpClient {
         }
 
         public ByteArrayOutputStream getEntity() throws IOException {
-            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(this.entityBuffer.length);
-            byteArrayOutputStream.write(this.entityBuffer);
+            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(entityBuffer.length);
+            byteArrayOutputStream.write(entityBuffer);
             return byteArrayOutputStream;
         }
 

+ 1 - 1
app/src/main/java/epson/epsonconnectregistration/ECBaseTask.java

@@ -35,7 +35,7 @@ public abstract class ECBaseTask extends AsyncTask<Void, Void, ECStatus> {
     }
 
     private Uri getEndpoint() {
-        return Uri.withAppendedPath(this.rootUri, BASE_URI_CONFIG_SERVICE);
+        return Uri.withAppendedPath(rootUri, BASE_URI_CONFIG_SERVICE);
     }
 
     private void openWebPage(Activity activity, Uri uri) {

+ 1 - 1
app/src/main/java/epson/maintain/EfuReader.java

@@ -158,7 +158,7 @@ public class EfuReader {
         }
 
         public void writeOnlyOneFirmwareData(File file) throws IOException {
-            writeRemainingData(this.f333is, mHeaderEndPosition, file);
+            writeRemainingData(f333is, mHeaderEndPosition, file);
         }
 
         /* JADX WARNING: Removed duplicated region for block: B:23:0x0034 A[Catch:{ all -> 0x002b }] */

+ 2 - 2
app/src/main/java/epson/maintain/FirmwareManager.java

@@ -361,13 +361,13 @@ public class FirmwareManager {
         public void write(byte[] bArr, int i, int i2) throws IOException {
             out.write(bArr, i, i2);
             transferred += (long) i2;
-            listener.transferred(this.transferred);
+            listener.transferred(transferred);
         }
 
         public void write(int i) throws IOException {
             out.write(i);
             transferred++;
-            listener.transferred(this.transferred);
+            listener.transferred(transferred);
         }
     }
 

+ 2 - 2
app/src/main/java/epson/maintain/activity/GetPrinterReplyData.java

@@ -195,7 +195,7 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
             }
         });
         extParam = (SharedParamStatus) getIntent().getSerializableExtra("extStatus");
-        if (this.extParam == null) {
+        if (extParam == null) {
             extParam = new SharedParamStatus();
         }
         if (mPrinter == null) {
@@ -291,7 +291,7 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
     }
 
     public void showProDia() {
-        if (this.customPro == null) {
+        if (customPro == null) {
             customPro = new CustomProDialog(this, R.style.AppTheme_Translucent, R.layout.maintain_executing_dialog);
         }
         customPro.show();

+ 14 - 14
app/src/main/java/epson/maintain/activity/MaintainActivity.java

@@ -653,7 +653,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
     }
 
     private void updateButton() {
-        switch (this.printerLocation) {
+        switch (printerLocation) {
             case 0:
                 mTvPrinterName.setText(getString(R.string.str_lbl_title_scan));
                 ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setVisibility(View.GONE);
@@ -705,7 +705,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 mAlertMesseageView.setVisibility(View.GONE);
                 mPrintHistorySeparator.setVisibility(View.GONE);
                 mPrintHistoryView.setVisibility(View.GONE);
-                if (this.escprSetPrinterSuccessed == 0) {
+                if (escprSetPrinterSuccessed == 0) {
                     mHeadCleanView.setEnabled(true);
                     mNozzleCheckView.setEnabled(true);
                     mFWUpdateView.setEnabled(true);
@@ -722,7 +722,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                     ((ImageView) findViewById(R.id.printer_setting_arrow)).setVisibility(View.GONE);
                     setEpsonConnectButton(1);
                 }
-                if (MyPrinter.PRINTER_USB.equals(this.printerIp)) {
+                if (MyPrinter.PRINTER_USB.equals(printerIp)) {
                     mFWUpdateView.setVisibility(View.GONE);
                     mPrinterSettingSeparator.setVisibility(View.GONE);
                     mPrinterSettingView.setVisibility(View.GONE);
@@ -819,7 +819,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 mPrintHistoryView.setVisibility(View.GONE);
                 mOnlineRegistrationSeparator.setVisibility(View.GONE);
                 mOnlineRegistrationView.setVisibility(View.GONE);
-                if (this.escprSetPrinterSuccessed == 0) {
+                if (escprSetPrinterSuccessed == 0) {
                     mHeadCleanView.setEnabled(true);
                     mNozzleCheckView.setEnabled(true);
                     mPrinterSettingView.setEnabled(true);
@@ -946,7 +946,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 return;
             case R.id.online_registration /*2131231289*/:
                 showDialog(DIALOG_PROGRESS);
-                OnlineRegTask(this.printerIp);
+                OnlineRegTask(printerIp);
                 return;
             case R.id.print_history /*2131231348*/:
                 startActivity(new Intent(this, EccPrintLog.class));
@@ -977,7 +977,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 }.execute(new Void[0]);
                 return;
             case R.id.printer_setting /*2131231369*/:
-                switch (this.printerLocation) {
+                switch (printerLocation) {
                     case 1:
                     case 3:
                         if (!WiFiDirectManager.isSimpleAP(this) || isKeepSimpleAPConnection) {
@@ -1001,7 +1001,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                         return;
                 }
             case R.id.toggleAlert /*2131231560*/:
-                if (this.btnToggleAlert.isChecked()) {
+                if (btnToggleAlert.isChecked()) {
                     SharedPreferences.Editor edit = getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).edit();
                     edit.putBoolean(Constants.ENABLE_SHOW_WARNING, true);
                     edit.commit();
@@ -1081,7 +1081,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
     }
 
     private void showProDia() {
-        if (this.customPro == null) {
+        if (customPro == null) {
             customPro = new CustomProDialog(this, R.style.AppTheme_Translucent, R.layout.maintain_executing_dialog);
         }
         customPro.show();
@@ -1292,7 +1292,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
             mHeadCleanView.setVisibility(View.VISIBLE);
             mNozzleCheckView.setVisibility(View.VISIBLE);
             LinearLayout linearLayout = mFWUpdateView;
-            if (this.printerLocation != 1) {
+            if (printerLocation != 1) {
                 i2 = 8;
             }
             linearLayout.setVisibility(i2);
@@ -1321,7 +1321,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 } else {
                     escprSetPrinterSuccessed = 0;
                 }
-                if (this.isRemotePrinter && mPrinterStatus[1] == 102) {
+                if (isRemotePrinter && mPrinterStatus[1] == 102) {
                     mUiHandler.sendEmptyMessage(11);
                 } else {
                     setErrorStatus(mPrinterStatus[0], mPrinterStatus[1]);
@@ -1419,7 +1419,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         if (i == -1351 || i == -1100) {
             i = -1300;
         }
-        if (this.isRemotePrinter && i == -1300) {
+        if (isRemotePrinter && i == -1300) {
             setButtonClickable(false);
             mUiHandler.sendEmptyMessage(11);
             return;
@@ -1622,15 +1622,15 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
     private void loadConfig() {
         MyPrinter curPrinter = MyPrinter.getCurPrinter(this);
         printerName = curPrinter.getUserDefName(this);
-        if (this.printerName == null) {
+        if (printerName == null) {
             printerName = "";
         }
         printerId = curPrinter.getPrinterId();
-        if (this.printerId == null) {
+        if (printerId == null) {
             printerId = "";
         }
         printerIp = curPrinter.getIp();
-        if (this.printerIp == null) {
+        if (printerIp == null) {
             printerIp = "";
         }
         printerLocation = curPrinter.getLocation();

+ 13 - 13
app/src/main/java/epson/maintain/activity/MaintainPrinterSearchActivity.java

@@ -159,7 +159,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         setContentView((View) mLayout);
         mContext = this;
         mIsClickSelect = false;
-        if (this.printer_location != 1) {
+        if (printer_location != 1) {
             displaySearchResult();
             mSearchButton.setVisibility(View.GONE);
             ((TextView) mLayout.findViewById(R.id.empty)).setVisibility(View.GONE);
@@ -173,10 +173,10 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
     private void init() {
         MyPrinter curPrinter = MyPrinter.getCurPrinter(this);
         printer_location = curPrinter.getLocation();
-        if (this.printer_location == 0) {
+        if (printer_location == 0) {
             printer_location = 1;
         }
-        switch (this.printer_location) {
+        switch (printer_location) {
             case 2:
                 printerEmailAddress = curPrinter.getEmailAddress();
                 break;
@@ -225,7 +225,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
 
     private void addWiFiSetupButton() {
         mWiFiSettingButton = mLayout.findViewById(R.id.rlWifiSettings);
-        if (this.isJapaneseLocale) {
+        if (isJapaneseLocale) {
             ((TextView) mWiFiSettingButton).setText(R.string.str_goto_wifidirect_settings);
         } else {
             ((TextView) mWiFiSettingButton).setText(R.string.str_wifidirect_settings);
@@ -267,7 +267,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         Utils.setDrawble2TextView(this, mIpButton, R.drawable.printer_selector_icon_ip);
         Utils.setDrawble2TextView(this, mRemoteButton, R.drawable.printer_selector_icon_remote);
         TextView textView = null;
-        switch (this.printer_location) {
+        switch (printer_location) {
             case 1:
                 mListView.setEmptyView((View) null);
                 mListEmptyMessageTextView.setText((CharSequence) null);
@@ -290,7 +290,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
                 mListEmptyMessageTextView.setText(R.string.printer_list_empty_message);
                 textView = mListEmptyMessageTextView;
                 mBuilder = new PrinterInfoECBuilder(getBaseContext(), mLayout);
-                mBuilder.setResource(this.printerEmailAddress);
+                mBuilder.setResource(printerEmailAddress);
                 mRemoteButton.setChecked(true);
                 mTextDetail.setText(R.string.str_detailtext_remote);
                 mSearchButton.setVisibility(View.GONE);
@@ -307,7 +307,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
                 mListEmptyMessageTextView.setText(R.string.printer_list_empty_message);
                 textView = mListEmptyMessageTextView;
                 mBuilder = new PrinterInfoIpBuilder(getBaseContext(), mLayout, 0);
-                mBuilder.setResource(this.printerKey);
+                mBuilder.setResource(printerKey);
                 mIpButton.setChecked(true);
                 mTextDetail.setText(R.string.str_detailtext_ip);
                 mSearchButton.setVisibility(View.GONE);
@@ -323,7 +323,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         mBuilder.build();
         mBuilder.refresh();
         mListView.setEmptyView(textView);
-        if (this.printer_location == 2) {
+        if (printer_location == 2) {
             mAboutRemoteButton.setVisibility(View.VISIBLE);
         } else {
             mAboutRemoteButton.setVisibility(View.GONE);
@@ -471,7 +471,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
 
     public boolean onContextItemSelected(MenuItem menuItem) {
         listItemIndex = (AdapterView.AdapterContextMenuInfo) menuItem.getMenuInfo();
-        if (this.listItemIndex == null) {
+        if (listItemIndex == null) {
             return true;
         }
         switch (menuItem.getItemId()) {
@@ -489,7 +489,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
                 break;
             case 2:
                 Message message = new Message();
-                switch (this.printer_location) {
+                switch (printer_location) {
                     case 2:
                         message.what = 7;
                         break;
@@ -522,11 +522,11 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         super.onResume();
         EPLog.i(TAG, "onResume()");
         dismissPrinterNotFoundDialog();
-        if (this.printer_location == 1) {
+        if (printer_location == 1) {
             mHandler.sendEmptyMessageDelayed(1, 300);
             EPLog.d(TAG, "Send CHECK_PRINTER Message.");
         }
-        if (this.printer_location == 1 && mBleButton.getTag() == null && BleWork.isStartBleProcess(this, false)) {
+        if (printer_location == 1 && mBleButton.getTag() == null && BleWork.isStartBleProcess(this, false)) {
             EPLog.e("blePrinterCheck");
             callBackFuncs();
             BleAsyncTask.blePrinterCheck(this, mBleFind);
@@ -660,7 +660,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
             boolean z = false;
             if (mBuilder.getData().size() <= 0) {
                 ((TextView) mLayout.findViewById(R.id.empty)).setText(R.string.str_printer_search_result_none);
-                if (this.printer_location == 1 && mActivityForegroundLifetime) {
+                if (printer_location == 1 && mActivityForegroundLifetime) {
                     if (WiFiDirectManager.getCurSSID(this) == null) {
                         z = true;
                     }

+ 22 - 22
app/src/main/java/epson/print/ActivityDocsPrintPreview.java

@@ -719,7 +719,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                 finish();
                 return;
             }
-            setPrintLogForExternalApp(this.docFileName);
+            setPrintLogForExternalApp(docFileName);
         } else {
             docFileName = intent.getStringExtra(CommonDefine.SEND_DOCUMENT_VIEW);
         }
@@ -863,7 +863,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
     }
 
     public void onBackPressed() {
-        if (this.isBackKeyOK) {
+        if (isBackKeyOK) {
             mUiHandler.sendEmptyMessage(7);
         }
     }
@@ -885,7 +885,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
         NfcTagUtils.EpsonNfcConnectInfo parseNECTag;
         super.onNewIntent(intent);
         String action = intent.getAction();
-        if (this.isEnableNFCTouch && "android.nfc.action.NDEF_DISCOVERED".equals(action) && (parseNECTag = NfcTagUtils.parseNECTag(this, intent)) != null) {
+        if (isEnableNFCTouch && "android.nfc.action.NDEF_DISCOVERED".equals(action) && (parseNECTag = NfcTagUtils.parseNECTag(this, intent)) != null) {
             cancelLoadRemotePreviewTask();
             saveCurSettings();
             Intent intent2 = new Intent();
@@ -970,7 +970,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                             if (i2 != -1) {
                                 return;
                             }
-                            if (this.isRemotePrinterOld != MyPrinter.isRemotePrinter(this)) {
+                            if (isRemotePrinterOld != MyPrinter.isRemotePrinter(this)) {
                                 Toast.makeText(this, R.string.nfc_connect_printpreview, 1).show();
                                 WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, MyPrinter.getCurPrinter(this).getIp());
                                 mUiHandler.sendEmptyMessage(10);
@@ -1005,7 +1005,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
             if (i2 != 3) {
                 return;
             }
-            if (this.isRemotePrinterOld != MyPrinter.isRemotePrinter(this)) {
+            if (isRemotePrinterOld != MyPrinter.isRemotePrinter(this)) {
                 mUiHandler.sendEmptyMessage(10);
             } else {
                 mUiHandler.sendEmptyMessage(33);
@@ -1032,7 +1032,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                 if (mPrinterName.equalsIgnoreCase(getString(R.string.str_lbl_title_scan))) {
                     showDialog(4);
                     return;
-                } else if ((this.printMode & 1) == 0 || !this.remoteEnableShowWarning) {
+                } else if ((printMode & 1) == 0 || !this.remoteEnableShowWarning) {
                     mUiHandler.sendEmptyMessage(22);
                     return;
                 } else {
@@ -1040,7 +1040,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                     return;
                 }
             case R.id.tv_page_size /*2131231601*/:
-                if (this.aPaperSourceSetting != null) {
+                if (aPaperSourceSetting != null) {
                     Intent intent = new Intent();
                     intent.setClass(this, PaperSourceSettingScr.class);
                     intent.putExtra(PaperSourceSettingScr.PRINT_SETTING_TYPE, PrintSetting.Kind.document.name());
@@ -1056,7 +1056,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
     }
 
     private void prevPage() {
-        if ((this.printMode & 4) != 0) {
+        if ((printMode & 4) != 0) {
             int i = mCurrentPageView;
             if (i > 1 && i > mStartPageView) {
                 EPImage ePImage = mRemotePreviewImageList.get(i - 2);
@@ -1076,7 +1076,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
     }
 
     private void nextPage() {
-        if ((this.printMode & 4) == 0) {
+        if ((printMode & 4) == 0) {
             int i = mCurrentPageView;
             int i2 = mEndPageView;
             if (i < i2 && i < i2) {
@@ -1259,7 +1259,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
         edit.commit();
         Intent intent = new Intent(this, SettingScr.class);
         intent.putExtra(PrintProgress.PARAM_DOCUMENT_MODE, true);
-        if ((this.printMode & 4) != 0) {
+        if ((printMode & 4) != 0) {
             intent.putExtra("SHEETS", mEndPageView);
             intent.putExtra("PRINTAREA", disablePrintArea);
         } else {
@@ -1343,8 +1343,8 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                     e.printStackTrace();
                 }
             }
-            if (this.tmpList.imageList.size() > 0) {
-                EPImage ePImage = new EPImage(this.tmpList.imageList.get(0).getLoadImageFileName(), 0);
+            if (tmpList.imageList.size() > 0) {
+                EPImage ePImage = new EPImage(tmpList.imageList.get(0).getLoadImageFileName(), 0);
                 i = ePImage.srcHeight;
                 i2 = ePImage.srcWidth;
                 EPLog.i(ActivityDocsPrintPreview.TAG, "Finish Renderer Page No.1 : srcWidth = " + i2 + " srcHeight = " + i);
@@ -1388,7 +1388,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
     }
 
     private void startPrintActivity() {
-        if ((this.printMode & 1) == 0) {
+        if ((printMode & 1) == 0) {
             PrintProgress.ProgressParams progressParams = mLocalPrintProgressParams;
             if (progressParams != null) {
                 startActivityForResult(PrintProgress.getPdfPrintIntent(this, progressParams), 255);
@@ -1601,7 +1601,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
 
     private void adjustPrintSettings() {
         try {
-            if ((this.printMode & 1) != 0) {
+            if ((printMode & 1) != 0) {
                 mEpsonService.EpsonConnectUpdatePrinterSettings(PrintSetting.Kind.document.name());
             } else {
                 mEpsonService.updatePrinterSettings(PrintSetting.Kind.document.name());
@@ -1668,7 +1668,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
         mLayoutMulti = printSetting.layoutMultiPageValue;
         mPaperSize = Info_paper.getInfoPaper(this, paperSize);
         MediaInfo.PaperSize paperSize2 = new MediaInfo.PaperSize();
-        mSizeInfo.setText(getString(paperSize2.getStringId(this.paperSize)));
+        mSizeInfo.setText(getString(paperSize2.getStringId(paperSize)));
         paperSize2.destructor();
         mPrinterName = sharedPreferences.getString(Constants.PRINTER_NAME, getString(R.string.str_lbl_title_scan));
         printerId = sharedPreferences.getString(Constants.PRINTER_ID, (String) null);
@@ -1677,7 +1677,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
     }
 
     public void setNewImageView(String str) {
-        if ((this.printMode & 2) != 0) {
+        if ((printMode & 2) != 0) {
             Bitmap bitmap = mBitmap;
             if (bitmap != null) {
                 bitmap.recycle();
@@ -1772,7 +1772,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
             Relative_para = new RelativeLayout.LayoutParams(i9, i10);
         }
         Relative_para.addRule(13);
-        mLn_zoomview.setLayoutParams(this.Relative_para);
+        mLn_zoomview.setLayoutParams(Relative_para);
         if (mLayout == 2) {
             if (mLayoutMulti == 0) {
                 if (z) {
@@ -1795,8 +1795,8 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
             }
         }
         mUiHandler.sendEmptyMessageDelayed(50, 200);
-        if ((this.printMode & 2) == 0) {
-            mDisablePreviewMsg.setLayoutParams(this.Relative_para);
+        if ((printMode & 2) == 0) {
+            mDisablePreviewMsg.setLayoutParams(Relative_para);
         }
     }
 
@@ -1821,13 +1821,13 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
     }
 
     public void updatePrevNextButtonView() {
-        if ((this.printMode & 2) != 0) {
+        if ((printMode & 2) != 0) {
             if (mCurrentPageView != mStartPageView) {
                 mPre.setVisibility(View.VISIBLE);
             } else {
                 mPre.setVisibility(4);
             }
-            if (this.disablePrintArea) {
+            if (disablePrintArea) {
                 mNext.setVisibility(View.VISIBLE);
             } else if (mCurrentPageView != mEndPageView) {
                 mNext.setVisibility(View.VISIBLE);
@@ -1889,7 +1889,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
             });
             ((TextView) inflate.findViewById(R.id.caution_tv)).setVisibility(4);
             setContentView(inflate);
-            if (this.hasCancelButton) {
+            if (hasCancelButton) {
                 ((Button) findViewById(R.id.close_btn)).setVisibility(View.VISIBLE);
             } else {
                 ((Button) findViewById(R.id.close_btn)).setVisibility(4);

+ 4 - 4
app/src/main/java/epson/print/ActivityNfcPrinter.java

@@ -478,7 +478,7 @@ public class ActivityNfcPrinter extends Activity {
         printerStatus = connectInfo.printerStatus;
         if (!this.connectInfo.hasOwnAAR(this)) {
             showErrorMessage(R.string.nfc_connect_error_aar_title, R.string.nfc_connect_error_aar);
-        } else if (!this.connectInfo.isTagWithInterface() || (this.printerStatus & 1) != 0) {
+        } else if (!this.connectInfo.isTagWithInterface() || (printerStatus & 1) != 0) {
             nChangeMode = getIntent().getIntExtra(CHANGEMODE, 0);
             if (!WiFiDirectManager.isWifiEnabled(this)) {
                 status = NfcStatus.ENABLING_WIFI;
@@ -493,7 +493,7 @@ public class ActivityNfcPrinter extends Activity {
 
     protected void onDestroy() {
         super.onDestroy();
-        if (this.progress.isShowing()) {
+        if (progress.isShowing()) {
             progress.dismiss();
         }
     }
@@ -524,11 +524,11 @@ public class ActivityNfcPrinter extends Activity {
                             setResult(0);
                             finish();
                             return;
-                        } else if (this.retrystatus == NfcSimpleApRetryStatus.FIRST_CONNECTION && strInitPass != null) {
+                        } else if (retrystatus == NfcSimpleApRetryStatus.FIRST_CONNECTION && strInitPass != null) {
                             retrystatus = NfcSimpleApRetryStatus.RETRY_CONNECTION;
                             mHandler.sendEmptyMessage(10);
                             return;
-                        } else if (!this.connectInfo.isTagWithInterface() || (this.printerStatus & 256) == 0) {
+                        } else if (!this.connectInfo.isTagWithInterface() || (printerStatus & 256) == 0) {
                             showErrorMessage(R.string.nfc_connect_error_title, R.string.nfc_connect_erorr_wifi);
                             return;
                         } else {

+ 15 - 15
app/src/main/java/epson/print/ActivityPrintWeb.java

@@ -236,7 +236,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                                             super.onPostExecute(voidR);
                                             ActivityPrintWeb.this.setOrentationView(ActivityPrintWeb.mIsPortrait);
                                             ActivityPrintWeb.mLn_zoomview.setVisibility(View.VISIBLE);
-                                            if (this.progress.isShowing()) {
+                                            if (progress.isShowing()) {
                                                 progress.dismiss();
                                             }
                                             if (ActivityPrintWeb.this.bAutoStartPrint) {
@@ -303,7 +303,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
         }
         fromActivity = intent.getIntExtra("from", 2);
         addImageView = intent.getStringArrayListExtra("print_web");
-        if (this.addImageView == null) {
+        if (addImageView == null) {
             EPLog.w(TAG, "intent.getStringArrayListExtra(\"print_web\") returns null. action " + intent.getAction());
             finish();
             return;
@@ -315,7 +315,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
         } catch (ClassCastException unused) {
         }
         for (int i = 0; i < addImageView.size(); i++) {
-            EPImage ePImage = new EPImage(this.addImageView.get(i), i);
+            EPImage ePImage = new EPImage(addImageView.get(i), i);
             ePImage.webUrl = stringExtra;
             imageList.add(ePImage);
         }
@@ -434,7 +434,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                     return;
                 case R.id.btn_web_print /*2131230882*/:
                     isRemotePrinter = MyPrinter.isRemotePrinter(this);
-                    if (this.isRemotePrinter && enableShowWarning) {
+                    if (isRemotePrinter && enableShowWarning) {
                         AlertDialog.Builder cancelable = new AlertDialog.Builder(mContext).setCancelable(false);
                         cancelable.setMessage(getString(R.string.epsonconnect_str_remote_print_warning) + "\n\n" + getString(R.string.epsonconnect_str_remote_print_warning2)).setPositiveButton(getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialogInterface, int i) {
@@ -445,7 +445,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                             }
                         }).show();
                         return;
-                    } else if (this.fileName2User.equalsIgnoreCase(getString(R.string.str_lbl_title_scan))) {
+                    } else if (fileName2User.equalsIgnoreCase(getString(R.string.str_lbl_title_scan))) {
                         new AlertDialog.Builder(mContext).setCancelable(false).setTitle(R.string.printer_not_select).setMessage(getString(R.string.printer_notselect_warning)).setPositiveButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialogInterface, int i) {
                             }
@@ -458,7 +458,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                 default:
                     return;
             }
-        } else if (this.aPaperSourceSetting != null) {
+        } else if (aPaperSourceSetting != null) {
             Intent intent = new Intent();
             intent.setClass(this, PaperSourceSettingScr.class);
             intent.putExtra(PaperSourceSettingScr.PRINT_SETTING_TYPE, PrintSetting.Kind.document.name());
@@ -614,7 +614,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                 Relative_para = new RelativeLayout.LayoutParams(i9, i10);
             }
             Relative_para.addRule(13);
-            mLn_zoomview.setLayoutParams(this.Relative_para);
+            mLn_zoomview.setLayoutParams(Relative_para);
             setNewImageView(0);
             mCurrentPage = 1;
             updateTextView();
@@ -650,12 +650,12 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
     private void setNewImageView(int i) {
         EPLog.i("Current page :", String.valueOf(i));
         try {
-            f334bm = Photo.createBitmapWithUri(this.addImageView.get(i), 1024, Videoio.CAP_PVAPI, false);
-            if (this.f334bm != null && mImageView != null) {
+            f334bm = Photo.createBitmapWithUri(addImageView.get(i), 1024, Videoio.CAP_PVAPI, false);
+            if (f334bm != null && mImageView != null) {
                 if (mColorMode == 1) {
-                    f334bm = Photo.createBitmapWithUri(this.addImageView.get(i), 1024, Videoio.CAP_PVAPI, true);
+                    f334bm = Photo.createBitmapWithUri(addImageView.get(i), 1024, Videoio.CAP_PVAPI, true);
                 }
-                mImageView.setImageBitmap(this.f334bm);
+                mImageView.setImageBitmap(f334bm);
                 System.gc();
             }
         } catch (Exception e) {
@@ -750,7 +750,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
             EPLog.v(TAG, "onActivityResult resultCode = " + i2);
             if (i2 == 0) {
                 EPLog.v(TAG, "finish print = RESULT_CANCELED");
-                if (this.isCustomAction) {
+                if (isCustomAction) {
                     setResult(0);
                     finish();
                     return;
@@ -763,7 +763,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
             }
             EPLog.v(TAG, "finish print = END_PRINT");
             mReviewInvitationViewModel.onPrintEnd(PrintProgress.isPrintSuccess(i2));
-            if (this.isCustomAction) {
+            if (isCustomAction) {
                 EPLog.v(TAG, "*****isCustomAction");
                 setResult(-1);
                 finish();
@@ -783,7 +783,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
         mLayoutMulti = printSetting.layoutMultiPageValue;
         mPaperSize = Info_paper.getInfoPaper(this, paperSize);
         MediaInfo.PaperSize paperSize2 = new MediaInfo.PaperSize();
-        mSizeInfo.setText(getString(paperSize2.getStringId(this.paperSize)));
+        mSizeInfo.setText(getString(paperSize2.getStringId(paperSize)));
         paperSize2.destructor();
         fileName2User = sharedPreferences.getString(Constants.PRINTER_NAME, getString(R.string.str_lbl_title_scan));
         printerId = sharedPreferences.getString(Constants.PRINTER_ID, (String) null);
@@ -806,7 +806,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
     public void onBackPressed() {
         super.onBackPressed();
         ExternalFileUtils.getInstance(this).initTempViewDir();
-        if (this.isCustomAction) {
+        if (isCustomAction) {
             setResult(0);
         }
     }

+ 2 - 2
app/src/main/java/epson/print/EPImageCreator.java

@@ -124,7 +124,7 @@ public class EPImageCreator implements CommonDefine {
                         String path = new File(ExternalFileUtils.getInstance(mContext).getTempViewDir(), png2jpeg).getPath();
                         String tempViewDir = ExternalFileUtils.getInstance(mContext).getTempViewDir();
                         ePImage.decodeImageFileName = new File(tempViewDir, "decode_" + (ePImage.index + 1) + ".bmp").getPath();
-                        if (this.util.jpg2bmp(path, ePImage.decodeImageFileName, 1) != 0) {
+                        if (util.jpg2bmp(path, ePImage.decodeImageFileName, 1) != 0) {
                             if (stopRequested()) {
                                 deleteCancelFile();
                                 return null;
@@ -136,7 +136,7 @@ public class EPImageCreator implements CommonDefine {
                     case 3:
                         String tempViewDir2 = ExternalFileUtils.getInstance(mContext).getTempViewDir();
                         ePImage.decodeImageFileName = new File(tempViewDir2, "decode_" + (ePImage.index + 1) + ".bmp").getPath();
-                        if (this.util.jpg2bmp(ePImage.loadImageFileName, ePImage.decodeImageFileName, i) == 0) {
+                        if (util.jpg2bmp(ePImage.loadImageFileName, ePImage.decodeImageFileName, i) == 0) {
                             int attributeInt = new ExifInterface(ePImage.loadImageFileName).getAttributeInt(android.support.media.ExifInterface.TAG_ORIENTATION, 0);
                             String str2 = ePImage.decodeImageFileName;
                             if (attributeInt == 3) {

+ 4 - 4
app/src/main/java/epson/print/EPImageList.java

@@ -96,7 +96,7 @@ public class EPImageList implements Parcelable {
 
     public EPImage remove(String str) {
         for (int i = 0; i < imageList.size(); i++) {
-            if (this.imageList.get(i).loadImageFileName.equalsIgnoreCase(str)) {
+            if (imageList.get(i).loadImageFileName.equalsIgnoreCase(str)) {
                 return imageList.remove(i);
             }
         }
@@ -124,7 +124,7 @@ public class EPImageList implements Parcelable {
     public void clearExceptSrcFileName() {
         ArrayList<EPImage> arrayList = new ArrayList<>();
         for (int i = 0; i < imageList.size(); i++) {
-            arrayList.add(new EPImage(this.imageList.get(i).loadImageFileName, arrayList.size()));
+            arrayList.add(new EPImage(imageList.get(i).loadImageFileName, arrayList.size()));
         }
         imageList = null;
         System.gc();
@@ -143,11 +143,11 @@ public class EPImageList implements Parcelable {
     }
 
     public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeTypedList(this.imageList);
+        parcel.writeTypedList(imageList);
         parcel.writeInt(getPaperWidth());
         parcel.writeInt(getPaperHeight());
         parcel.writeBooleanArray(new boolean[]{mMultiFileMode});
-        parcel.writeInt(this.apfModeInPrinting);
+        parcel.writeInt(apfModeInPrinting);
         parcel.writeInt(mSharpness);
         parcel.writeInt(mClearlyVivid);
         parcel.writeInt(mRenderingMode);

+ 1 - 1
app/src/main/java/epson/print/GalleryAdapter.java

@@ -78,7 +78,7 @@ public class GalleryAdapter extends BaseAdapter {
         if (i >= 0) {
             try {
                 if (i < imageList.size()) {
-                    Bitmap createThumbnailBitmap = createThumbnailBitmap(this.imageList.get(i), 150);
+                    Bitmap createThumbnailBitmap = createThumbnailBitmap(imageList.get(i), 150);
                     if (createThumbnailBitmap != null) {
                         imageView.setImageBitmap(createThumbnailBitmap);
                     } else {

+ 2 - 2
app/src/main/java/epson/print/IconTextArrayAdapter.java

@@ -35,9 +35,9 @@ public class IconTextArrayAdapter extends AsymmetricGridViewAdapter<IconTextArra
 
     public View getActualView(int i, View view, ViewGroup viewGroup2) {
         if (view == null) {
-            view = inflater.inflate(this.textViewResourceId, (ViewGroup) null);
+            view = inflater.inflate(textViewResourceId, (ViewGroup) null);
         }
-        switch (this.line) {
+        switch (line) {
             case 0:
                 view.setBackgroundColor(view.getContext().getResources().getColor(R.color.home_line1));
                 break;

+ 4 - 4
app/src/main/java/epson/print/ImageItem.java

@@ -78,10 +78,10 @@ public class ImageItem implements Parcelable {
     }
 
     public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeParcelable(this.bitmap, 0);
-        parcel.writeInt(this.selected);
-        parcel.writeString(this.path);
-        parcel.writeLong(this.databaseId);
+        parcel.writeParcelable(bitmap, 0);
+        parcel.writeInt(selected);
+        parcel.writeString(path);
+        parcel.writeLong(databaseId);
     }
 
     public void readFromParcel(Parcel parcel) {

+ 20 - 20
app/src/main/java/epson/print/MenudataAdapter.java

@@ -37,14 +37,14 @@ public class MenudataAdapter {
     public void parseJSONFile() {
         EPLog.i("parseJSONFile", "Start");
         json = getJSONFile();
-        apps = parseApps(this.json);
-        functions = parseFunctions(this.json);
-        defaultCapability = parseDefaultCapabilities(this.json);
-        capabilities = parseCapabilities(this.json);
+        apps = parseApps(json);
+        functions = parseFunctions(json);
+        defaultCapability = parseDefaultCapabilities(json);
+        capabilities = parseCapabilities(json);
         for (int i = 0; i < apps.size(); i++) {
             for (int i2 = 0; i2 < functions.size(); i2++) {
-                if (this.apps.get(i).appID.equalsIgnoreCase(this.functions.get(i2).appID)) {
-                    apps.get(i).appfunctions.add(this.functions.get(i2));
+                if (apps.get(i).appID.equalsIgnoreCase(functions.get(i2).appID)) {
+                    apps.get(i).appfunctions.add(functions.get(i2));
                 }
             }
         }
@@ -145,7 +145,7 @@ public class MenudataAdapter {
         EPLog.i("parseCapabilities", "Start");
         ArrayList<MenuDataCapability> arrayList = new ArrayList<>();
         try {
-            if (this.defaultCapability == null) {
+            if (defaultCapability == null) {
                 EPLog.i("parseCapabilities", "not set defaultcapability");
                 return null;
             }
@@ -156,8 +156,8 @@ public class MenudataAdapter {
                 menuDataCapability.deviceIDs = JSONArrayToString(jSONObject2.getJSONArray("DeviceIDs"));
                 menuDataCapability.isPrinter = Boolean.valueOf(jSONObject2.getBoolean("IsPrinter"));
                 menuDataCapability.isScanner = Boolean.valueOf(jSONObject2.getBoolean("IsScanner"));
-                menuDataCapability.appIDs.addAll(this.defaultCapability.appIDs);
-                menuDataCapability.functionIDs.addAll(this.defaultCapability.functionIDs);
+                menuDataCapability.appIDs.addAll(defaultCapability.appIDs);
+                menuDataCapability.functionIDs.addAll(defaultCapability.functionIDs);
                 menuDataCapability.appIDs.addAll(FilterApps(JSONArrayToString(jSONObject2.getJSONArray("AppIDs"))));
                 menuDataCapability.functionIDs.addAll(FilterFunctions(JSONArrayToString(jSONObject2.getJSONArray("FunctionIDs"))));
                 menuDataCapability.functionIDs = setExcludedlist(menuDataCapability.functionIDs, getExcludedlist(jSONObject2));
@@ -320,7 +320,7 @@ public class MenudataAdapter {
             if (i >= capabilities.size()) {
                 menuDataCapability = null;
                 break;
-            } else if (this.capabilities.get(i).deviceIDs.contains(str)) {
+            } else if (capabilities.get(i).deviceIDs.contains(str)) {
                 menuDataCapability = capabilities.get(i);
                 break;
             } else {
@@ -334,8 +334,8 @@ public class MenudataAdapter {
         EPLog.i("appsForAppIDs", CommonDefine.f335OK);
         ArrayList<MenuDataApp> arrayList2 = new ArrayList<>();
         for (int i = 0; i < apps.size(); i++) {
-            if (arrayList.contains(this.apps.get(i).appID)) {
-                arrayList2.add(this.apps.get(i));
+            if (arrayList.contains(apps.get(i).appID)) {
+                arrayList2.add(apps.get(i));
             }
         }
         return arrayList2;
@@ -345,8 +345,8 @@ public class MenudataAdapter {
         EPLog.i("functionsForFunctionIDs", CommonDefine.f335OK);
         ArrayList<MenuDataFunction> arrayList2 = new ArrayList<>();
         for (int i = 0; i < functions.size(); i++) {
-            if (arrayList.contains(this.functions.get(i).functionID)) {
-                arrayList2.add(this.functions.get(i));
+            if (arrayList.contains(functions.get(i).functionID)) {
+                arrayList2.add(functions.get(i));
             }
         }
         return arrayList2;
@@ -354,7 +354,7 @@ public class MenudataAdapter {
 
     public MenuDataFunction functionForFunctionID(String str) {
         for (int i = 0; i < functions.size(); i++) {
-            if (this.functions.get(i).functionID.equalsIgnoreCase(str)) {
+            if (functions.get(i).functionID.equalsIgnoreCase(str)) {
                 return functions.get(i);
             }
         }
@@ -384,17 +384,17 @@ public class MenudataAdapter {
         public Boolean isInstalled(Context context) {
             EPLog.i("isInstalled", CommonDefine.f335OK);
             try {
-                PackageInfo packageInfo = context.getPackageManager().getPackageInfo(this.PackageName, 128);
-                if ("Creative".equals(this.appID) && 60000 > packageInfo.versionCode) {
+                PackageInfo packageInfo = context.getPackageManager().getPackageInfo(PackageName, 128);
+                if ("Creative".equals(appID) && 60000 > packageInfo.versionCode) {
                     return false;
                 }
-                if ("3DFramePrint".equals(this.appID) && VERSIONCODE_3D > packageInfo.versionCode) {
+                if ("3DFramePrint".equals(appID) && VERSIONCODE_3D > packageInfo.versionCode) {
                     return false;
                 }
-                if ("CardPrint".equals(this.appID) && VERSIONCODE_MEISHI > packageInfo.versionCode) {
+                if ("CardPrint".equals(appID) && VERSIONCODE_MEISHI > packageInfo.versionCode) {
                     return false;
                 }
-                if (!"MultiRollPrint".equals(this.appID) || VERSIONCODE_MROOL <= packageInfo.versionCode) {
+                if (!"MultiRollPrint".equals(appID) || VERSIONCODE_MROOL <= packageInfo.versionCode) {
                     return true;
                 }
                 return false;

+ 1 - 1
app/src/main/java/epson/print/Util/bmpScaler.java

@@ -47,7 +47,7 @@ public class bmpScaler {
         float f3 = (float) height;
         Matrix matrix = new Matrix();
         matrix.postScale(f2, ((float) ((f3 / width2))) / f3);
-        scaled = Bitmap.createBitmap(this.scaled, 0, 0, width, height, matrix, true);
+        scaled = Bitmap.createBitmap(scaled, 0, 0, width, height, matrix, true);
     }
 
     private void roughScaleImage(InputStream inputStream, Size size) {

+ 22 - 22
app/src/main/java/epson/print/WebviewActivity.java

@@ -425,11 +425,11 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
             setPrintLogForExternalApp(intent);
             isCustomAction = equals2;
             inURL = intent.getStringExtra("android.intent.extra.TEXT");
-            if (Utils.checkMimeType(this.inURL, "image/jpeg")) {
+            if (Utils.checkMimeType(inURL, "image/jpeg")) {
                 checkImage = true;
                 previewImage();
             } else {
-                loadUrl(this.inURL);
+                loadUrl(inURL);
                 checkSharepage = !equals;
             }
             String str = inURL;
@@ -450,7 +450,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
                 statePre = getSharedPreferences(CommonDefine.SAVE_URL, 0);
                 strUrlIn = statePre.getString(CommonDefine.SAVE_URL, "");
                 mStrictMode.restoreStatus();
-                if (this.strUrlIn.equals("")) {
+                if (strUrlIn.equals("")) {
                     mIsFistLoad = true;
                     setTextOnUrlEditText(CommonDefine.HTTP_PREFIX);
                     setClearButtonAppearance(1);
@@ -469,7 +469,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
             if (str3 != null) {
                 loadUrl(str3);
             } else {
-                loadUrl(this.strUrlIn);
+                loadUrl(strUrlIn);
             }
             registerForContextMenu(mWebview);
         }
@@ -518,20 +518,20 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
         hideSoftKeyboard();
         String str = strUrlIn;
         if (str != null && str.compareTo("") != 0) {
-            if (this.strUrlIn.equals(mWebview.getUrl())) {
-                strUrlIn = fixUrl(this.strUrlIn);
-                setTextOnUrlEditText(this.strUrlIn);
+            if (strUrlIn.equals(mWebview.getUrl())) {
+                strUrlIn = fixUrl(strUrlIn);
+                setTextOnUrlEditText(strUrlIn);
                 mWebview.reload();
                 return;
             }
-            strUrlIn = fixUrl(this.strUrlIn);
-            setTextOnUrlEditText(this.strUrlIn);
-            loadUrl(this.strUrlIn);
+            strUrlIn = fixUrl(strUrlIn);
+            setTextOnUrlEditText(strUrlIn);
+            loadUrl(strUrlIn);
         }
     }
 
     private void hideSoftKeyboard() {
-        ((InputMethodManager) getSystemService("input_method")).hideSoftInputFromWindow(this.teInurl.getWindowToken(), 0);
+        ((InputMethodManager) getSystemService("input_method")).hideSoftInputFromWindow(teInurl.getWindowToken(), 0);
     }
 
     public void onClick(View view) {
@@ -587,7 +587,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
         menu.findItem(R.id.go_back).setEnabled(canGoBack() && mIsFinish);
         menu.findItem(R.id.go_next).setEnabled(canGoForward() && mIsFinish);
         menu.findItem(R.id.print_option).setEnabled(mIsFinish && !mIsLoadError);
-        if (this.checkSharepage) {
+        if (checkSharepage) {
             menu.setGroupVisible(0, false);
         }
         return true;
@@ -598,12 +598,12 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
         if (itemId != R.id.print_option) {
             switch (itemId) {
                 case R.id.go_back /*2131231074*/:
-                    String linkOfIndex = getLinkOfIndex(getIndexOfLink(this.strUrlIn) - 1);
+                    String linkOfIndex = getLinkOfIndex(getIndexOfLink(strUrlIn) - 1);
                     EPLog.i("Comeback to : ", linkOfIndex);
                     mWebview.loadUrl(linkOfIndex);
                     break;
                 case R.id.go_next /*2131231075*/:
-                    String linkOfIndex2 = getLinkOfIndex(getIndexOfLink(this.strUrlIn) + 1);
+                    String linkOfIndex2 = getLinkOfIndex(getIndexOfLink(strUrlIn) + 1);
                     EPLog.i("Forward to : ", linkOfIndex2);
                     mWebview.loadUrl(linkOfIndex2);
                     break;
@@ -728,7 +728,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
         intent.putExtra("print_log", getPrintLog());
         startActivityForResult(intent, 2);
         cancelShowingDialog();
-        if (this.checkSharepage && !this.isCustomAction) {
+        if (checkSharepage && !this.isCustomAction) {
             finish();
         }
     }
@@ -858,7 +858,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
         mPreviewWebInterrupted = false;
         captureStart = true;
         showLoadingDialog();
-        if (this.checkSharepage) {
+        if (checkSharepage) {
             myHandler.sendEmptyMessage(3);
         } else {
             startPreviewWebThread();
@@ -1093,9 +1093,9 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
         if (imageCreateThread != null) {
             imageCreateThread.interrupt();
         }
-        if (this.isBuy || isFaq || isInfo) {
+        if (isBuy || isFaq || isInfo) {
             finish();
-        } else if (this.isCustomAction) {
+        } else if (isCustomAction) {
             setResult(0);
             finish();
         } else {
@@ -1109,10 +1109,10 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
         super.onActivityResult(i, i2, intent);
         switch (i) {
             case 2:
-                EPLog.d("onActivityResult : ACTION_PRINT_WEB = ", String.valueOf(this.isCustomAction));
+                EPLog.d("onActivityResult : ACTION_PRINT_WEB = ", String.valueOf(isCustomAction));
                 mAddImageView.clear();
                 ExternalFileUtils.getInstance(this).initTempViewDir();
-                if (this.isCustomAction) {
+                if (isCustomAction) {
                     EPLog.d("onActivityResult : resultCode = ", String.valueOf(i2));
                     setResult(i2);
                     finish();
@@ -1153,10 +1153,10 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
     }
 
     private boolean canGoBack() {
-        return getIndexOfLink(this.strUrlIn) > 1;
+        return getIndexOfLink(strUrlIn) > 1;
     }
 
     private boolean canGoForward() {
-        return getIndexOfLink(this.strUrlIn) < mListUrl.size();
+        return getIndexOfLink(strUrlIn) < mListUrl.size();
     }
 }

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

@@ -83,16 +83,16 @@ class ActivityBase extends ActivityIACommon {
 
         private Dialog createCancelDialog() {
             AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-            builder.setMessage(ActivityBase.this.getString(R.string.str_msg_scan_cancel));
+            builder.setMessage(getString(R.string.str_msg_scan_cancel));
             builder.setCancelable(false);
-            builder.setPositiveButton(ActivityBase.this.getString(R.string.str_yes), new DialogInterface.OnClickListener() {
+            builder.setPositiveButton(getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
                     WheelDialog.this.cancelButton.setEnabled(false);
                     WheelDialog.this.cancelCallback.onCancelRequest();
                     dialogInterface.cancel();
                 }
             });
-            builder.setNegativeButton(ActivityBase.this.getString(R.string.str_no), new DialogInterface.OnClickListener() {
+            builder.setNegativeButton(getString(R.string.str_no), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
                     WheelDialog.this.cancelButton.setEnabled(true);
                     dialogInterface.cancel();
@@ -161,24 +161,24 @@ class ActivityBase extends ActivityIACommon {
         }
 
         private void showErrorDialog(int i) {
-            showErrorDialog((String) null, ActivityBase.this.getString(i));
+            showErrorDialog((String) null, getString(i));
         }
 
         private void showErrorDialog(String str, String str2, final DialogButtons dialogButtons, final IClose iClose) {
             String str3;
-            CustomTitleAlertDialogBuilder customTitleAlertDialogBuilder = new CustomTitleAlertDialogBuilder(this.context);
+            CustomTitleAlertDialogBuilder customTitleAlertDialogBuilder = new CustomTitleAlertDialogBuilder(context);
             String str4 = null;
             switch (dialogButtons) {
                 case Ok:
-                    str4 = ActivityBase.this.getString(R.string.str_ok);
+                    str4 = getString(R.string.str_ok);
                     str3 = null;
                     break;
                 case Cancel:
-                    str3 = ActivityBase.this.getString(R.string.str_cancel);
+                    str3 = getString(R.string.str_cancel);
                     break;
                 case ClearErrorCancel:
-                    str4 = ActivityBase.this.getString(R.string.str_continue);
-                    str3 = ActivityBase.this.getString(R.string.str_cancel);
+                    str4 = getString(R.string.str_continue);
+                    str3 = getString(R.string.str_cancel);
                     break;
                 default:
                     str3 = null;
@@ -226,20 +226,20 @@ class ActivityBase extends ActivityIACommon {
             String[] strArr = new String[2];
             switch (copyTaskResult) {
                 case ErrorCommunication:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_COMM_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.CopyCommErrorText);
+                    strArr[0] = getString(R.string.EPS_PRNERR_COMM_TITLE);
+                    strArr[1] = getString(R.string.CopyCommErrorText);
                     break;
                 case Busy:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNST_BUSY_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.EPS_PRNST_BUSY_MSG);
+                    strArr[0] = getString(R.string.EPS_PRNST_BUSY_TITLE);
+                    strArr[1] = getString(R.string.EPS_PRNST_BUSY_MSG);
                     break;
                 case RemoveAdfPaper:
-                    strArr[0] = ActivityBase.this.getString(R.string.CopyTaskResultRemoveAdfPaperTitle);
-                    strArr[1] = ActivityBase.this.getString(R.string.CopyTaskResultRemoveAdfPaper);
+                    strArr[0] = getString(R.string.CopyTaskResultRemoveAdfPaperTitle);
+                    strArr[1] = getString(R.string.CopyTaskResultRemoveAdfPaper);
                     break;
                 case ErrorOther:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_GENERAL_ERR);
-                    strArr[1] = ActivityBase.this.getString(R.string.CopyTaskResultErrorOtherText);
+                    strArr[0] = getString(R.string.EPS_PRNERR_GENERAL_ERR);
+                    strArr[1] = getString(R.string.CopyTaskResultErrorOtherText);
                     break;
             }
             return strArr;
@@ -249,13 +249,13 @@ class ActivityBase extends ActivityIACommon {
             String[] strArr = new String[2];
             switch (contextCreationError) {
                 case ErrorCommunication:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_COMM_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.EPS_PRNERR_COMM5);
+                    strArr[0] = getString(R.string.EPS_PRNERR_COMM_TITLE);
+                    strArr[1] = getString(R.string.EPS_PRNERR_COMM5);
                     break;
                 case ErrorNotCopySupported:
                 case Error:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_GENERAL_ERR);
-                    strArr[1] = ActivityBase.this.getString(R.string.CopyTaskResultErrorOtherText);
+                    strArr[0] = getString(R.string.EPS_PRNERR_GENERAL_ERR);
+                    strArr[1] = getString(R.string.CopyTaskResultErrorOtherText);
                     break;
             }
             return strArr;
@@ -265,13 +265,13 @@ class ActivityBase extends ActivityIACommon {
             String[] strArr = new String[2];
             switch (copyOptionChangedError) {
                 case ErrorCommunication:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_COMM_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.EPS_PRNERR_COMM5);
+                    strArr[0] = getString(R.string.EPS_PRNERR_COMM_TITLE);
+                    strArr[1] = getString(R.string.EPS_PRNERR_COMM5);
                     break;
                 case ErrorInvalidOption:
                 case Error:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_GENERAL_ERR);
-                    strArr[1] = ActivityBase.this.getString(R.string.CopyTaskResultErrorOtherText);
+                    strArr[0] = getString(R.string.EPS_PRNERR_GENERAL_ERR);
+                    strArr[1] = getString(R.string.CopyTaskResultErrorOtherText);
                     break;
             }
             return strArr;
@@ -281,40 +281,40 @@ class ActivityBase extends ActivityIACommon {
             String[] strArr = new String[2];
             switch (stopReason) {
                 case PrinterMarkerSupplyEmptyError:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_INKOUT_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.EPS_PRNERR_INKOUT_MSG);
+                    strArr[0] = getString(R.string.EPS_PRNERR_INKOUT_TITLE);
+                    strArr[1] = getString(R.string.EPS_PRNERR_INKOUT_MSG);
                     break;
                 case PrinterMarkerWasteFullError:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_WEB_REMOTE_MAINTENANCE_BOX_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.EPS_PRNERR_WEB_REMOTE_MAINTENANCE_BOX_MSG);
+                    strArr[0] = getString(R.string.EPS_PRNERR_WEB_REMOTE_MAINTENANCE_BOX_TITLE);
+                    strArr[1] = getString(R.string.EPS_PRNERR_WEB_REMOTE_MAINTENANCE_BOX_MSG);
                     break;
                 case PrinterMediaJamError:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_PAPERJAM_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.CopyPaperJamErrorText);
+                    strArr[0] = getString(R.string.EPS_PRNERR_PAPERJAM_TITLE);
+                    strArr[1] = getString(R.string.CopyPaperJamErrorText);
                     break;
                 case PrinterMediaEmptyError:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_PAPEROUT_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.EPS_PRNERR_PAPEROUT_MSG);
+                    strArr[0] = getString(R.string.EPS_PRNERR_PAPEROUT_TITLE);
+                    strArr[1] = getString(R.string.EPS_PRNERR_PAPEROUT_MSG);
                     break;
                 case ManualfeedGuide:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_MANUALFEED_SET_PAPER_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.EPS_PRNERR_MANUALFEED_SET_PAPER_MSG);
+                    strArr[0] = getString(R.string.EPS_PRNERR_MANUALFEED_SET_PAPER_TITLE);
+                    strArr[1] = getString(R.string.EPS_PRNERR_MANUALFEED_SET_PAPER_MSG);
                     break;
                 case PrinterCoverOpenError:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_COVEROPEN_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.EPS_PRNERR_COVEROPEN_MSG);
+                    strArr[0] = getString(R.string.EPS_PRNERR_COVEROPEN_TITLE);
+                    strArr[1] = getString(R.string.EPS_PRNERR_COVEROPEN_MSG);
                     break;
                 case PrinterOutputAreaFullError:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_CDRGUIDEOPEN_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.CopyCDdiscErrorText);
+                    strArr[0] = getString(R.string.EPS_PRNERR_CDRGUIDEOPEN_TITLE);
+                    strArr[1] = getString(R.string.CopyCDdiscErrorText);
                     break;
                 case PrinterOtherError:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_GENERAL_ERR);
-                    strArr[1] = ActivityBase.this.getString(R.string.CopyTaskResultErrorOtherText);
+                    strArr[0] = getString(R.string.EPS_PRNERR_GENERAL_ERR);
+                    strArr[1] = getString(R.string.CopyTaskResultErrorOtherText);
                     break;
                 case ScannerOtherError:
-                    strArr[0] = ActivityBase.this.getString(R.string.str_err_msg_scan_generic_internal_title);
-                    strArr[1] = ActivityBase.this.getString(R.string.str_err_msg_scan_generic_internal);
+                    strArr[0] = getString(R.string.str_err_msg_scan_generic_internal_title);
+                    strArr[1] = getString(R.string.str_err_msg_scan_generic_internal);
                     break;
             }
             return strArr;
@@ -357,7 +357,7 @@ class ActivityBase extends ActivityIACommon {
         }
 
         private String getChoiceString(ECopyOptionItem.ECopyOptionItemChoice eCopyOptionItemChoice) {
-            return ActivityBase.this.string(eCopyOptionItemChoice.name());
+            return string(eCopyOptionItemChoice.name());
         }
     }
 
@@ -378,7 +378,7 @@ class ActivityBase extends ActivityIACommon {
         private String[] getKeyArray() {
             String[] strArr = new String[this.choices.size()];
             for (int i = 0; i < choices.size(); i++) {
-                strArr[i] = ActivityBase.this.string(this.choices.get(i).name());
+                strArr[i] = string(choices.get(i).name());
             }
             return strArr;
         }
@@ -396,11 +396,11 @@ class ActivityBase extends ActivityIACommon {
 
         private void updateWithAddition(int i) {
             try {
-                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) {
-                    changedListener.onOptionItemChanged(this.optionItem);
+                value = Integer.valueOf(editText.getText().toString()).intValue();
+                value = Math.min(Math.max(optionItem.getMinimumValue(), value + i), optionItem.getMaximumValue());
+                optionItem.selectValue(value);
+                if (changedListener != null) {
+                    changedListener.onOptionItemChanged(optionItem);
                 }
             } catch (NumberFormatException unused) {
             }
@@ -414,7 +414,7 @@ class ActivityBase extends ActivityIACommon {
             }
 
             public void onClick(View view) {
-                NumberOptionValue.this.updateWithAddition(this.amount);
+                NumberOptionValue.this.updateWithAddition(amount);
             }
         }
 
@@ -425,16 +425,16 @@ class ActivityBase extends ActivityIACommon {
 
         private void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
             optionItem = eCopyOptionItem;
-            editText = (TextView) ActivityBase.this.findViewById(i);
+            editText = (TextView) findViewById(i);
             value = eCopyOptionItem.getSelectedValue();
-            editText.setText(String.valueOf(this.value));
+            editText.setText(String.valueOf(value));
             editText.setEnabled(eCopyOptionItem.isEnabled());
         }
 
         private void bindCountUp(int i) {
-            countUp = (Button) ActivityBase.this.findViewById(i);
+            countUp = (Button) findViewById(i);
             countUp.setOnClickListener(new Counter(1));
-            if (this.value == optionItem.getMaximumValue()) {
+            if (value == optionItem.getMaximumValue()) {
                 countUp.setEnabled(false);
             } else {
                 countUp.setEnabled(true);
@@ -442,9 +442,9 @@ class ActivityBase extends ActivityIACommon {
         }
 
         private void bindCountDown(int i) {
-            countDown = (Button) ActivityBase.this.findViewById(i);
+            countDown = (Button) findViewById(i);
             countDown.setOnClickListener(new Counter(-1));
-            if (this.value == optionItem.getMinimumValue()) {
+            if (value == optionItem.getMinimumValue()) {
                 countDown.setEnabled(false);
             } else {
                 countDown.setEnabled(true);
@@ -471,19 +471,19 @@ class ActivityBase extends ActivityIACommon {
         }
 
         private String loadPrePrinter() {
-            presettings = ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
+            presettings = getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
             return presettings.getString(Constants.PRINTER_ID, (String) null);
         }
 
         private void savePrePrinter() {
-            presettings = ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
+            presettings = getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
             editer = presettings.edit();
             editer.putString(Constants.PRINTER_ID, ActivityBase.printerId);
             editer.commit();
         }
 
         private void setCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
-            ECopyOptionContext bindedCopyOptionContext = ActivityBase.this.copyComponent.getBindedCopyOptionContext();
+            ECopyOptionContext bindedCopyOptionContext = copyComponent.getBindedCopyOptionContext();
             Iterator<ECopyOptionItem> it = arrayList.iterator();
             while (it.hasNext()) {
                 ECopyOptionItem next = it.next();
@@ -495,19 +495,19 @@ class ActivityBase extends ActivityIACommon {
             }
             Iterator<ECopyOptionItem> it2 = arrayList.iterator();
             while (it2.hasNext()) {
-                ActivityBase.this.copyComponent.setCopyOptionItem(it2.next());
+                copyComponent.setCopyOptionItem(it2.next());
             }
         }
 
         private void setOption(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey, ECopyOptionItem eCopyOptionItem) {
-            presettings = ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
+            presettings = getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
             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(presettings.getString(eCopyOptionItemKey.name(), eCopyOptionItem.getDefaultChoice().getParam().toString()))));
                 return;
             }
-            eCopyOptionItem.selectValue(this.presettings.getInt(eCopyOptionItemKey.name(), eCopyOptionItem.getDefaultValue()));
+            eCopyOptionItem.selectValue(presettings.getInt(eCopyOptionItemKey.name(), eCopyOptionItem.getDefaultValue()));
             if (eCopyOptionItemKey.equals(ECopyOptionItem.ECopyOptionItemKey.CopyMagnification)) {
-                ActivityBase.this.optionValueMap.put(eCopyOptionItemKey, new CopyMagnificationValue(eCopyOptionItem));
+                optionValueMap.put(eCopyOptionItemKey, new CopyMagnificationValue(eCopyOptionItem));
             }
         }
 
@@ -524,16 +524,16 @@ class ActivityBase extends ActivityIACommon {
         }
 
         private void saveOption(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey, ECopyOptionItem eCopyOptionItem) {
-            presettings = ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
+            presettings = getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
             if (eCopyOptionItem.getChoiceType() == ECopyOptionItem.ECopyOptionItemChoiceType.ChoiceArray) {
-                String access$000 = ActivityBase.this.TAG;
+                String access$000 = TAG;
                 EPLog.i(access$000, "cursetting:" + eCopyOptionItem.getSelectedChoice().name());
                 editer = presettings.edit();
                 editer.putString(eCopyOptionItemKey.name(), eCopyOptionItem.getSelectedChoice().getParam().toString());
                 editer.commit();
                 return;
             }
-            String access$0002 = ActivityBase.this.TAG;
+            String access$0002 = TAG;
             EPLog.i(access$0002, "cursetting:" + String.valueOf(eCopyOptionItem.getSelectedValue()));
             editer = presettings.edit();
             editer.putInt(eCopyOptionItemKey.name(), eCopyOptionItem.getSelectedValue());

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

@@ -57,7 +57,7 @@ class CopyPhotoSettingHandler extends DefaultHandler {
 
     public boolean parse() {
         try {
-            SAXParserFactory.newInstance().newSAXParser().parse(new File(this.path), this);
+            SAXParserFactory.newInstance().newSAXParser().parse(new File(path), this);
         } catch (Exception e) {
             scanCopies.clear();
             e.printStackTrace();

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

@@ -261,7 +261,7 @@ public final class ECopyComponent {
     }
 
     public ECopyOptionContext getBindedCopyOptionContext() {
-        if (this.optionContext.isNull()) {
+        if (optionContext.isNull()) {
             return null;
         }
         return optionContext;
@@ -269,7 +269,7 @@ public final class ECopyComponent {
 
     public ECopyPreview getComposedCopyPreview(Context context, int i, int i2, ECopyPreview.ECopyPreviewInvalidateListener eCopyPreviewInvalidateListener) {
         ECopyPreview createPreview = ECopyPreview.createPreview(context, i, i2, eCopyPreviewInvalidateListener);
-        createPreview.compose(new ECopyOptionContext(this.optionContext), new ECopyPreview.ICopyPreviewCommitEditedOptionContext() {
+        createPreview.compose(new ECopyOptionContext(optionContext), new ECopyPreview.ICopyPreviewCommitEditedOptionContext() {
             public void commit(ECopyOptionContext eCopyOptionContext) {
                 eCopyOptionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XScale).selectChoice(RemoteCopySetOptionTask.getScaleChoice(eCopyOptionContext.copyType, eCopyOptionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.CopyMagnification).getSelectedValue()));
                 ECopyComponent.this.optionContext = eCopyOptionContext;
@@ -299,7 +299,7 @@ public final class ECopyComponent {
 
     public void setCopyOptionItem(ECopyOptionItem eCopyOptionItem) {
         ITask iTask;
-        if (this.optionContext.getCopyType() == ECopyType.Photo) {
+        if (optionContext.getCopyType() == ECopyType.Photo) {
             iTask = new RemoteCopyPhotoSetOptionTask(eCopyOptionItem, optionChangedListener);
         } else {
             iTask = new RemoteCopySetOptionTask(eCopyOptionItem, optionChangedListener);
@@ -332,10 +332,10 @@ public final class ECopyComponent {
     }
 
     protected ICopyCancelRequest execute(ITask iTask) {
-        iTask.setSystemSettings(this.systemSettings);
+        iTask.setSystemSettings(systemSettings);
         iTask.setRequestConnectionTimeout(((Integer) properties.get(Property.RequestConnectionTimeout)).intValue());
-        iTask.setClientID(this.clientID);
-        iTask.setOptionContext(this.optionContext);
+        iTask.setClientID(clientID);
+        iTask.setOptionContext(optionContext);
         return iTask.start();
     }
 }

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

@@ -30,13 +30,13 @@ public class ECopyOptionContext implements Parcelable {
     }
 
     public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeString(this.copyType.name());
-        parcel.writeInt(this.optionItems.size());
+        parcel.writeString(copyType.name());
+        parcel.writeInt(optionItems.size());
         Iterator<ECopyOptionItem> it = optionItems.iterator();
         while (it.hasNext()) {
             parcel.writeParcelable(it.next(), 0);
         }
-        parcel.writeString(this.copyOptionsResult.toString());
+        parcel.writeString(copyOptionsResult.toString());
     }
 
     ECopyOptionContext(Parcel parcel) {

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

@@ -62,11 +62,11 @@ public class ECopyOptionItem implements Parcelable {
                 return false;
             }
             ChoiceArray choiceArray = (ChoiceArray) obj;
-            if (this.selectedChoice != choiceArray.selectedChoice || defaultChoice != choiceArray.defaultChoice || choices.size() != choiceArray.choices.size()) {
+            if (selectedChoice != choiceArray.selectedChoice || defaultChoice != choiceArray.defaultChoice || choices.size() != choiceArray.choices.size()) {
                 return false;
             }
             for (int i = 0; i < choices.size(); i++) {
-                if (this.choices.get(i) != choiceArray.choices.get(i)) {
+                if (choices.get(i) != choiceArray.choices.get(i)) {
                     return false;
                 }
             }
@@ -100,7 +100,7 @@ public class ECopyOptionItem implements Parcelable {
                 return false;
             }
             NumberRange numberRange = (NumberRange) obj;
-            if (this.min == numberRange.min && max == numberRange.max && selectedValue == numberRange.selectedValue && defaultValue == numberRange.defaultValue && exceptionValue == numberRange.exceptionValue) {
+            if (min == numberRange.min && max == numberRange.max && selectedValue == numberRange.selectedValue && defaultValue == numberRange.defaultValue && exceptionValue == numberRange.exceptionValue) {
                 return true;
             }
             return false;
@@ -108,25 +108,25 @@ public class ECopyOptionItem implements Parcelable {
     }
 
     public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeString(this.key.name());
-        parcel.writeString(this.choiceType.name());
-        parcel.writeInt(this.enabled ? 1 : 0);
-        parcel.writeInt(this.isLocalOption ? 1 : 0);
-        if (this.choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
-            parcel.writeInt(this.choiceArray.choices.size());
+        parcel.writeString(key.name());
+        parcel.writeString(choiceType.name());
+        parcel.writeInt(enabled ? 1 : 0);
+        parcel.writeInt(isLocalOption ? 1 : 0);
+        if (choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
+            parcel.writeInt(choiceArray.choices.size());
             Iterator<ECopyOptionItemChoice> it = choiceArray.choices.iterator();
             while (it.hasNext()) {
                 parcel.writeString(it.next().param.name());
             }
-            parcel.writeInt(this.choiceArray.selectedChoice);
-            parcel.writeInt(this.choiceArray.defaultChoice);
+            parcel.writeInt(choiceArray.selectedChoice);
+            parcel.writeInt(choiceArray.defaultChoice);
             return;
         }
-        parcel.writeInt(this.numberRange.min);
-        parcel.writeInt(this.numberRange.max);
-        parcel.writeInt(this.numberRange.selectedValue);
-        parcel.writeInt(this.numberRange.defaultValue);
-        parcel.writeInt(this.numberRange.exceptionValue);
+        parcel.writeInt(numberRange.min);
+        parcel.writeInt(numberRange.max);
+        parcel.writeInt(numberRange.selectedValue);
+        parcel.writeInt(numberRange.defaultValue);
+        parcel.writeInt(numberRange.exceptionValue);
     }
 
     ECopyOptionItem(Parcel parcel) {
@@ -135,11 +135,11 @@ public class ECopyOptionItem implements Parcelable {
         boolean z = true;
         enabled = parcel.readInt() == 1;
         isLocalOption = parcel.readInt() != 1 ? false : z;
-        if (this.choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
+        if (choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
             choiceArray = new ChoiceArray();
             int readInt = parcel.readInt();
             for (int i = 0; i < readInt; i++) {
-                choiceArray.choices.add(ECopyOptionItemChoice.valueOf(this.key, ERemoteOperation.ERemoteParam.valueOf(parcel.readString())));
+                choiceArray.choices.add(ECopyOptionItemChoice.valueOf(key, ERemoteOperation.ERemoteParam.valueOf(parcel.readString())));
             }
             choiceArray.selectedChoice = parcel.readInt();
             choiceArray.defaultChoice = parcel.readInt();
@@ -174,7 +174,7 @@ public class ECopyOptionItem implements Parcelable {
         Iterator<ERemoteOperation.ERemoteParam> it = arrayList.iterator();
         while (it.hasNext()) {
             ERemoteOperation.ERemoteParam next = it.next();
-            choiceArray.choices.add(ECopyOptionItemChoice.valueOf(this.key, next));
+            choiceArray.choices.add(ECopyOptionItemChoice.valueOf(key, next));
             if (next == eRemoteParam) {
                 ChoiceArray choiceArray2 = choiceArray;
                 choiceArray2.defaultChoice = choiceArray2.choices.size() - 1;
@@ -194,7 +194,7 @@ public class ECopyOptionItem implements Parcelable {
         choiceType = eCopyOptionItem.choiceType;
         enabled = eCopyOptionItem.enabled;
         isLocalOption = eCopyOptionItem.isLocalOption;
-        if (this.choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
+        if (choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
             choiceArray = new ChoiceArray(eCopyOptionItem.choiceArray);
         } else {
             numberRange = new NumberRange(eCopyOptionItem.numberRange);
@@ -210,7 +210,7 @@ public class ECopyOptionItem implements Parcelable {
             return false;
         }
         ECopyOptionItem eCopyOptionItem = (ECopyOptionItem) obj;
-        if (this.key != eCopyOptionItem.key || (eCopyOptionItemChoiceType = choiceType) != eCopyOptionItem.choiceType || isLocalOption != eCopyOptionItem.isLocalOption) {
+        if (key != eCopyOptionItem.key || (eCopyOptionItemChoiceType = choiceType) != eCopyOptionItem.choiceType || isLocalOption != eCopyOptionItem.isLocalOption) {
             return false;
         }
         if (eCopyOptionItemChoiceType == ECopyOptionItemChoiceType.ChoiceArray) {
@@ -1446,7 +1446,7 @@ public class ECopyOptionItem implements Parcelable {
     public void selectValue(int i) {
         NumberRange numberRange2 = numberRange;
         if (i != numberRange2.exceptionValue) {
-            i = Math.min(Math.max(this.numberRange.min, i), numberRange.max);
+            i = Math.min(Math.max(numberRange.min, i), numberRange.max);
         }
         numberRange2.selectedValue = i;
     }
@@ -1461,7 +1461,7 @@ public class ECopyOptionItem implements Parcelable {
 
     public ECopyOptionItemChoice getDefaultChoice() {
         try {
-            return choiceArray.choices.get(this.choiceArray.defaultChoice);
+            return choiceArray.choices.get(choiceArray.defaultChoice);
         } catch (IndexOutOfBoundsException unused) {
             return null;
         }
@@ -1469,7 +1469,7 @@ public class ECopyOptionItem implements Parcelable {
 
     public ECopyOptionItemChoice getSelectedChoice() {
         try {
-            return choiceArray.choices.get(this.choiceArray.selectedChoice);
+            return choiceArray.choices.get(choiceArray.selectedChoice);
         } catch (IndexOutOfBoundsException unused) {
             return null;
         }

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

@@ -186,7 +186,7 @@ public class ECopyPreview extends View {
 
     public void dismiss(boolean z) {
         if (z) {
-            optionCommitter.commit(this.optionContext);
+            optionCommitter.commit(optionContext);
         }
     }
 
@@ -200,8 +200,8 @@ public class ECopyPreview extends View {
     }
 
     private void resize() {
-        int i = (this.drawSize.width - paperPadding.left) - paperPadding.right;
-        int i2 = (this.drawSize.height - paperPadding.top) - paperPadding.bottom;
+        int i = (drawSize.width - paperPadding.left) - paperPadding.right;
+        int i2 = (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) {
             layout = new Layout2Up(i, i2);
@@ -245,19 +245,19 @@ public class ECopyPreview extends View {
         backgroundDrawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
         backgroundDrawable.draw(canvas);
         Point offset = layout.getOffset();
-        offset.offset(this.paperPadding.left, paperPadding.top);
+        offset.offset(paperPadding.left, paperPadding.top);
         RectF paperRect = layout.getPaperRect();
         paperRect.offset((float) offset.x, (float) offset.y);
-        if (this.optionContext.copyType == ECopyComponent.ECopyType.Mirror) {
+        if (optionContext.copyType == ECopyComponent.ECopyType.Mirror) {
             canvas.scale(-1.0f, 1.0f);
             canvas.translate(-(paperRect.centerX() * 2.0f), 0.0f);
         }
         canvas.drawRect(paperRect, paperShadowPaint);
         Paint paint = null;
-        if (this.colorOption.getSelectedChoice() == ECopyOptionItem.ECopyOptionItemChoice.ColorEffectsType_MonochromeGrayscale) {
+        if (colorOption.getSelectedChoice() == ECopyOptionItem.ECopyOptionItemChoice.ColorEffectsType_MonochromeGrayscale) {
             paint = grayscalePaint;
         }
-        canvas.drawBitmap(this.layout.getBitmap(), (float) offset.x, (float) offset.y, paint);
+        canvas.drawBitmap(layout.getBitmap(), (float) offset.x, (float) offset.y, paint);
         RectF copyFrame = layout.getCopyFrame();
         if (!this.paperFrame.isEmpty() && copyFrame != null) {
             copyFrame.offset((float) offset.x, (float) offset.y);
@@ -405,18 +405,18 @@ public class ECopyPreview extends View {
             canvas = new Canvas(bitmap);
             canvas.save();
             ECopyPreview.this.paperDrawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
-            ECopyPreview.this.paperDrawable.draw(this.canvas);
+            ECopyPreview.this.paperDrawable.draw(canvas);
             Bitmap bitmap2 = scanImage;
             if (bitmap2 != null) {
                 if (showPaper) {
                     float f = copyScale / limitCopyScaleDown;
-                    if (this.autofitEnabled) {
-                        f = 1.0f / getAspectFitScale(this.scanFrame.width(), scanFrame.height(), (float) canvas.getWidth(), (float) canvas.getHeight(), Layout.AspectFit.Max);
+                    if (autofitEnabled) {
+                        f = 1.0f / getAspectFitScale(scanFrame.width(), scanFrame.height(), (float) canvas.getWidth(), (float) canvas.getHeight(), Layout.AspectFit.Max);
                     }
                     Matrix matrix = new Matrix();
                     matrix.postScale(f, f);
-                    canvas.clipPath(this.paperBorderClipPath);
-                    canvas.drawBitmap(this.scanImage, matrix, (Paint) null);
+                    canvas.clipPath(paperBorderClipPath);
+                    canvas.drawBitmap(scanImage, matrix, (Paint) null);
                 } else {
                     canvas.drawBitmap(bitmap2, 0.0f, 0.0f, (Paint) null);
                 }
@@ -435,18 +435,18 @@ public class ECopyPreview extends View {
         }
 
         private Point getOffset() {
-            return new Point(this.offset);
+            return new Point(offset);
         }
 
         private void setPaperFrame(RectF rectF) {
             scanFrame = new RectF(rectF);
-            scaleRect(this.imageScale, scanFrame);
+            scaleRect(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);
+            scaleRect(imageScale, copyFrame);
             calcLimitCopyScaleDown();
             invalidatePaperSize();
         }
@@ -457,7 +457,7 @@ public class ECopyPreview extends View {
                 return null;
             }
             RectF rectF2 = new RectF(rectF);
-            float max = 1.0f / Math.max(this.copyScale, limitCopyScaleDown);
+            float max = 1.0f / Math.max(copyScale, limitCopyScaleDown);
             rectF2.right *= max;
             rectF2.bottom *= max;
             return rectF2;
@@ -470,7 +470,7 @@ public class ECopyPreview extends View {
 
         private boolean showPaper() {
             boolean z = copyScale < limitCopyScaleDown;
-            if (this.autofitEnabled) {
+            if (autofitEnabled) {
                 return true;
             }
             return z;
@@ -486,7 +486,7 @@ public class ECopyPreview extends View {
         }
 
         private void calcLimitCopyScaleDown() {
-            limitCopyScaleDown = getAspectFitScale(this.copyFrame.right, copyFrame.bottom, paper.width(), paper.height(), Layout.AspectFit.Max);
+            limitCopyScaleDown = getAspectFitScale(copyFrame.right, copyFrame.bottom, paper.width(), paper.height(), Layout.AspectFit.Max);
         }
 
         private RectF getPaperRect() {
@@ -505,20 +505,20 @@ public class ECopyPreview extends View {
             canvas = new Canvas(bitmap);
             canvas.save();
             ECopyPreview.this.paperDrawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
-            ECopyPreview.this.paperDrawable.draw(this.canvas);
-            if (this.scanImage != null) {
+            ECopyPreview.this.paperDrawable.draw(canvas);
+            if (scanImage != null) {
                 if (showPaper) {
                     float f = copyScale / limitCopyScaleDown;
-                    if (this.autofitEnabled) {
-                        f = 1.0f / getAspectFitScale(this.scanFrame.width(), scanFrame.height(), (float) canvas.getWidth(), (float) canvas.getHeight(), Layout.AspectFit.Max);
+                    if (autofitEnabled) {
+                        f = 1.0f / getAspectFitScale(scanFrame.width(), scanFrame.height(), (float) canvas.getWidth(), (float) canvas.getHeight(), Layout.AspectFit.Max);
                     }
                     Matrix matrix = new Matrix();
                     matrix.postScale(f, f);
                     matrix.postTranslate(((float) bitmap.getWidth()) - (((float) scanImage.getWidth()) * f), 0.0f);
-                    canvas.clipPath(this.paperBorderClipPath);
-                    canvas.drawBitmap(this.scanImage, matrix, (Paint) null);
+                    canvas.clipPath(paperBorderClipPath);
+                    canvas.drawBitmap(scanImage, matrix, (Paint) null);
                 } else {
-                    canvas.drawBitmap(this.scanImage, 0.0f, 0.0f, (Paint) null);
+                    canvas.drawBitmap(scanImage, 0.0f, 0.0f, (Paint) null);
                 }
             }
             canvas.restore();
@@ -562,19 +562,19 @@ public class ECopyPreview extends View {
             canvas = new Canvas(bitmap);
             canvas.save();
             ECopyPreview.this.paperDrawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
-            ECopyPreview.this.paperDrawable.draw(this.canvas);
-            if (this.scanImage != null) {
+            ECopyPreview.this.paperDrawable.draw(canvas);
+            if (scanImage != null) {
                 if (showPaper) {
                     float f = copyScale;
-                    if (this.autofitEnabled) {
-                        f = 1.0f / getAspectFitScale(this.scanFrame.width(), scanFrame.height(), (float) ((this.paperImage.getWidth() + f368LO) + f369RO), (float) ((this.paperImage.getHeight() + f370TO) + f367BO), Layout.AspectFit.Min);
+                    if (autofitEnabled) {
+                        f = 1.0f / getAspectFitScale(scanFrame.width(), scanFrame.height(), (float) ((paperImage.getWidth() + f368LO) + f369RO), (float) ((paperImage.getHeight() + f370TO) + f367BO), Layout.AspectFit.Min);
                     }
                     Matrix matrix = new Matrix();
                     matrix.postTranslate((float) (-this.f368LO), (float) (-this.f370TO));
                     matrix.postScale(f, f);
-                    canvas.drawBitmap(this.scanImage, matrix, (Paint) null);
+                    canvas.drawBitmap(scanImage, matrix, (Paint) null);
                 } else {
-                    canvas.drawBitmap(this.scanImage, (float) (-this.f368LO), (float) (-this.f370TO), (Paint) null);
+                    canvas.drawBitmap(scanImage, (float) (-this.f368LO), (float) (-this.f370TO), (Paint) null);
                 }
             }
             canvas.restore();
@@ -583,9 +583,9 @@ public class ECopyPreview extends View {
 
         private void setPaperFrame(RectF rectF) {
             scanFrame = new RectF(rectF);
-            scaleRect(this.imageScale, scanFrame);
+            scaleRect(imageScale, scanFrame);
             copyFrame = new RectF(rectF);
-            scaleRect(this.imageScale, copyFrame);
+            scaleRect(imageScale, copyFrame);
             calcLimitCopyScaleDown();
             invalidatePaperSize();
             f368LO = (int) (((float) f368LO) * imageScale);
@@ -616,7 +616,7 @@ public class ECopyPreview extends View {
             Size size2 = ECopyPreview.this.A4_2UpPage;
             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);
+            page2 = new RectF(page1.right + 35.0f, page1.top, page1.right + 35.0f + ((float) size2.width), page1.bottom);
             float f = (float) i;
             float f2 = (float) i2;
             float aspectFitScale = getAspectFitScale(f, f2, (float) size.width, (float) size.height, Layout.AspectFit.Min);
@@ -644,24 +644,24 @@ public class ECopyPreview extends View {
         }
 
         private float getScanImageScale(int i, int i2) {
-            imageScale = getAspectFitScale(this.page1.width(), page1.height(), (float) i, (float) i2, Layout.AspectFit.Min);
+            imageScale = getAspectFitScale(page1.width(), page1.height(), (float) i, (float) i2, Layout.AspectFit.Min);
             return imageScale;
         }
 
         private void setScanImage(Bitmap bitmap) {
             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(page1Bitmap);
             canvas.drawBitmap(bitmap, rect, new RectF(0.0f, 0.0f, (float) canvas.getWidth(), (float) canvas.getHeight()), (Paint) null);
         }
 
         private Point getOffset() {
-            return new Point(this.offset);
+            return new Point(offset);
         }
 
         private void setPaperFrame(RectF rectF) {
             copyFrame = new RectF(rectF);
-            scaleRect(this.imageScale, copyFrame);
+            scaleRect(imageScale, copyFrame);
         }
 
         private RectF getPaperRect() {

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

@@ -57,7 +57,7 @@ class PreviewScanTask extends AsyncTask<Void, Void, Void> implements IScanContro
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
         int i;
         optionContext = eCopyOptionContext;
-        if (this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XScale).getSelectedChoice() != ECopyOptionItem.ECopyOptionItemChoice.XScale_Autofit) {
+        if (optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XScale).getSelectedChoice() != ECopyOptionItem.ECopyOptionItemChoice.XScale_Autofit) {
             ECopyOptionItem copyOptionItemOf = optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize);
             switch (copyOptionItemOf.getSelectedChoice()) {
                 case PrintMediaSize_A4:
@@ -184,7 +184,7 @@ class PreviewScanTask extends AsyncTask<Void, Void, Void> implements IScanContro
     public void setCopyFrameSize(int i, int i2, int i3, int i4) {
         RectF rectF = new RectF((float) i, (float) i2, (float) i3, (float) i4);
         synchronized (this) {
-            if (this.cancelRequested) {
+            if (cancelRequested) {
                 rectF = new RectF();
             }
         }

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

@@ -65,8 +65,8 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
         Result result = new Result();
         result.copyType = copyType;
         ERemoteDevice eRemoteDevice = new ERemoteDevice();
-        eRemoteDevice.setHostIP(this.operation.getHostIP());
-        eRemoteDevice.setRequestConnectionTimeout(this.operation.getRequestConnectionTimeout());
+        eRemoteDevice.setHostIP(operation.getHostIP());
+        eRemoteDevice.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
         ERemoteDevice.ERemoteDeviceFunctionsResult functions = eRemoteDevice.getFunctions(new ERemoteOperation.IRemoteOperationParameter() {
             public String client_id() {
                 return RemoteCopyGetOptionTask.this.clientID;
@@ -92,8 +92,8 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
             return result;
         }
         ERemotePrinter eRemotePrinter = new ERemotePrinter();
-        eRemotePrinter.setHostIP(this.operation.getHostIP());
-        eRemotePrinter.setRequestConnectionTimeout(this.operation.getRequestConnectionTimeout());
+        eRemotePrinter.setHostIP(operation.getHostIP());
+        eRemotePrinter.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
         ERemotePrinter.ERemotePrinterComponentsResult components = eRemotePrinter.getComponents(new ERemoteOperation.IRemoteOperationParameter() {
             public String client_id() {
                 return RemoteCopyGetOptionTask.this.clientID;
@@ -103,8 +103,8 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
             return getErrorResult(components);
         }
         ERemoteScanner eRemoteScanner = new ERemoteScanner();
-        eRemoteScanner.setHostIP(this.operation.getHostIP());
-        eRemoteScanner.setRequestConnectionTimeout(this.operation.getRequestConnectionTimeout());
+        eRemoteScanner.setHostIP(operation.getHostIP());
+        eRemoteScanner.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
         ERemoteScanner.ERemoteScannerComponentsResult components2 = eRemoteScanner.getComponents(new ERemoteOperation.IRemoteOperationParameter() {
             public String client_id() {
                 return RemoteCopyGetOptionTask.this.clientID;
@@ -117,7 +117,7 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
     }
 
     protected Result doInBackground(Void... voidArr) {
-        operation.setHostIP(this.systemSettings.getPrinterIPAddress());
+        operation.setHostIP(systemSettings.getPrinterIPAddress());
         Result checkDeviceError = checkDeviceError();
         if (checkDeviceError != null) {
             return checkDeviceError;

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

@@ -51,7 +51,7 @@ class RemoteCopyPhotoGetOptionTask extends AsyncTask<Void, Void, Result> impleme
     }
 
     protected Result doInBackground(Void... voidArr) {
-        operation.setHostIP(this.systemSettings.getPrinterIPAddress());
+        operation.setHostIP(systemSettings.getPrinterIPAddress());
         Result result = new Result();
         result.copyType = copyType;
         final ERemoteCopyPhoto.ERemoteCopyPhotoOptionResult selectableOptions = operation.getSelectableOptions();
@@ -116,7 +116,7 @@ class RemoteCopyPhotoGetOptionTask extends AsyncTask<Void, Void, Result> impleme
             }
         });
         if (options.success()) {
-            result.optionContext = new ECopyOptionContext(this.copyType);
+            result.optionContext = new ECopyOptionContext(copyType);
             result.optionContext.setCopyOptionsResult(options);
             result.optionContext.add(ECopyOptionItem.createOptionItem(ERemoteOperation.ERemoteParam.print_media_size, options));
             result.optionContext.add(ECopyOptionItem.createOptionItem(ERemoteOperation.ERemoteParam.print_media_type, options));

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

@@ -51,7 +51,7 @@ class RemoteCopyPhotoSetOptionTask extends AsyncTask<Void, Void, Result> impleme
 
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
         optionContext = eCopyOptionContext;
-        replacedItem = optionContext.replace(new ECopyOptionItem(this.selectedItem));
+        replacedItem = optionContext.replace(new ECopyOptionItem(selectedItem));
         changableParams = new ArrayList<>();
         changableParams.add(ERemoteOperation.ERemoteParam.x_borderless);
         changableParams.add(ERemoteOperation.ERemoteParam.print_media_size);
@@ -69,8 +69,8 @@ class RemoteCopyPhotoSetOptionTask extends AsyncTask<Void, Void, Result> impleme
     }
 
     protected Result doInBackground(Void... voidArr) {
-        operation.setHostIP(this.systemSettings.getPrinterIPAddress());
-        if (this.selectedItem.isLocalOption) {
+        operation.setHostIP(systemSettings.getPrinterIPAddress());
+        if (selectedItem.isLocalOption) {
             return getResultLocalOptions();
         }
         ERemoteCopyPhoto.ERemoteCopyPhotoOptionResult options = operation.getOptions(new ERemoteCopyPhoto.IRemoteCopyPhotoOptionsParameter() {
@@ -133,7 +133,7 @@ class RemoteCopyPhotoSetOptionTask extends AsyncTask<Void, Void, Result> impleme
             Iterator<ERemoteOperation.ERemoteParam> it = changableParams.iterator();
             while (it.hasNext()) {
                 ECopyOptionItem createOptionItem = ECopyOptionItem.createOptionItem(it.next(), options);
-                if (this.optionContext.isChanged(createOptionItem)) {
+                if (optionContext.isChanged(createOptionItem)) {
                     result.changedItems.add(createOptionItem);
                     optionContext.replace(createOptionItem);
                 }
@@ -161,8 +161,8 @@ class RemoteCopyPhotoSetOptionTask extends AsyncTask<Void, Void, Result> impleme
             } else {
                 result.error = ECopyComponent.ICopyOptionListener.CopyOptionChangedError.Error;
             }
-            result.selectedItem = new ECopyOptionItem(this.replacedItem);
-            optionContext.replace(this.replacedItem);
+            result.selectedItem = new ECopyOptionItem(replacedItem);
+            optionContext.replace(replacedItem);
         }
         return result;
     }

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

@@ -156,7 +156,7 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
     }
 
     private void resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
-        synchronized (this.progress) {
+        synchronized (progress) {
             progress.resumeState = resumeState;
             progress.notify();
         }
@@ -164,11 +164,11 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
 
     private int resumeExecute() {
         int i = 1000;
-        if (this.progress.resumeRequest == null) {
+        if (progress.resumeRequest == null) {
             return 1000;
         }
-        synchronized (this.progress) {
-            while (this.progress.resumeState == null) {
+        synchronized (progress) {
+            while (progress.resumeState == null) {
                 try {
                     progress.wait(1000);
                 } catch (InterruptedException e) {
@@ -176,11 +176,11 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
                 }
             }
         }
-        switch (this.progress.resumeState) {
+        switch (progress.resumeState) {
             case ClearError:
                 ERemotePrinter eRemotePrinter = new ERemotePrinter();
-                eRemotePrinter.setHostIP(this.operation.getHostIP());
-                eRemotePrinter.setRequestConnectionTimeout(this.operation.getRequestConnectionTimeout());
+                eRemotePrinter.setHostIP(operation.getHostIP());
+                eRemotePrinter.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
                 eRemotePrinter.clearError(new ERemoteOperation.IRemoteOperationParameter() {
                     public String client_id() {
                         return RemoteCopyPhotoTask.this.clientID;
@@ -290,7 +290,7 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
     }
 
     protected Result doInBackground(Void... voidArr) {
-        operation.setHostIP(this.systemSettings.getPrinterIPAddress());
+        operation.setHostIP(systemSettings.getPrinterIPAddress());
         if (!this.photoSetting.parse()) {
             return new Result(ERemoteOperation.ERemoteParam.x_invalid_photo_setting);
         }
@@ -302,20 +302,20 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
         boolean z = false;
         boolean z2 = false;
         while (!z) {
-            if (this.cancelRequested && !z2) {
-                if (!this.operation.cancel(this.cancelParameter).success()) {
+            if (cancelRequested && !z2) {
+                if (!this.operation.cancel(cancelParameter).success()) {
                     return new Result(ERemoteOperation.ERemoteParam.canceled);
                 }
                 z2 = true;
             }
-            final ERemoteCopy.ERemoteCopyStatusResult status = operation.getStatus(this.statusParameter);
+            final ERemoteCopy.ERemoteCopyStatusResult status = operation.getStatus(statusParameter);
             if (!status.success()) {
                 return new Result((ERemoteOperation.ERemoteReasonResult) status);
             }
             Result result2 = new Result(status.job_result());
             progress.totalPages = status.job_print_total_pages();
             progress.currentPages = status.job_print_current_pages();
-            if (this.progress.currentPages < 1) {
+            if (progress.currentPages < 1) {
                 progress.currentPages = 1;
             }
             ERemoteOperation.ERemoteParam job_state = status.job_state();

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

@@ -179,7 +179,7 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
 
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
         optionContext = eCopyOptionContext;
-        replacedItem = optionContext.replace(new ECopyOptionItem(this.selectedItem));
+        replacedItem = optionContext.replace(new ECopyOptionItem(selectedItem));
         changableParams = new ArrayList<>();
         changableParams.add(ERemoteOperation.ERemoteParam.print_media_size);
         changableParams.add(ERemoteOperation.ERemoteParam.print_media_type);
@@ -187,7 +187,7 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
         changableParams.add(ERemoteOperation.ERemoteParam.print_media_source);
         changableParams.add(ERemoteOperation.ERemoteParam.print_quality);
         xscaleMap = getXScaleMap(eCopyOptionContext.copyType);
-        copyScaleMap = getCopyMagnificationMap(this.xscaleMap);
+        copyScaleMap = getCopyMagnificationMap(xscaleMap);
     }
 
     public Result getResultLocalOptions() {
@@ -196,10 +196,10 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
         result.changedItems = new ArrayList<>();
         ECopyOptionItem.ECopyOptionItemKey key = selectedItem.getKey();
         if (key == ECopyOptionItem.ECopyOptionItemKey.CopyMagnification) {
-            result.changedItems.add(this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XScale));
+            result.changedItems.add(optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XScale));
         } else if (key == ECopyOptionItem.ECopyOptionItemKey.XScale) {
             ECopyOptionItem copyOptionItemOf = optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.CopyMagnification);
-            int intValue = xscaleMap.get(this.selectedItem.getSelectedChoice()).intValue();
+            int intValue = xscaleMap.get(selectedItem.getSelectedChoice()).intValue();
             if (intValue != XScale_Custom_Value) {
                 copyOptionItemOf.selectValue(intValue);
             }
@@ -216,8 +216,8 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
     }
 
     protected Result doInBackground(Void... voidArr) {
-        operation.setHostIP(this.systemSettings.getPrinterIPAddress());
-        if (this.selectedItem.isLocalOption) {
+        operation.setHostIP(systemSettings.getPrinterIPAddress());
+        if (selectedItem.isLocalOption) {
             return getResultLocalOptions();
         }
         ERemoteCopy.ERemoteCopyOptionsResult options = operation.getOptions(new ERemoteCopy.IRemoteCopyOptionsParameter() {
@@ -311,7 +311,7 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
             Iterator<ERemoteOperation.ERemoteParam> it = changableParams.iterator();
             while (it.hasNext()) {
                 ECopyOptionItem createOptionItem = ECopyOptionItem.createOptionItem(it.next(), options);
-                if (this.optionContext.isChanged(createOptionItem)) {
+                if (optionContext.isChanged(createOptionItem)) {
                     result.changedItems.add(createOptionItem);
                     optionContext.replace(createOptionItem);
                 }
@@ -325,8 +325,8 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
             } else {
                 result.error = ECopyComponent.ICopyOptionListener.CopyOptionChangedError.Error;
             }
-            result.selectedItem = new ECopyOptionItem(this.replacedItem);
-            optionContext.replace(this.replacedItem);
+            result.selectedItem = new ECopyOptionItem(replacedItem);
+            optionContext.replace(replacedItem);
         }
         return result;
     }

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

@@ -253,7 +253,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
     }
 
     private void resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
-        synchronized (this.progress) {
+        synchronized (progress) {
             progress.resumeState = resumeState;
             progress.notify();
         }
@@ -261,13 +261,13 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
 
     private void resumeExecute() {
         ERemoteCopy.ERemoteCopyStatusResult status;
-        if (this.progress.resumeRequest != null) {
-            synchronized (this.progress) {
+        if (progress.resumeRequest != null) {
+            synchronized (progress) {
                 while (true) {
                     try {
-                        if (this.progress.resumeState == null) {
+                        if (progress.resumeState == null) {
                             progress.wait(1000);
-                            switch (this.operation.getStatus(this.statusParameter).printer_state()) {
+                            switch (operation.getStatus(statusParameter).printer_state()) {
                                 case idle:
                                     progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Processing;
                                     publishProgress(new Progress[]{this.progress});
@@ -279,7 +279,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                                     resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState.ClearError);
                                     continue;
                                 case stopped:
-                                    if (this.progress.resumeRequest.getStopReason().equals(getPrinterStopReason(status.printer_state_reasons()))) {
+                                    if (progress.resumeRequest.getStopReason().equals(getPrinterStopReason(status.printer_state_reasons()))) {
                                         continue;
                                     } else {
                                         return;
@@ -290,17 +290,17 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                         }
                     } catch (InterruptedException e) {
                         e.printStackTrace();
-                        switch (this.progress.resumeState) {
+                        switch (progress.resumeState) {
                             case ClearError:
                                 ERemotePrinter eRemotePrinter = new ERemotePrinter();
-                                eRemotePrinter.setHostIP(this.operation.getHostIP());
-                                eRemotePrinter.setRequestConnectionTimeout(this.operation.getRequestConnectionTimeout());
+                                eRemotePrinter.setHostIP(operation.getHostIP());
+                                eRemotePrinter.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
                                 eRemotePrinter.clearError(new ERemoteOperation.IRemoteOperationParameter() {
                                     public String client_id() {
                                         return RemoteCopyTask.this.clientID;
                                     }
                                 });
-                                for (int i = 0; i < 6 && !this.operation.getStatus(this.statusParameter).printer_state().equals(ERemoteOperation.ERemoteParam.processing); i++) {
+                                for (int i = 0; i < 6 && !this.operation.getStatus(statusParameter).printer_state().equals(ERemoteOperation.ERemoteParam.processing); i++) {
                                     try {
                                         Thread.sleep(5000);
                                     } catch (InterruptedException e2) {
@@ -414,7 +414,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
     }
 
     protected Result doInBackground(Void... voidArr) {
-        operation.setHostIP(this.systemSettings.getPrinterIPAddress());
+        operation.setHostIP(systemSettings.getPrinterIPAddress());
         ERemoteOperation.ERemoteReasonResult startCopy = startCopy();
         if (!startCopy.success()) {
             return new Result(startCopy);
@@ -423,21 +423,21 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
         boolean z = false;
         boolean z2 = false;
         while (!z) {
-            if (this.cancelRequested && !z2) {
-                if (!this.operation.cancel(this.cancelParameter).success()) {
+            if (cancelRequested && !z2) {
+                if (!this.operation.cancel(cancelParameter).success()) {
                     return new Result(ERemoteOperation.ERemoteParam.canceled);
                 }
                 z2 = true;
             }
-            final ERemoteCopy.ERemoteCopyStatusResult status = operation.getStatus(this.statusParameter);
+            final ERemoteCopy.ERemoteCopyStatusResult status = operation.getStatus(statusParameter);
             if (!status.success()) {
-                sendLog(this.progress.currentPages);
+                sendLog(progress.currentPages);
                 return new Result((ERemoteOperation.ERemoteReasonResult) status);
             }
             Result result2 = new Result(status.job_result());
             progress.totalPages = status.job_print_total_pages();
             progress.currentPages = status.job_print_current_pages();
-            if (this.progress.currentPages < 1) {
+            if (progress.currentPages < 1) {
                 progress.currentPages = 1;
             }
             ERemoteOperation.ERemoteParam job_state = status.job_state();
@@ -473,7 +473,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                     };
                     break;
                 case finished:
-                    sendLog(this.progress.currentPages);
+                    sendLog(progress.currentPages);
                     result = result2;
                     z = true;
                     continue;

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

@@ -169,8 +169,8 @@ class RemoteDeviceTask extends AsyncTask<Void, Void, Result> implements ECopyCom
 
     private ArrayList<String> getJobTokens() {
         ERemoteCopy eRemoteCopy = new ERemoteCopy();
-        eRemoteCopy.setHostIP(this.operation.getHostIP());
-        eRemoteCopy.setRequestConnectionTimeout(this.operation.getRequestConnectionTimeout());
+        eRemoteCopy.setHostIP(operation.getHostIP());
+        eRemoteCopy.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
         ERemoteCopy.ERemoteCopyStatusResult status = eRemoteCopy.getStatus(new ERemoteCopy.IRemoteCopyStatusParameter() {
             public String job_token() {
                 return "";
@@ -193,7 +193,7 @@ class RemoteDeviceTask extends AsyncTask<Void, Void, Result> implements ECopyCom
     }
 
     protected Result doInBackground(Void... voidArr) {
-        operation.setHostIP(this.systemSettings.getPrinterIPAddress());
+        operation.setHostIP(systemSettings.getPrinterIPAddress());
         ERemoteDevice.ERemoteDeviceStatusResult status = operation.getStatus(new ERemoteOperation.IRemoteStatusParameter() {
             public String client_id() {
                 return RemoteDeviceTask.this.clientID;

+ 5 - 5
app/src/main/java/epson/print/copy/Component/eremoteoperation/ERemoteCombo.java

@@ -124,7 +124,7 @@ public class ERemoteCombo extends ERemoteOperation {
     }
 
     public ERemoteComboOptionsResult getOptions(IRemoteComboOptionsParameter iRemoteComboOptionsParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestCombo = ERemoteOperation.ERemoteRequestBuilder.requestCombo(this.hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCombo = ERemoteOperation.ERemoteRequestBuilder.requestCombo(hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
         requestCombo.add(ERemoteOperation.ERemoteParam.client_id, iRemoteComboOptionsParameter.client_id());
         requestCombo.add(ERemoteOperation.ERemoteParam.layout, iRemoteComboOptionsParameter.layout());
         requestCombo.add(ERemoteOperation.ERemoteParam.print_media_type, iRemoteComboOptionsParameter.print_media_type());
@@ -144,7 +144,7 @@ public class ERemoteCombo extends ERemoteOperation {
         arrayList.add(ERemoteOperation.ERemoteParam.print_media_size);
         arrayList.add(ERemoteOperation.ERemoteParam.print_media_type);
         arrayList.add(ERemoteOperation.ERemoteParam.frame);
-        ERemoteOperation.ERemoteRequestBuilder requestCombo = ERemoteOperation.ERemoteRequestBuilder.requestCombo(this.hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCombo = ERemoteOperation.ERemoteRequestBuilder.requestCombo(hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
         requestCombo.add(ERemoteOperation.ERemoteParam.client_id, ERemoteOperation.ERemoteParam.x_null.string);
         requestCombo.add(ERemoteOperation.ERemoteParam.layout, ERemoteOperation.ERemoteParam.x_null);
         requestCombo.add(ERemoteOperation.ERemoteParam.print_media_type, ERemoteOperation.ERemoteParam.x_null);
@@ -159,7 +159,7 @@ public class ERemoteCombo extends ERemoteOperation {
     }
 
     public ERemoteComboPrintTemplateResult printTemplate(IRemoteComboPrintTemplateParameter iRemoteComboPrintTemplateParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestCombo = ERemoteOperation.ERemoteRequestBuilder.requestCombo(this.hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCombo = ERemoteOperation.ERemoteRequestBuilder.requestCombo(hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
         requestCombo.add(ERemoteOperation.ERemoteParam.client_id, iRemoteComboPrintTemplateParameter.client_id());
         requestCombo.add(ERemoteOperation.ERemoteParam.layout, iRemoteComboPrintTemplateParameter.layout());
         requestCombo.add(ERemoteOperation.ERemoteParam.print_media_type, iRemoteComboPrintTemplateParameter.print_media_type());
@@ -171,7 +171,7 @@ public class ERemoteCombo extends ERemoteOperation {
     }
 
     public ERemoteComboWaitTemplateResult waitTemplate(IRemoteComboWaitTemplateParameter iRemoteComboWaitTemplateParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestCombo = ERemoteOperation.ERemoteRequestBuilder.requestCombo(this.hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCombo = ERemoteOperation.ERemoteRequestBuilder.requestCombo(hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
         requestCombo.add(ERemoteOperation.ERemoteParam.client_id, iRemoteComboWaitTemplateParameter.client_id());
         ERemoteComboWaitTemplateResult eRemoteComboWaitTemplateResult = new ERemoteComboWaitTemplateResult(requestCombo.getRemoteRequest().execute());
         eRemoteComboWaitTemplateResult.setRemoteRequestBuilder(requestCombo);
@@ -179,7 +179,7 @@ public class ERemoteCombo extends ERemoteOperation {
     }
 
     public ERemoteComboStatusResult getStatus(IRemoteComboStatusParameter iRemoteComboStatusParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestCombo = ERemoteOperation.ERemoteRequestBuilder.requestCombo(this.hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCombo = ERemoteOperation.ERemoteRequestBuilder.requestCombo(hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
         requestCombo.add(ERemoteOperation.ERemoteParam.client_id, iRemoteComboStatusParameter.client_id());
         requestCombo.add(ERemoteOperation.ERemoteParam.keys, iRemoteComboStatusParameter.keys());
         requestCombo.add(ERemoteOperation.ERemoteParam.job_token, iRemoteComboStatusParameter.job_token());

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

@@ -172,7 +172,7 @@ public class ERemoteCopy extends ERemoteOperation {
             }
 
             private void checkPaperSize(ERemoteOperation.ERemoteParam eRemoteParam, ERemoteOperation.ERemoteParam eRemoteParam2, ERemoteOperation.ERemoteParam eRemoteParam3) {
-                if (this.mediaSizeList.contains(eRemoteParam) && mediaSizeList.contains(eRemoteParam2)) {
+                if (mediaSizeList.contains(eRemoteParam) && mediaSizeList.contains(eRemoteParam2)) {
                     scalePresets.add(eRemoteParam3);
                 }
             }
@@ -240,7 +240,7 @@ public class ERemoteCopy extends ERemoteOperation {
     }
 
     public ERemoteCopyResult copy(IRemoteCopyParameter iRemoteCopyParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(this.hostIP, ERemoteOperation.RequestParam.copy, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(hostIP, ERemoteOperation.RequestParam.copy, getRequestConnectionTimeout());
         requestCopy.add(ERemoteOperation.ERemoteParam.client_id, iRemoteCopyParameter.client_id());
         requestCopy.add(ERemoteOperation.ERemoteParam.layout, iRemoteCopyParameter.layout());
         requestCopy.add(ERemoteOperation.ERemoteParam.scan_sides, iRemoteCopyParameter.scan_sides());
@@ -271,7 +271,7 @@ public class ERemoteCopy extends ERemoteOperation {
     }
 
     public ERemoteCopyOptionsResult getOptions(IRemoteCopyOptionsParameter iRemoteCopyOptionsParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(this.hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
         requestCopy.add(ERemoteOperation.ERemoteParam.client_id, iRemoteCopyOptionsParameter.client_id());
         requestCopy.add(ERemoteOperation.ERemoteParam.layout, iRemoteCopyOptionsParameter.layout());
         requestCopy.add(ERemoteOperation.ERemoteParam.scan_sides, iRemoteCopyOptionsParameter.scan_sides());
@@ -304,7 +304,7 @@ public class ERemoteCopy extends ERemoteOperation {
         arrayList.add(ERemoteOperation.ERemoteParam.scan_content_type);
         arrayList.add(ERemoteOperation.ERemoteParam.print_quality);
         arrayList.add(ERemoteOperation.ERemoteParam.print_media_source);
-        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(this.hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
         requestCopy.add(ERemoteOperation.ERemoteParam.client_id, ERemoteOperation.ERemoteParam.x_null.string);
         requestCopy.add(ERemoteOperation.ERemoteParam.layout, ERemoteOperation.ERemoteParam.x_null);
         requestCopy.add(ERemoteOperation.ERemoteParam.scan_sides, ERemoteOperation.ERemoteParam.x_null);
@@ -326,7 +326,7 @@ public class ERemoteCopy extends ERemoteOperation {
     }
 
     public ERemoteCopyStatusResult getStatus(IRemoteCopyStatusParameter iRemoteCopyStatusParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(this.hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
         requestCopy.add(ERemoteOperation.ERemoteParam.client_id, iRemoteCopyStatusParameter.client_id());
         requestCopy.add(ERemoteOperation.ERemoteParam.keys, iRemoteCopyStatusParameter.keys());
         requestCopy.add(ERemoteOperation.ERemoteParam.job_token, iRemoteCopyStatusParameter.job_token());
@@ -336,7 +336,7 @@ public class ERemoteCopy extends ERemoteOperation {
     }
 
     public ERemoteOperation.ERemoteReasonResult cancel(IRemoteCancelParameter iRemoteCancelParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(this.hostIP, ERemoteOperation.RequestParam.cancel, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(hostIP, ERemoteOperation.RequestParam.cancel, getRequestConnectionTimeout());
         requestCopy.add(ERemoteOperation.ERemoteParam.client_id, iRemoteCancelParameter.client_id());
         requestCopy.add(ERemoteOperation.ERemoteParam.job_token, iRemoteCancelParameter.job_token());
         ERemoteOperation.ERemoteReasonResult eRemoteReasonResult = new ERemoteOperation.ERemoteReasonResult(requestCopy.getRemoteRequest().execute());
@@ -345,7 +345,7 @@ public class ERemoteCopy extends ERemoteOperation {
     }
 
     public ERemoteOperation.ERemoteReasonResult documentChanged(IRemoteCopyDocumentChangedParameter iRemoteCopyDocumentChangedParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(this.hostIP, ERemoteOperation.RequestParam.document_changed, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(hostIP, ERemoteOperation.RequestParam.document_changed, getRequestConnectionTimeout());
         requestCopy.add(ERemoteOperation.ERemoteParam.client_id, iRemoteCopyDocumentChangedParameter.client_id());
         requestCopy.add(ERemoteOperation.ERemoteParam.job_token, iRemoteCopyDocumentChangedParameter.job_token());
         requestCopy.add(ERemoteOperation.ERemoteParam.next_document, iRemoteCopyDocumentChangedParameter.next_document());

+ 5 - 5
app/src/main/java/epson/print/copy/Component/eremoteoperation/ERemoteCopyPhoto.java

@@ -109,7 +109,7 @@ public class ERemoteCopyPhoto extends ERemoteCopy {
     }
 
     public ERemoteCopy.ERemoteCopyResult copy(IRemoteCopyPhotoParameter iRemoteCopyPhotoParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestCopyPhoto = ERemoteOperation.ERemoteRequestBuilder.requestCopyPhoto(this.hostIP, ERemoteOperation.RequestParam.copy, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCopyPhoto = ERemoteOperation.ERemoteRequestBuilder.requestCopyPhoto(hostIP, ERemoteOperation.RequestParam.copy, getRequestConnectionTimeout());
         requestCopyPhoto.add(ERemoteOperation.ERemoteParam.client_id, iRemoteCopyPhotoParameter.client_id());
         requestCopyPhoto.add(ERemoteOperation.ERemoteParam.layout, iRemoteCopyPhotoParameter.layout());
         requestCopyPhoto.add(ERemoteOperation.ERemoteParam.print_media_type, iRemoteCopyPhotoParameter.print_media_type());
@@ -136,7 +136,7 @@ public class ERemoteCopyPhoto extends ERemoteCopy {
     }
 
     public ERemoteCopyPhotoOptionResult getOptions(IRemoteCopyPhotoOptionsParameter iRemoteCopyPhotoOptionsParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestCopyPhoto = ERemoteOperation.ERemoteRequestBuilder.requestCopyPhoto(this.hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCopyPhoto = ERemoteOperation.ERemoteRequestBuilder.requestCopyPhoto(hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
         requestCopyPhoto.add(ERemoteOperation.ERemoteParam.client_id, iRemoteCopyPhotoOptionsParameter.client_id());
         requestCopyPhoto.add(ERemoteOperation.ERemoteParam.layout, iRemoteCopyPhotoOptionsParameter.layout());
         requestCopyPhoto.add(ERemoteOperation.ERemoteParam.print_media_type, iRemoteCopyPhotoOptionsParameter.print_media_type());
@@ -161,7 +161,7 @@ public class ERemoteCopyPhoto extends ERemoteCopy {
         arrayList.add(ERemoteOperation.ERemoteParam.x_apf);
         arrayList.add(ERemoteOperation.ERemoteParam.print_quality);
         arrayList.add(ERemoteOperation.ERemoteParam.print_media_source);
-        ERemoteOperation.ERemoteRequestBuilder requestCopyPhoto = ERemoteOperation.ERemoteRequestBuilder.requestCopyPhoto(this.hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCopyPhoto = ERemoteOperation.ERemoteRequestBuilder.requestCopyPhoto(hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
         requestCopyPhoto.add(ERemoteOperation.ERemoteParam.client_id, ERemoteOperation.ERemoteParam.x_null.string);
         requestCopyPhoto.add(ERemoteOperation.ERemoteParam.layout, ERemoteOperation.ERemoteParam.x_null);
         requestCopyPhoto.add(ERemoteOperation.ERemoteParam.print_media_type, ERemoteOperation.ERemoteParam.x_null);
@@ -179,7 +179,7 @@ public class ERemoteCopyPhoto extends ERemoteCopy {
     }
 
     public ERemoteCopy.ERemoteCopyStatusResult getStatus(ERemoteCopy.IRemoteCopyStatusParameter iRemoteCopyStatusParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestCopyPhoto = ERemoteOperation.ERemoteRequestBuilder.requestCopyPhoto(this.hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCopyPhoto = ERemoteOperation.ERemoteRequestBuilder.requestCopyPhoto(hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
         requestCopyPhoto.add(ERemoteOperation.ERemoteParam.client_id, iRemoteCopyStatusParameter.client_id());
         requestCopyPhoto.add(ERemoteOperation.ERemoteParam.keys, iRemoteCopyStatusParameter.keys());
         requestCopyPhoto.add(ERemoteOperation.ERemoteParam.job_token, iRemoteCopyStatusParameter.job_token());
@@ -189,7 +189,7 @@ public class ERemoteCopyPhoto extends ERemoteCopy {
     }
 
     public ERemoteOperation.ERemoteReasonResult cancel(ERemoteCopy.IRemoteCancelParameter iRemoteCancelParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestCopyPhoto = ERemoteOperation.ERemoteRequestBuilder.requestCopyPhoto(this.hostIP, ERemoteOperation.RequestParam.cancel, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCopyPhoto = ERemoteOperation.ERemoteRequestBuilder.requestCopyPhoto(hostIP, ERemoteOperation.RequestParam.cancel, getRequestConnectionTimeout());
         requestCopyPhoto.add(ERemoteOperation.ERemoteParam.client_id, iRemoteCancelParameter.client_id());
         requestCopyPhoto.add(ERemoteOperation.ERemoteParam.job_token, iRemoteCancelParameter.job_token());
         ERemoteOperation.ERemoteReasonResult eRemoteReasonResult = new ERemoteOperation.ERemoteReasonResult(requestCopyPhoto.getRemoteRequest().execute());

+ 2 - 2
app/src/main/java/epson/print/copy/Component/eremoteoperation/ERemoteDevice.java

@@ -47,7 +47,7 @@ public class ERemoteDevice extends ERemoteOperation {
     }
 
     public ERemoteDeviceFunctionsResult getFunctions(ERemoteOperation.IRemoteOperationParameter iRemoteOperationParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestDevice = ERemoteOperation.ERemoteRequestBuilder.requestDevice(this.hostIP, ERemoteOperation.RequestParam.get_functions, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestDevice = ERemoteOperation.ERemoteRequestBuilder.requestDevice(hostIP, ERemoteOperation.RequestParam.get_functions, getRequestConnectionTimeout());
         requestDevice.add(ERemoteOperation.ERemoteParam.client_id, iRemoteOperationParameter.client_id());
         ERemoteDeviceFunctionsResult eRemoteDeviceFunctionsResult = new ERemoteDeviceFunctionsResult(requestDevice.getRemoteRequest().execute());
         eRemoteDeviceFunctionsResult.setRemoteRequestBuilder(requestDevice);
@@ -55,7 +55,7 @@ public class ERemoteDevice extends ERemoteOperation {
     }
 
     public ERemoteDeviceStatusResult getStatus(ERemoteOperation.IRemoteStatusParameter iRemoteStatusParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestDevice = ERemoteOperation.ERemoteRequestBuilder.requestDevice(this.hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestDevice = ERemoteOperation.ERemoteRequestBuilder.requestDevice(hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
         requestDevice.add(ERemoteOperation.ERemoteParam.client_id, iRemoteStatusParameter.client_id());
         requestDevice.add(ERemoteOperation.ERemoteParam.keys, iRemoteStatusParameter.keys());
         ERemoteDeviceStatusResult eRemoteDeviceStatusResult = new ERemoteDeviceStatusResult(requestDevice.getRemoteRequest().execute());

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

@@ -422,7 +422,7 @@ public class ERemoteOperation {
         private ERemoteParam getParamValueOf(ERemoteParam eRemoteParam) {
             ERemoteParam eRemoteParam2 = ERemoteParam.x_null;
             try {
-                return ERemoteParam.stringOf(this.json.getString(eRemoteParam.string));
+                return ERemoteParam.stringOf(json.getString(eRemoteParam.string));
             } catch (Exception e) {
                 e.printStackTrace();
                 return eRemoteParam2;
@@ -501,9 +501,9 @@ public class ERemoteOperation {
                 request.getEntity().writeTo(byteArrayOutputStream);
                 Log.d("ERequest B", byteArrayOutputStream.toString());
                 IAHttpClient iAHttpClient = new IAHttpClient();
-                iAHttpClient.setConnectionTimeout(this.timeout);
-                iAHttpClient.setSoTimeout(this.timeout);
-                return ERemoteOperationResult.parseResponse(iAHttpClient.execute(this.request));
+                iAHttpClient.setConnectionTimeout(timeout);
+                iAHttpClient.setSoTimeout(timeout);
+                return ERemoteOperationResult.parseResponse(iAHttpClient.execute(request));
             } catch (Exception e) {
                 e.printStackTrace();
                 return new JSONObject();
@@ -644,7 +644,7 @@ public class ERemoteOperation {
         }
 
         public ERemoteRequest getRemoteRequest() {
-            return new ERemoteRequest(this.requestURI.toString(), messageBody, timeout);
+            return new ERemoteRequest(requestURI.toString(), messageBody, timeout);
         }
     }
 }

+ 3 - 3
app/src/main/java/epson/print/copy/Component/eremoteoperation/ERemotePrinter.java

@@ -35,13 +35,13 @@ public class ERemotePrinter extends ERemoteOperation {
     }
 
     public ERemotePrinterComponentsResult getComponents(ERemoteOperation.IRemoteOperationParameter iRemoteOperationParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestPrinter = ERemoteOperation.ERemoteRequestBuilder.requestPrinter(this.hostIP, ERemoteOperation.RequestParam.get_components, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestPrinter = ERemoteOperation.ERemoteRequestBuilder.requestPrinter(hostIP, ERemoteOperation.RequestParam.get_components, getRequestConnectionTimeout());
         requestPrinter.add(ERemoteOperation.ERemoteParam.client_id, iRemoteOperationParameter.client_id());
         return new ERemotePrinterComponentsResult(requestPrinter.getRemoteRequest().execute());
     }
 
     public ERemotePrinterStatusResult getStatus(ERemoteOperation.IRemoteStatusParameter iRemoteStatusParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestPrinter = ERemoteOperation.ERemoteRequestBuilder.requestPrinter(this.hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestPrinter = ERemoteOperation.ERemoteRequestBuilder.requestPrinter(hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
         requestPrinter.add(ERemoteOperation.ERemoteParam.client_id, iRemoteStatusParameter.client_id());
         requestPrinter.add(ERemoteOperation.ERemoteParam.keys, iRemoteStatusParameter.keys());
         ERemotePrinterStatusResult eRemotePrinterStatusResult = new ERemotePrinterStatusResult(requestPrinter.getRemoteRequest().execute());
@@ -50,7 +50,7 @@ public class ERemotePrinter extends ERemoteOperation {
     }
 
     public ERemoteOperation.ERemoteOperationResult clearError(ERemoteOperation.IRemoteOperationParameter iRemoteOperationParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestPrinter = ERemoteOperation.ERemoteRequestBuilder.requestPrinter(this.hostIP, ERemoteOperation.RequestParam.clear_error, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestPrinter = ERemoteOperation.ERemoteRequestBuilder.requestPrinter(hostIP, ERemoteOperation.RequestParam.clear_error, getRequestConnectionTimeout());
         requestPrinter.add(ERemoteOperation.ERemoteParam.client_id, iRemoteOperationParameter.client_id());
         ERemotePrinterStatusResult eRemotePrinterStatusResult = new ERemotePrinterStatusResult(requestPrinter.getRemoteRequest().execute());
         eRemotePrinterStatusResult.setRemoteRequestBuilder(requestPrinter);

+ 3 - 3
app/src/main/java/epson/print/copy/Component/eremoteoperation/ERemoteScanner.java

@@ -35,7 +35,7 @@ public class ERemoteScanner extends ERemoteOperation {
     }
 
     public ERemoteScannerComponentsResult getComponents(ERemoteOperation.IRemoteOperationParameter iRemoteOperationParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestScanner = ERemoteOperation.ERemoteRequestBuilder.requestScanner(this.hostIP, ERemoteOperation.RequestParam.get_components, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestScanner = ERemoteOperation.ERemoteRequestBuilder.requestScanner(hostIP, ERemoteOperation.RequestParam.get_components, getRequestConnectionTimeout());
         requestScanner.add(ERemoteOperation.ERemoteParam.client_id, iRemoteOperationParameter.client_id());
         ERemoteScannerComponentsResult eRemoteScannerComponentsResult = new ERemoteScannerComponentsResult(requestScanner.getRemoteRequest().execute());
         eRemoteScannerComponentsResult.setRemoteRequestBuilder(requestScanner);
@@ -43,7 +43,7 @@ public class ERemoteScanner extends ERemoteOperation {
     }
 
     public ERemoteScannerStatusResult getStatus(ERemoteOperation.IRemoteStatusParameter iRemoteStatusParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestScanner = ERemoteOperation.ERemoteRequestBuilder.requestScanner(this.hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestScanner = ERemoteOperation.ERemoteRequestBuilder.requestScanner(hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
         requestScanner.add(ERemoteOperation.ERemoteParam.keys, iRemoteStatusParameter.keys());
         ERemoteScannerStatusResult eRemoteScannerStatusResult = new ERemoteScannerStatusResult(requestScanner.getRemoteRequest().execute());
         eRemoteScannerStatusResult.setRemoteRequestBuilder(requestScanner);
@@ -51,7 +51,7 @@ public class ERemoteScanner extends ERemoteOperation {
     }
 
     public ERemoteOperation.ERemoteOperationResult clearError(ERemoteOperation.IRemoteOperationParameter iRemoteOperationParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestScanner = ERemoteOperation.ERemoteRequestBuilder.requestScanner(this.hostIP, ERemoteOperation.RequestParam.clear_error, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestScanner = ERemoteOperation.ERemoteRequestBuilder.requestScanner(hostIP, ERemoteOperation.RequestParam.clear_error, getRequestConnectionTimeout());
         requestScanner.add(ERemoteOperation.ERemoteParam.client_id, iRemoteOperationParameter.client_id());
         ERemoteOperation.ERemoteOperationResult eRemoteOperationResult = new ERemoteOperation.ERemoteOperationResult(requestScanner.getRemoteRequest().execute());
         eRemoteOperationResult.setRemoteRequestBuilder(requestScanner);

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

@@ -36,12 +36,12 @@ public class CopyScaleActivity extends ActivityBase {
 
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        EPLog.i(this.TAG, "onCreate");
+        EPLog.i(TAG, "onCreate");
         setContentView((int) R.layout.copy_scale);
         Intent intent = getIntent();
         if (intent != null) {
             settingItemKey = intent.getStringExtra("Key");
-            setActionBar(string(this.settingItemKey), true);
+            setActionBar(string(settingItemKey), true);
         }
         optionValueChangedListener = new ActivityBase.OptionItemChangedListener() {
             public void onOptionItemChanged(ECopyOptionItem eCopyOptionItem) {
@@ -53,11 +53,11 @@ public class CopyScaleActivity extends ActivityBase {
                 }
             }
         };
-        buildCopyOptions(this.copyComponent.getCopyOptionItems());
+        buildCopyOptions(copyComponent.getCopyOptionItems());
     }
 
     private void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
-        EPLog.i(this.TAG, "buildCopyOptions");
+        EPLog.i(TAG, "buildCopyOptions");
         Iterator<ECopyOptionItem> it = arrayList.iterator();
         while (it.hasNext()) {
             ECopyOptionItem next = it.next();
@@ -65,7 +65,7 @@ public class CopyScaleActivity extends ActivityBase {
             if (key == ECopyOptionItem.ECopyOptionItemKey.CopyMagnification) {
                 optionValueMap.put(key, new CopyMagnificationValue(next));
             }
-            if (key.name().equalsIgnoreCase(this.settingItemKey)) {
+            if (key.name().equalsIgnoreCase(settingItemKey)) {
                 optionValueMap.put(key, new XScaleValue(next));
             }
         }
@@ -97,7 +97,7 @@ public class CopyScaleActivity extends ActivityBase {
             while (true) {
                 if (i >= choices.size()) {
                     break;
-                } else if (this.selected == choices.get(i)) {
+                } else if (selected == choices.get(i)) {
                     selectedItemPos = i;
                     break;
                 } else {
@@ -105,7 +105,7 @@ public class CopyScaleActivity extends ActivityBase {
                 }
             }
             LinearLayout linearLayout = (LinearLayout) CopyScaleActivity.this.findViewById(R.id.auto_fit);
-            if (this.selectedItemPos == 0) {
+            if (selectedItemPos == 0) {
                 ((ImageView) CopyScaleActivity.this.findViewById(R.id.auto_select_icon)).setVisibility(0);
             } else {
                 ((ImageView) CopyScaleActivity.this.findViewById(R.id.auto_select_icon)).setVisibility(8);
@@ -123,7 +123,7 @@ public class CopyScaleActivity extends ActivityBase {
                 }
             });
             LinearLayout linearLayout2 = (LinearLayout) CopyScaleActivity.this.findViewById(R.id.full_size);
-            if (this.selectedItemPos == 1) {
+            if (selectedItemPos == 1) {
                 ((ImageView) CopyScaleActivity.this.findViewById(R.id.full_select_icon)).setVisibility(0);
             } else {
                 ((ImageView) CopyScaleActivity.this.findViewById(R.id.full_select_icon)).setVisibility(8);
@@ -140,7 +140,7 @@ public class CopyScaleActivity extends ActivityBase {
                     CopyScaleActivity.this.finish();
                 }
             });
-            if (this.selectedItemPos == 2) {
+            if (selectedItemPos == 2) {
                 ((ImageView) CopyScaleActivity.this.findViewById(R.id.custom_select_icon)).setVisibility(0);
             } else {
                 ((ImageView) CopyScaleActivity.this.findViewById(R.id.custom_select_icon)).setVisibility(8);
@@ -175,7 +175,7 @@ public class CopyScaleActivity extends ActivityBase {
                 if (view == 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(items.get(i).scalePresetName);
                 int i2 = items.get(i).scaleNum;
                 ((TextView) view.findViewById(R.id.setting_value)).setText(String.valueOf(i2) + " %");
                 if (i == XScaleValue.this.selectedItemPos - 3) {
@@ -210,10 +210,10 @@ public class CopyScaleActivity extends ActivityBase {
             optionItem = eCopyOptionItem;
             editText = (TextView) CopyScaleActivity.this.findViewById(i);
             value = eCopyOptionItem.getSelectedValue();
-            if (this.value == ECopyOptionItem.CopyMagnificationAutofitValue) {
+            if (value == ECopyOptionItem.CopyMagnificationAutofitValue) {
                 editText.setText("---");
             } else {
-                editText.setText(String.valueOf(this.value));
+                editText.setText(String.valueOf(value));
             }
             editText.setEnabled(eCopyOptionItem.isEnabled());
         }

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

@@ -30,12 +30,12 @@ public class CopySettingActivity extends ActivityBase {
 
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        EPLog.i(this.TAG, "onCreate");
+        EPLog.i(TAG, "onCreate");
         setContentView((int) R.layout.copy_setting);
         Intent intent = getIntent();
         if (intent != null) {
             settingItemKey = intent.getStringExtra("Key");
-            setActionBar(string(this.settingItemKey), true);
+            setActionBar(string(settingItemKey), true);
         }
         optionValueChangedListener = new ActivityBase.OptionItemChangedListener() {
             public void onOptionItemChanged(ECopyOptionItem eCopyOptionItem) {
@@ -56,17 +56,17 @@ public class CopySettingActivity extends ActivityBase {
             }
         };
         optionContext = copyComponent.getBindedCopyOptionContext();
-        copyComponent.bindCopyOptionContext(this.optionContext, optionListener);
-        buildCopyOptions(this.copyComponent.getCopyOptionItems());
+        copyComponent.bindCopyOptionContext(optionContext, optionListener);
+        buildCopyOptions(copyComponent.getCopyOptionItems());
     }
 
     private void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
-        EPLog.i(this.TAG, "buildCopyOptions");
+        EPLog.i(TAG, "buildCopyOptions");
         Iterator<ECopyOptionItem> it = arrayList.iterator();
         while (it.hasNext()) {
             ECopyOptionItem next = it.next();
             ECopyOptionItem.ECopyOptionItemKey key = next.getKey();
-            if (key.name().equalsIgnoreCase(this.settingItemKey)) {
+            if (key.name().equalsIgnoreCase(settingItemKey)) {
                 optionValueMap.put(key, new OthersettingValue(next));
             }
         }
@@ -100,7 +100,7 @@ public class CopySettingActivity extends ActivityBase {
             });
             listView.setAdapter(getArrayAdapter(this, context));
             for (int i = 0; i < choices.size(); i++) {
-                if (this.selected == choices.get(i)) {
+                if (selected == choices.get(i)) {
                     selectedItemPos = i;
                     return;
                 }
@@ -121,7 +121,7 @@ public class CopySettingActivity extends ActivityBase {
                 if (view == 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(items[i]);
                 if (i == OthersettingValue.this.selectedItemPos) {
                     ((ImageView) view.findViewById(R.id.setting_active_icon)).setVisibility(0);
                 } else {

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

@@ -152,7 +152,7 @@ public class DisplayUtil {
         }
 
         private void addHashMap(@NonNull Context context, @NonNull HashMap<String, String> hashMap) {
-            hashMap.put(this.copyParamEnum.name(), context.getString(this.f384id));
+            hashMap.put(copyParamEnum.name(), context.getString(f384id));
         }
     }
 }

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

@@ -111,7 +111,7 @@ public class EpsonConnectAccess {
     }
 
     public RemotePrinterInfo newLibGetPrinterInfo() {
-        if (this.mEcClientLib.GetPrinterInfo() != 0) {
+        if (mEcClientLib.GetPrinterInfo() != 0) {
             return null;
         }
         RemotePrinterInfo remotePrinterInfo = new RemotePrinterInfo();

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

@@ -17,7 +17,7 @@ public class HttpApache extends HttpAccess {
     }
 
     private void dispHttpRes(String str) {
-        if (this.mDisplay != null) {
+        if (mDisplay != null) {
             DebugDisplay debugDisplay = mDisplay;
             debugDisplay.addResText(str + Constants.BREAK_LINE);
         }
@@ -25,7 +25,7 @@ public class HttpApache extends HttpAccess {
     }
 
     private void dispHttpCmd(URL url) {
-        if (this.mDisplay != null) {
+        if (mDisplay != null) {
             DebugDisplay debugDisplay = mDisplay;
             debugDisplay.addResText("=> " + url.toString() + Constants.BREAK_LINE);
         }
@@ -75,7 +75,7 @@ public class HttpApache extends HttpAccess {
         mResString = null;
         mHttpRetCode = 0;
         dispHttpRes("[post file]:: " + str + " :: file: <" + str4 + "> offset: <" + i + "> dataSize: <" + i2 + ">");
-        if (this.mCanceled) {
+        if (mCanceled) {
             return -2;
         }
         try {
@@ -104,7 +104,7 @@ public class HttpApache extends HttpAccess {
         dispHttpRes("[get file]::" + str + " file <" + str2 + ">");
         mResString = null;
         mHttpRetCode = 0;
-        if (this.mCanceled) {
+        if (mCanceled) {
             return -2;
         }
         try {

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

@@ -16,7 +16,7 @@ public class HttpNonSsl extends HttpAccess {
     }
 
     private void dispHttpRes(String str) {
-        if (this.mDisplay != null) {
+        if (mDisplay != null) {
             DebugDisplay debugDisplay = mDisplay;
             debugDisplay.addResText(str + Constants.BREAK_LINE);
         }
@@ -24,7 +24,7 @@ public class HttpNonSsl extends HttpAccess {
     }
 
     private void dispHttpCmd(URL url) {
-        if (this.mDisplay != null) {
+        if (mDisplay != null) {
             DebugDisplay debugDisplay = mDisplay;
             debugDisplay.addResText("=> " + url.toString() + Constants.BREAK_LINE);
         }

+ 16 - 16
app/src/main/java/epson/print/fileBrower.java

@@ -40,7 +40,7 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
     private static final int RESULT_RUNTIMEPERMMISSION = 1;
     private String RootPath = CommonDefine.SLASH;
     private String TopPath = CommonDefine.MOUNT_DIR;
-    private File currentDirectory = new File(this.TopPath);
+    private File currentDirectory = new File(TopPath);
     private List<String> directoryEntries = new ArrayList();
     private List<IconifiedText> directotyEntries_new_v2 = new ArrayList();
     private ListView list;
@@ -49,7 +49,7 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView(R.layout.file_browser);
-        if (!new File(this.TopPath).isDirectory()) {
+        if (!new File(TopPath).isDirectory()) {
             String str = DEFAULT_DIR;
             int lastIndexOf = str.lastIndexOf(CommonDefine.MOUNT_DIR);
             if (lastIndexOf != -1) {
@@ -58,9 +58,9 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
                 str = str + CommonDefine.SLASH;
             }
             TopPath = str;
-            currentDirectory = new File(this.TopPath);
+            currentDirectory = new File(TopPath);
         }
-        setActionBar(this.TopPath, true);
+        setActionBar(TopPath, true);
         list = (ListView) findViewById(R.id.filelist);
         list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
@@ -131,12 +131,12 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
 
     public boolean onContextItemSelected(MenuItem menuItem) {
         listItemIndex = (AdapterView.AdapterContextMenuInfo) menuItem.getMenuInfo();
-        if (this.listItemIndex == null) {
+        if (listItemIndex == null) {
             return true;
         }
         switch (menuItem.getItemId()) {
             case 1:
-                final File file = new File(this.currentDirectory.getAbsolutePath() + directoryEntries.get(this.listItemIndex.position));
+                final File file = new File(currentDirectory.getAbsolutePath() + directoryEntries.get(listItemIndex.position));
                 final File file2 = currentDirectory;
                 C22354 r2 = new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
@@ -166,7 +166,7 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
                     break;
                 }
             case 2:
-                final File file3 = new File(this.currentDirectory.getAbsolutePath() + directoryEntries.get(this.listItemIndex.position));
+                final File file3 = new File(currentDirectory.getAbsolutePath() + directoryEntries.get(listItemIndex.position));
                 final File file4 = currentDirectory;
                 AlertDialog.Builder builder = new AlertDialog.Builder(this);
                 final EditText editText = new EditText(this);
@@ -309,7 +309,7 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
     }
 
     private void browseToRoot() {
-        browseTo(new File(this.TopPath));
+        browseTo(new File(TopPath));
     }
 
     private boolean upOneLevel() {
@@ -320,7 +320,7 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
         if (!new File(parent).canRead()) {
             return false;
         }
-        browseTo(this.currentDirectory.getParentFile());
+        browseTo(currentDirectory.getParentFile());
         return true;
     }
 
@@ -436,19 +436,19 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
                     }
                 }
             }
-            Collections.sort(this.directoryEntries, new StringComparator());
-            Collections.sort(this.directotyEntries_new_v2, new IconifiedText());
+            Collections.sort(directoryEntries, new StringComparator());
+            Collections.sort(directotyEntries_new_v2, new IconifiedText());
         }
-        setTitle(this.currentDirectory.getAbsolutePath());
+        setTitle(currentDirectory.getAbsolutePath());
         Log.v("getparent", currentDirectory.getParent());
-        if (!this.currentDirectory.getParent().equals(this.RootPath)) {
+        if (!this.currentDirectory.getParent().equals(RootPath)) {
             Log.v("compare", "not equals");
             Log.v("getparent currentDirectory", currentDirectory.getParent());
             directoryEntries.add(0, "..");
             directotyEntries_new_v2.add(0, new IconifiedText("..", getResources().getDrawable(R.drawable.parent_folder), true));
         }
         IconifiedTextListAdapter iconifiedTextListAdapter = new IconifiedTextListAdapter(this);
-        iconifiedTextListAdapter.setListItems(this.directotyEntries_new_v2);
+        iconifiedTextListAdapter.setListItems(directotyEntries_new_v2);
         list.setAdapter(iconifiedTextListAdapter);
     }
 
@@ -475,11 +475,11 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
         String str = directoryEntries.get(i);
         Log.v(BoxRequestsMetadata.UpdateItemMetadata.BoxMetadataUpdateTask.PATH, str);
         if (str.equals(CommonDefine.DOT)) {
-            browseTo(new File(this.TopPath));
+            browseTo(new File(TopPath));
         } else if (str.equals("..")) {
             upOneLevel();
         } else if (!str.startsWith(CommonDefine.DOT)) {
-            browseTo(new File(this.currentDirectory.getAbsolutePath() + CommonDefine.SLASH + directotyEntries_new_v2.get(i).getText()));
+            browseTo(new File(currentDirectory.getAbsolutePath() + CommonDefine.SLASH + directotyEntries_new_v2.get(i).getText()));
         }
     }
 

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

@@ -50,7 +50,7 @@ public class ConvertProgressActivity extends AppCompatActivity implements Conver
             finish();
             return;
         }
-        int checkFileSize = GdataConvert.checkFileSize(this.mLocalOfficePath);
+        int checkFileSize = GdataConvert.checkFileSize(mLocalOfficePath);
         if (checkFileSize != 100) {
             setResult(checkFileSize);
             finish();
@@ -75,7 +75,7 @@ public class ConvertProgressActivity extends AppCompatActivity implements Conver
             return false;
         }
         mLocalOfficePath = intent.getStringExtra(CommonDefine.FILE_NAME);
-        if (this.mLocalOfficePath != null) {
+        if (mLocalOfficePath != null) {
             return true;
         }
         return false;

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

@@ -35,13 +35,13 @@ public class Alt2ViewImageAdapter extends BaseAdapter implements CommonDefine {
     public Alt2ViewImageAdapter(ImageGridFragment imageGridFragment) {
         mFragmentReference = new WeakReference<>(imageGridFragment);
         mContext = imageGridFragment.getActivity();
-        mLayoutInflater = LayoutInflater.from(this.mContext);
+        mLayoutInflater = LayoutInflater.from(mContext);
         mLayoutParams = new AbsListView.LayoutParams(-1, -1);
         BitmapFactory.Options options = new BitmapFactory.Options();
         options.inPurgeable = true;
         options.inScaled = false;
         try {
-            mSelectPictureBitmap = BitmapFactory.decodeResource(this.mContext.getResources(), R.drawable.select_picture, options);
+            mSelectPictureBitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.select_picture, options);
         } catch (OutOfMemoryError e) {
             EPLog.e(TAG, "BitmapFactory.decodeResource Error " + e.getMessage());
         }
@@ -56,10 +56,10 @@ public class Alt2ViewImageAdapter extends BaseAdapter implements CommonDefine {
         int i2 = 0;
         if (view == null) {
             view = mLayoutInflater.inflate(R.layout.grid_item_imgsel, viewGroup, false);
-            view.setLayoutParams(this.mLayoutParams);
+            view.setLayoutParams(mLayoutParams);
         }
         ImageView imageView = (ImageView) view.findViewById(R.id.imageThumbnail);
-        if (this.mImageItemList.size() < 0 || mImageItemList.size() <= i) {
+        if (mImageItemList.size() < 0 || mImageItemList.size() <= i) {
             imageItem = null;
         } else {
             try {

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

@@ -162,7 +162,7 @@ public class BitmapCache {
     }
 
     private synchronized void deleteNoEntryCacheFile() {
-        if (this.mCacheDirectory == null) {
+        if (mCacheDirectory == null) {
             Set<File> keySet = mCacheFileInfoMap.keySet();
             HashSet hashSet = new HashSet(keySet.size());
             for (File file : keySet) {
@@ -177,8 +177,8 @@ public class BitmapCache {
     }
 
     public synchronized void trimToSize() {
-        while (this.mTotalCacheSize > mCacheSizeLimit) {
-            removeCacheFile(this.mCacheFileInfoMap.keySet().iterator().next());
+        while (mTotalCacheSize > mCacheSizeLimit) {
+            removeCacheFile(mCacheFileInfoMap.keySet().iterator().next());
         }
     }
 
@@ -196,7 +196,7 @@ public class BitmapCache {
     private synchronized void clearCacheFileInfoMap() {
         mCacheFileInfoMap.clear();
         mTotalCacheSize = 0;
-        if (this.mCacheDirectory != null) {
+        if (mCacheDirectory != null) {
             for (File delete : mCacheDirectory.listFiles()) {
                 delete.delete();
             }
@@ -276,7 +276,7 @@ public class BitmapCache {
     }
 
     private File getJournalFile() {
-        return new File(this.mCacheDirectory, JOURNAL_FILE_NAME);
+        return new File(mCacheDirectory, JOURNAL_FILE_NAME);
     }
 
     public synchronized Bitmap getBitmap(File file) {

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

@@ -27,7 +27,7 @@ class ImageFindTask extends AsyncTask<ImageFinder, List<ImageItem>, Void> implem
             return null;
         }
         ImageFinder imageFinder = imageFinderArr[0];
-        if (!(isCancelled() || imageFinder == null || (imageGridFragment = (ImageGridFragment) 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(mFolderPath, getResolver(), this)) == null)) {
             ArrayList arrayList = new ArrayList();
             for (ImageFileInfo next : findImageInDirectory) {
                 if (isCancelled()) {

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

@@ -43,7 +43,7 @@ public class ImageFolderAdapter extends BaseAdapter {
             return view;
         }
         textView.setText(new File(folderInfoAndThumbnail.mImageFolderInfo.mCanonicalName).getName());
-        ((TextView) view.findViewById(R.id.imageVolumeText)).setText(this.mResources.getString(R.string.memcard_file_num_format, new Object[]{Integer.valueOf(folderInfoAndThumbnail.mImageFolderInfo.getImageCount())}));
+        ((TextView) view.findViewById(R.id.imageVolumeText)).setText(mResources.getString(R.string.memcard_file_num_format, new Object[]{Integer.valueOf(folderInfoAndThumbnail.mImageFolderInfo.getImageCount())}));
         ImageView imageView = (ImageView) view.findViewById(R.id.imageView);
         if (folderInfoAndThumbnail.mBitmap != null) {
             imageView.setImageBitmap(folderInfoAndThumbnail.mBitmap);

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

@@ -17,11 +17,11 @@ class ImageFolderInfo {
     }
 
     public boolean addImageLastIfPossible(long j, String str, int i) {
-        if (this.mMiniDatabaseOrder < 0) {
+        if (mMiniDatabaseOrder < 0) {
             mMiniDatabaseOrder = i;
         }
         mImageCount++;
-        if (this.mImageIdList.size() >= 4) {
+        if (mImageIdList.size() >= 4) {
             return false;
         }
         mImageIdList.add(Long.valueOf(j));

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

@@ -25,15 +25,15 @@ public class ImageFolderListFragment extends ListFragment {
     }
 
     public void onListItemClick(ListView listView, View view, int i, long j) {
-        if (this.mAdapter != null) {
-            ((FolderSelectedListener) getActivity()).onFolderSelected(this.mAdapter.getFolderInfo(i));
+        if (mAdapter != null) {
+            ((FolderSelectedListener) getActivity()).onFolderSelected(mAdapter.getFolderInfo(i));
         }
     }
 
     public void onActivityCreated(Bundle bundle) {
         super.onActivityCreated(bundle);
         mAdapter = new ImageFolderAdapter(getActivity());
-        setListAdapter(this.mAdapter);
+        setListAdapter(mAdapter);
     }
 
     public void addItem(ImageFolderInfo imageFolderInfo, Bitmap bitmap) {

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

@@ -80,9 +80,9 @@ public class ImageGridFragment extends Fragment implements AdapterView.OnItemCli
         View inflate = layoutInflater.inflate(R.layout.fragment_image_grid, viewGroup, false);
         mGridView = (GridView) inflate.findViewById(R.id.gridView);
         mAdapter = new Alt2ViewImageAdapter(this);
-        mGridView.setAdapter(this.mAdapter);
+        mGridView.setAdapter(mAdapter);
         mGridView.setOnItemClickListener(this);
-        mGridView.getViewTreeObserver().addOnGlobalLayoutListener(new MyGridLayoutListener(this.mGridView, mAdapter, getActivity().getResources().getDimensionPixelSize(R.dimen.image_selector_grid_thumbnail_spacing)));
+        mGridView.getViewTreeObserver().addOnGlobalLayoutListener(new MyGridLayoutListener(mGridView, mAdapter, getActivity().getResources().getDimensionPixelSize(R.dimen.image_selector_grid_thumbnail_spacing)));
         mImageSelector = ((ImageGridListener) getActivity()).getImageSelector();
         getActivity().invalidateOptionsMenu();
         restartImageFindTask();
@@ -104,7 +104,7 @@ public class ImageGridFragment extends Fragment implements AdapterView.OnItemCli
                 return;
             }
             ImageSelectActivity imageSelectActivity = (ImageSelectActivity) getActivity();
-            if (this.mPhotoSelectionMode != 1 || imageSelectActivity.singleImageMode()) {
+            if (mPhotoSelectionMode != 1 || imageSelectActivity.singleImageMode()) {
                 startViewPagerActivity(i);
             } else if (imageItem.getSelected() != 0 || mImageSelector.canAdd()) {
                 mImageSelector.toggleSelect(imageItem.getPath());
@@ -184,7 +184,7 @@ public class ImageGridFragment extends Fragment implements AdapterView.OnItemCli
                 int count = alt2ViewImageAdapter.getCount();
                 for (int i = 0; i < count; i++) {
                     ImageItem imageItem = mAdapter.getImageItem(i);
-                    imageItem.setSelected(this.mImageSelector.isSelected(imageItem.getPath()) ? 1 : 0);
+                    imageItem.setSelected(mImageSelector.isSelected(imageItem.getPath()) ? 1 : 0);
                 }
                 mAdapter.notifyDataSetChanged();
             }
@@ -248,7 +248,7 @@ public class ImageGridFragment extends Fragment implements AdapterView.OnItemCli
                 mImageThumbnailTask.addLast(next);
             }
             mAdapter.notifyDataSetChanged();
-            if (this.mImageThumbnailTask.getStatus() == AsyncTask.Status.PENDING) {
+            if (mImageThumbnailTask.getStatus() == AsyncTask.Status.PENDING) {
                 mImageThumbnailTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
             }
         }
@@ -320,8 +320,8 @@ public class ImageGridFragment extends Fragment implements AdapterView.OnItemCli
 
         @TargetApi(16)
         private void setNewVerticalParams() {
-            mGridView.setVerticalSpacing(this.mGridView.getHorizontalSpacing());
-            mAdapter.setHeight(this.mGridView.getColumnWidth());
+            mGridView.setVerticalSpacing(mGridView.getHorizontalSpacing());
+            mAdapter.setHeight(mGridView.getColumnWidth());
         }
     }
 }

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

@@ -93,8 +93,8 @@ public class ImageResizer {
             if (bitmap == null) {
                 return bitmap;
             }
-            Bitmap rotateBitmap = rotateBitmap(this.mOrgFile, bitmap);
-            ImageResizer.this.mBitmapCache.addBitmap(this.mOrgFile, rotateBitmap);
+            Bitmap rotateBitmap = rotateBitmap(mOrgFile, bitmap);
+            ImageResizer.this.mBitmapCache.addBitmap(mOrgFile, rotateBitmap);
             return rotateBitmap;
         }
 

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

@@ -245,7 +245,7 @@ public abstract class ImageSelectActivity extends ActivityIACommon implements Im
         private void onOkPressed() {
             ImageSelectActivity imageSelectActivity = (ImageSelectActivity) getActivity();
             if (imageSelectActivity != null) {
-                imageSelectActivity.changeThumbnailCreateMethod(this.mUseMediaStoreThumbnail);
+                imageSelectActivity.changeThumbnailCreateMethod(mUseMediaStoreThumbnail);
             }
         }
     }

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

@@ -12,7 +12,7 @@ public class ImageSelector {
 
     public ImageSelector(ArrayList<String> arrayList) {
         mImageFilenameList = arrayList;
-        if (this.mImageFilenameList == null) {
+        if (mImageFilenameList == null) {
             mImageFilenameList = new ArrayList<>();
         }
     }
@@ -22,7 +22,7 @@ public class ImageSelector {
     }
 
     public boolean toggleSelect(String str) {
-        if (this.mImageFilenameList.contains(str)) {
+        if (mImageFilenameList.contains(str)) {
             mImageFilenameList.remove(str);
             return false;
         } else if (selectedNumber() >= 30) {

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

@@ -48,9 +48,9 @@ public class ImageThumbnailTask extends AsyncTask<Void, ImageItem, Void> impleme
                         bitmap = null;
                     }
                     publishProgress(new ImageItem[]{new ImageItem(bitmap, 0, first.getPath(), first.getDatabaseId())});
-                    if (this.suspend) {
+                    if (suspend) {
                         EPLog.d(TAG, "Enter suspend");
-                        while (this.suspend && !isCancelled()) {
+                        while (suspend && !isCancelled()) {
                             try {
                                 Thread.sleep(1000);
                             } catch (InterruptedException unused) {
@@ -73,8 +73,8 @@ public class ImageThumbnailTask extends AsyncTask<Void, ImageItem, Void> impleme
     }
 
     private synchronized ImageItem getFirst() {
-        if (this.imageItems != null) {
-            if (this.imageItems.size() > 0) {
+        if (imageItems != null) {
+            if (imageItems.size() > 0) {
                 return imageItems.remove(0);
             }
         }
@@ -126,7 +126,7 @@ public class ImageThumbnailTask extends AsyncTask<Void, ImageItem, Void> impleme
     }
 
     private synchronized void addLast(ImageItem imageItem) {
-        if (this.imageItems != null) {
+        if (imageItems != null) {
             imageItems.addLast(imageItem);
         }
     }

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

@@ -63,7 +63,7 @@ public class ImageViewBaseFragment extends Fragment implements ImageResizer.Bitm
 
     public void onActivityCreated(Bundle bundle) {
         super.onActivityCreated(bundle);
-        mLoadTask = ((ImageViewPagerActivity) getActivity()).getImageResizer().load(this.mFileName, this);
+        mLoadTask = ((ImageViewPagerActivity) getActivity()).getImageResizer().load(mFileName, this);
     }
 
     public void onAttach(Context context) {

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

@@ -28,7 +28,7 @@ public class ImageViewMultiSelectFragment extends ImageViewBaseFragment {
         View inflate = layoutInflater.inflate(R.layout.fragment_image_view_multi, viewGroup, false);
         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));
+        mMyToggleButton = new MyToggleButton(this, inflate.findViewById(R.id.myToggle), mListener.getSelector().isSelected(mFileName));
         super.onCreateView(layoutInflater, viewGroup, bundle);
         return inflate;
     }
@@ -36,7 +36,7 @@ public class ImageViewMultiSelectFragment extends ImageViewBaseFragment {
     private void selectImageOnMultiFileMode(boolean z) {
         ImageSelector selector = mListener.getSelector();
         if (!z) {
-            selector.remove(this.mFileName);
+            selector.remove(mFileName);
         } else if (!selector.canAdd()) {
             MyToggleButton myToggleButton = mMyToggleButton;
             if (myToggleButton != null) {
@@ -49,7 +49,7 @@ public class ImageViewMultiSelectFragment extends ImageViewBaseFragment {
                 return;
             }
         } else {
-            selector.add(this.mFileName);
+            selector.add(mFileName);
         }
         getActivity().invalidateOptionsMenu();
     }
@@ -85,7 +85,7 @@ public class ImageViewMultiSelectFragment extends ImageViewBaseFragment {
         public void forceSetChecked(boolean z) {
             mMyToggleChecked = z;
             syncTextState();
-            mToggleImage.setSelected(this.mMyToggleChecked);
+            mToggleImage.setSelected(mMyToggleChecked);
         }
 
         private void setMyChecked(boolean z) {
@@ -98,12 +98,12 @@ public class ImageViewMultiSelectFragment extends ImageViewBaseFragment {
         private void execCallback() {
             ImageViewMultiSelectFragment imageViewMultiSelectFragment = mImageViewMultiSelectFragment;
             if (imageViewMultiSelectFragment != null) {
-                imageViewMultiSelectFragment.selectImageOnMultiFileMode(this.mMyToggleChecked);
+                imageViewMultiSelectFragment.selectImageOnMultiFileMode(mMyToggleChecked);
             }
         }
 
         private void syncTextState() {
-            if (this.mMyToggleChecked) {
+            if (mMyToggleChecked) {
                 mToggleText.setText(R.string.imgsel_view_pager_toggle_on);
             } else {
                 mToggleText.setText(R.string.imgsel_view_pager_toggle_off);

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

@@ -41,7 +41,7 @@ public class ImageViewPagerActivity extends ActivityIACommon implements ImageVie
         setContentView((int) R.layout.activity_temp_image_pager);
         setActionBar("", true);
         getParamsFromIntent(getIntent(), bundle);
-        if (this.mFileList == null) {
+        if (mFileList == null) {
             returnAndRefreshSelection();
             return;
         }
@@ -49,7 +49,7 @@ public class ImageViewPagerActivity extends ActivityIACommon implements ImageVie
         ViewPager viewPager = (ViewPager) findViewById(R.id.pager);
         viewPager.setOffscreenPageLimit(2);
         viewPager.setAdapter(new PagerAdapter(getSupportFragmentManager(), mFileList));
-        viewPager.setCurrentItem(this.mFirstPosition);
+        viewPager.setCurrentItem(mFirstPosition);
     }
 
     private File getCacheDirectory() {
@@ -119,7 +119,7 @@ public class ImageViewPagerActivity extends ActivityIACommon implements ImageVie
         MenuItem findItem = menu.findItem(R.id.action_go_preview);
         int selectedNumber = mImageSelector.selectedNumber();
         findItem.setEnabled(selectedNumber > 0);
-        if (this.mSingleFileMode) {
+        if (mSingleFileMode) {
             setTitle("");
             findItem.setVisible(false);
         } else {
@@ -179,7 +179,7 @@ public class ImageViewPagerActivity extends ActivityIACommon implements ImageVie
         }
 
         public Fragment getItem(int i) {
-            return ImageViewBaseFragment.newInstance(this.mFileList.get(i), ImageViewPagerActivity.this.mSingleFileMode, ImageViewPagerActivity.this.mMessageType);
+            return ImageViewBaseFragment.newInstance(mFileList.get(i), ImageViewPagerActivity.this.mSingleFileMode, ImageViewPagerActivity.this.mMessageType);
         }
 
         public int getCount() {

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

@@ -54,13 +54,13 @@ public class ImageViewSingleFragment extends ImageViewBaseFragment implements Vi
     private void selectImageOnSingleFileMode() {
         ImageSelector selector = mListener.getSelector();
         selector.clear();
-        if (selector.add(this.mFileName)) {
+        if (selector.add(mFileName)) {
             onSingleModeItemSelected();
         }
     }
 
     private void onSingleModeItemSelected() {
-        if (this.mListener != null) {
+        if (mListener != null) {
             mListener.onSingleModeItemSelected();
         }
     }

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

@@ -65,7 +65,7 @@ public class LocalAlertDialogFragment extends DialogFragment {
         try {
             DialogCallback dialogCallback = (DialogCallback) getActivity();
             if (dialogCallback != null) {
-                dialogCallback.onDialogCallback(this.mDialogCode);
+                dialogCallback.onDialogCallback(mDialogCode);
             }
         } catch (ClassCastException unused) {
         }

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

@@ -53,7 +53,7 @@ public class InkRplnProgressFragment extends Fragment {
     }
 
     private void requestToShowDialogOrFinish() {
-        if (this.mInkReplenishSystem.needsDisplayInvitationDialog(IprintApplication.getInstance())) {
+        if (mInkReplenishSystem.needsDisplayInvitationDialog(IprintApplication.getInstance())) {
             requestToShowDialog();
         } else {
             localFinishActivity();
@@ -93,7 +93,7 @@ public class InkRplnProgressFragment extends Fragment {
     public void onResume() {
         super.onResume();
         mFragmentForeground = true;
-        switch (this.mFragmentStatus) {
+        switch (mFragmentStatus) {
             case 1:
                 localFinishActivity();
                 return;
@@ -128,7 +128,7 @@ public class InkRplnProgressFragment extends Fragment {
         mInkReplenishSystem = new InkReplenishSystem(dependencyBuilder.createPrinterAdapter(), dependencyBuilder.createInkRplnRepository());
         mFragmentForeground = false;
         mFragmentStatus = getFragmentStatusFromSavedInstanceState(bundle);
-        if (this.mFragmentStatus == 0) {
+        if (mFragmentStatus == 0) {
             mInkDeliverySystemTask = new InkDeliverySystemTask();
             mInkDeliverySystemTask.execute(new Void[0]);
         }

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

@@ -51,7 +51,7 @@ public class JumpUrlFragment extends Fragment {
             mFragmentStatus = getFragmentState(bundle);
             mResultUrl = (Uri) bundle.getParcelable(KEY_RESULT_URL);
         }
-        if (this.mFragmentStatus == FragmentStatus.WAITE_THREAD_END) {
+        if (mFragmentStatus == FragmentStatus.WAITE_THREAD_END) {
             DependencyBuilder dependencyBuilder = null;
             Bundle arguments = getArguments();
             if (arguments != null) {
@@ -73,9 +73,9 @@ public class JumpUrlFragment extends Fragment {
     public void onResume() {
         super.onResume();
         mFragmentForeground = true;
-        switch (this.mFragmentStatus) {
+        switch (mFragmentStatus) {
             case WAITE_START_BROWSE_ACTIVITY:
-                requestStartBrowser(this.mResultUrl);
+                requestStartBrowser(mResultUrl);
                 return;
             case WAITE_DIALOG_SHOW:
                 requestShowErrorDialogAndFinishActivity();

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

@@ -65,7 +65,7 @@ public class AdobePdfContainer {
         } else {
             pageCount = adpbeMPSInterface.PDFDocInit(str, str2);
         }
-        switch (this.pageCount) {
+        switch (pageCount) {
             case -2:
                 throw new PasswordException();
             case -1:
@@ -113,12 +113,12 @@ public class AdobePdfContainer {
             int[] iArr = {0, 0, 0, 0};
             ByteBuffer byteBuffer = rawBuffer;
             if (byteBuffer != null) {
-                if (this.adpbeMPSInterface.PDFPageRender(i, i2, i3, 1, byteBuffer, 0, iArr) == 0) {
-                    f385bm.copyPixelsFromBuffer(this.rawBuffer);
+                if (adpbeMPSInterface.PDFPageRender(i, i2, i3, 1, byteBuffer, 0, iArr) == 0) {
+                    f385bm.copyPixelsFromBuffer(rawBuffer);
                     if (i4 != 0) {
                         Matrix matrix = new Matrix();
                         matrix.postRotate((float) i4);
-                        f385bm = Bitmap.createBitmap(this.f385bm, 0, 0, i2, i3, matrix, false);
+                        f385bm = Bitmap.createBitmap(f385bm, 0, 0, i2, i3, matrix, false);
                     }
                 }
                 rawBuffer.clear();
@@ -136,12 +136,12 @@ public class AdobePdfContainer {
         String str;
         EPLog.v(TAG, "getPageBitmapFile() Start");
         if (CountPages() >= i) {
-            String path = new File(ExternalFileUtils.getInstance(this.mContext).getPrintDir(), "tmpPDF.jpg").getPath();
-            if (this.adpbeMPSInterface.PDFPagetoImage(i, path, i2, i3, 0) != 0) {
+            String path = new File(ExternalFileUtils.getInstance(mContext).getPrintDir(), "tmpPDF.jpg").getPath();
+            if (adpbeMPSInterface.PDFPagetoImage(i, path, i2, i3, 0) != 0) {
                 return null;
             }
             if (z) {
-                str = new File(ExternalFileUtils.getInstance(this.mContext).getPrintDir(), "tmpPDF90.jpg").getPath();
+                str = new File(ExternalFileUtils.getInstance(mContext).getPrintDir(), "tmpPDF90.jpg").getPath();
                 new epsonImage().epsmpRotateImage2(path, str);
             } else {
                 str = path;

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

@@ -51,7 +51,7 @@ public class pdfRender implements CommonDefine {
     }
 
     public synchronized void startConvertPage(final int i, final int i2, final int i3) {
-        if (this.backgroundThread == null) {
+        if (backgroundThread == null) {
             mRendererStart = false;
             backgroundThread = new Thread(new Runnable() {
                 public void run() {
@@ -95,7 +95,7 @@ public class pdfRender implements CommonDefine {
                 z = false;
             }
             try {
-                if (this.mPdfFile == null || z) {
+                if (mPdfFile == null || z) {
                     return z;
                 }
                 mTotalPage = mPdfFile.CountPages();
@@ -119,7 +119,7 @@ public class pdfRender implements CommonDefine {
     }
 
     public void convert4Preview(int i) {
-        ExternalFileUtils.getInstance(this.mContext).initPdfDir();
+        ExternalFileUtils.getInstance(mContext).initPdfDir();
         mIsPreviewCon = true;
         if (convertPage(i, DEF_ZOOM_PREVIEW, 0, 1)) {
             Log.d(TAG, "convertPage Preview Finish :" + i);
@@ -128,7 +128,7 @@ public class pdfRender implements CommonDefine {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            if (this.mIsPreviewCon) {
+            if (mIsPreviewCon) {
                 Bundle bundle = new Bundle();
                 bundle.putInt(CommonDefine.CONVERTED_PAGE, i);
                 Message message = new Message();
@@ -138,19 +138,19 @@ public class pdfRender implements CommonDefine {
                 return;
             }
             Log.e(TAG, "Convert Preview NG : mIsPreviewCon = false");
-            ExternalFileUtils.getInstance(this.mContext).initPdfDir();
+            ExternalFileUtils.getInstance(mContext).initPdfDir();
         }
     }
 
     public void convert4Print(int i, int i2) {
-        ExternalFileUtils.getInstance(this.mContext).initPrintDir();
+        ExternalFileUtils.getInstance(mContext).initPrintDir();
         mPrintingCon = true;
         int i3 = 1;
-        while (this.mPrintingCon) {
+        while (mPrintingCon) {
             if (i - 1 <= i2 - 1) {
                 try {
-                    if (this.mPrintingCon) {
-                        ExternalFileUtils.getInstance(this.mContext).initPdfDir();
+                    if (mPrintingCon) {
+                        ExternalFileUtils.getInstance(mContext).initPdfDir();
                         if (convertPage(i, DEF_ZOOM_PRINT, 1, i3)) {
                             mRendererStart = true;
                             i++;
@@ -175,7 +175,7 @@ public class pdfRender implements CommonDefine {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            if (this.mOpenError) {
+            if (mOpenError) {
                 break;
             }
         }
@@ -189,7 +189,7 @@ public class pdfRender implements CommonDefine {
             try {
                 float GetPageSizeX = (float) adobePdfContainer.GetPageSizeX(i);
                 float GetPageSizeY = (float) mPdfFile.GetPageSizeY(i);
-                EPLog.i(TAG, new File(this.mPdfFilename).getName() + " - " + i + CommonDefine.SLASH + mTotalPage + ": " + GetPageSizeX + "x" + GetPageSizeY);
+                EPLog.i(TAG, new File(mPdfFilename).getName() + " - " + i + CommonDefine.SLASH + mTotalPage + ": " + GetPageSizeX + "x" + GetPageSizeY);
                 if (i == 1) {
                     if (GetPageSizeX > GetPageSizeY) {
                         mRotate = true;
@@ -221,7 +221,7 @@ public class pdfRender implements CommonDefine {
                         mUiHandler.sendEmptyMessage(6);
                         return false;
                     }
-                    String pdfDir = ExternalFileUtils.getInstance(this.mContext).getPdfDir();
+                    String pdfDir = ExternalFileUtils.getInstance(mContext).getPdfDir();
                     mConvertedName = new File(pdfDir, CommonDefine.UNDER_BAR + i + ".jpg").getPath();
                     saveImageToJpg(pageBitmap, mConvertedName);
                     pageBitmap.recycle();
@@ -245,7 +245,7 @@ public class pdfRender implements CommonDefine {
 
     @NonNull
     public String getDecodeJpegFilename(int i) {
-        String printDir = ExternalFileUtils.getInstance(this.mContext).getPrintDir();
+        String printDir = ExternalFileUtils.getInstance(mContext).getPrintDir();
         return new File(printDir, CommonDefine.UNDER_BAR + i + ".jpg").getPath();
     }
 
@@ -330,7 +330,7 @@ public class pdfRender implements CommonDefine {
         }
         mPrintingCon = z;
         if (!z) {
-            while (this.backgroundThread != null && backgroundThread.isAlive()) {
+            while (backgroundThread != null && backgroundThread.isAlive()) {
                 try {
                     Thread.sleep(2000);
                     EPLog.d("Convert Preview", "convert4Print shutdown...");

+ 9 - 9
app/src/main/java/epson/print/phlayout/AltRect.java

@@ -32,15 +32,15 @@ public class AltRect {
     }
 
     private int centerX() {
-        return (this.left + right) >> 1;
+        return (left + right) >> 1;
     }
 
     private int centerY() {
-        return (this.top + bottom) >> 1;
+        return (top + bottom) >> 1;
     }
 
     public Rect getRect() {
-        return new Rect(this.left, top, right, bottom);
+        return new Rect(left, top, right, bottom);
     }
 
     public RectF getRectF() {
@@ -55,26 +55,26 @@ public class AltRect {
             return false;
         }
         AltRect altRect = (AltRect) obj;
-        if (this.left == altRect.left && top == altRect.top && right == altRect.right && bottom == altRect.bottom) {
+        if (left == altRect.left && top == altRect.top && right == altRect.right && bottom == altRect.bottom) {
             return true;
         }
         return false;
     }
 
     public int hashCode() {
-        return (((((this.left * 31) + top) * 31) + right) * 31) + bottom;
+        return (((((left * 31) + top) * 31) + right) * 31) + bottom;
     }
 
     public String toString() {
         StringBuilder sb = new StringBuilder(32);
         sb.append("AltRect(");
-        sb.append(this.left);
+        sb.append(left);
         sb.append(PreferencesConstants.COOKIE_DELIMITER);
-        sb.append(this.top);
+        sb.append(top);
         sb.append(PreferencesConstants.COOKIE_DELIMITER);
-        sb.append(this.right);
+        sb.append(right);
         sb.append(PreferencesConstants.COOKIE_DELIMITER);
-        sb.append(this.bottom);
+        sb.append(bottom);
         sb.append(")");
         return sb.toString();
     }

+ 6 - 6
app/src/main/java/epson/print/phlayout/AltRectF.java

@@ -27,7 +27,7 @@ public class AltRectF {
     }
 
     private RectF getRectF() {
-        return new RectF(this.left, top, right, bottom);
+        return new RectF(left, top, right, bottom);
     }
 
     /* access modifiers changed from: package-private */
@@ -44,7 +44,7 @@ public class AltRectF {
             return false;
         }
         AltRectF altRectF = (AltRectF) obj;
-        if (this.left == altRectF.left && top == altRectF.top && right == altRectF.right && bottom == altRectF.bottom) {
+        if (left == altRectF.left && top == altRectF.top && right == altRectF.right && bottom == altRectF.bottom) {
             return true;
         }
         return false;
@@ -57,13 +57,13 @@ public class AltRectF {
     public String toString() {
         StringBuilder sb = new StringBuilder(32);
         sb.append("AltRectF(");
-        sb.append(this.left);
+        sb.append(left);
         sb.append(PreferencesConstants.COOKIE_DELIMITER);
-        sb.append(this.top);
+        sb.append(top);
         sb.append(PreferencesConstants.COOKIE_DELIMITER);
-        sb.append(this.right);
+        sb.append(right);
         sb.append(PreferencesConstants.COOKIE_DELIMITER);
-        sb.append(this.bottom);
+        sb.append(bottom);
         sb.append(")");
         return sb.toString();
     }

+ 6 - 6
app/src/main/java/epson/print/phlayout/BorderedLayoutPosition.java

@@ -88,7 +88,7 @@ public class BorderedLayoutPosition implements ILayoutPosition {
     public void setPaperAndCalcPreviewPosition(Info_paper info_paper, int i, int i2, Point point) {
         int i3 = layout;
         setPaperSizeFromPaperInfo(info_paper);
-        if (this.m3mmWidth <= 0 || m3mmHeight <= 0) {
+        if (m3mmWidth <= 0 || m3mmHeight <= 0) {
             m3mmWidth = 2892;
             m3mmHeight = 4125;
         }
@@ -100,7 +100,7 @@ public class BorderedLayoutPosition implements ILayoutPosition {
     public void calculateLayoutSizeBordered(int i, int i2, Point point) {
         int i3;
         int i4;
-        if ((!this.mIsPaperLandScape || m3mmWidth > m3mmHeight) && (this.mIsPaperLandScape || m3mmWidth <= m3mmHeight)) {
+        if ((!this.mIsPaperLandScape || m3mmWidth > m3mmHeight) && (mIsPaperLandScape || m3mmWidth <= m3mmHeight)) {
             i3 = (int) (((double) i2) * 0.800000011920929d);
             int i5 = m3mmWidth;
             int i6 = m3mmHeight;
@@ -129,15 +129,15 @@ public class BorderedLayoutPosition implements ILayoutPosition {
         altRect.right = altRect.left + i4;
         AltRect altRect2 = mPreview3mmEffectivePrintPosition;
         altRect2.bottom = altRect2.top + i3;
-        point.x = ((this.mPreview3mmEffectivePrintPosition.right - mPreview3mmEffectivePrintPosition.left) / 2) + mPreview3mmEffectivePrintPosition.left;
-        point.y = ((this.mPreview3mmEffectivePrintPosition.bottom - mPreview3mmEffectivePrintPosition.top) / 2) + mPreview3mmEffectivePrintPosition.top;
+        point.x = ((mPreview3mmEffectivePrintPosition.right - mPreview3mmEffectivePrintPosition.left) / 2) + mPreview3mmEffectivePrintPosition.left;
+        point.y = ((mPreview3mmEffectivePrintPosition.bottom - mPreview3mmEffectivePrintPosition.top) / 2) + mPreview3mmEffectivePrintPosition.top;
         float width = ((float) mPreview3mmEffectivePrintPosition.width()) / ((float) m3mmWidth);
         int[] iArr = mPreviewMargin;
         iArr[0] = (int) (((float) mLeftMargin) * width);
         iArr[1] = (int) (((float) mTopMargin) * width);
         iArr[2] = (int) (((float) mRightMargin) * width);
         iArr[3] = (int) (((float) mBottomMargin) * width);
-        if (this.mIsPaperLandScape) {
+        if (mIsPaperLandScape) {
             int i12 = iArr[1];
             iArr[1] = iArr[2];
             iArr[2] = iArr[3];
@@ -149,7 +149,7 @@ public class BorderedLayoutPosition implements ILayoutPosition {
     /* access modifiers changed from: package-private */
     @VisibleForTesting
     public void setPaperSizeFromPaperInfo(Info_paper info_paper) {
-        if (this.layout == 2) {
+        if (layout == 2) {
             m3mmWidth = info_paper.getPaper_width_boder();
             m3mmHeight = info_paper.getPaper_height_boder();
             mLeftMargin = info_paper.getLeftMargin_border();

+ 8 - 8
app/src/main/java/epson/print/phlayout/BorderlessLayoutPosition.java

@@ -33,7 +33,7 @@ class BorderlessLayoutPosition implements ILayoutPosition {
     }
 
     public int getRightMargin() {
-        return (int) (this.mPreviewPrintAreaRect.right - ((float) mPreviewPaperRect.right));
+        return (int) (mPreviewPrintAreaRect.right - ((float) mPreviewPaperRect.right));
     }
 
     public int getTopMargin() {
@@ -41,7 +41,7 @@ class BorderlessLayoutPosition implements ILayoutPosition {
     }
 
     public int getBottomMargin() {
-        return (int) (this.mPreviewPrintAreaRect.bottom - ((float) mPreviewPaperRect.bottom));
+        return (int) (mPreviewPrintAreaRect.bottom - ((float) mPreviewPaperRect.bottom));
     }
 
     public RectF getPreviewImageCircumscribedTargetSize() {
@@ -100,7 +100,7 @@ class BorderlessLayoutPosition implements ILayoutPosition {
 
     public void setPaperAndCalcPreviewPosition(Info_paper info_paper, int i, int i2, Point point) {
         setPaperSizeFromPaperInfo(info_paper);
-        if (this.mPaperWidth <= 0 || mPaperHeight <= 0) {
+        if (mPaperWidth <= 0 || mPaperHeight <= 0) {
             mPaperWidth = 2892;
             mPaperHeight = 4125;
         }
@@ -119,7 +119,7 @@ class BorderlessLayoutPosition implements ILayoutPosition {
         int i9 = i2;
         Point point2 = point;
         int[] iArr = new int[4];
-        if ((!this.mIsPaperLandScape || mPaperWidth > mPaperHeight) && (this.mIsPaperLandScape || mPaperWidth <= mPaperHeight)) {
+        if ((!this.mIsPaperLandScape || mPaperWidth > mPaperHeight) && (mIsPaperLandScape || mPaperWidth <= mPaperHeight)) {
             int i10 = (int) (((double) i9) * 0.800000011920929d);
             int i11 = mPaperWidth;
             int i12 = mPaperHeight;
@@ -176,14 +176,14 @@ class BorderlessLayoutPosition implements ILayoutPosition {
         AltRect altRect2 = mPreviewPaperRect;
         altRect2.bottom = altRect2.top + i3;
         mPreviewPrintAreaRect = new AltRectF();
-        mPreviewPrintAreaRect.left = (float) (this.mPreviewPaperRect.left - iArr[0]);
-        mPreviewPrintAreaRect.top = (float) (this.mPreviewPaperRect.top - iArr[1]);
+        mPreviewPrintAreaRect.left = (float) (mPreviewPaperRect.left - iArr[0]);
+        mPreviewPrintAreaRect.top = (float) (mPreviewPaperRect.top - iArr[1]);
         AltRectF altRectF = mPreviewPrintAreaRect;
         altRectF.right = altRectF.left + ((float) i6);
         AltRectF altRectF2 = mPreviewPrintAreaRect;
         altRectF2.bottom = altRectF2.top + ((float) i5);
-        point2.x = (int) (((this.mPreviewPrintAreaRect.right - mPreviewPrintAreaRect.left) / 2.0f) + mPreviewPrintAreaRect.left);
-        point2.y = (int) (((this.mPreviewPrintAreaRect.bottom - mPreviewPrintAreaRect.top) / 2.0f) + mPreviewPrintAreaRect.top);
+        point2.x = (int) (((mPreviewPrintAreaRect.right - mPreviewPrintAreaRect.left) / 2.0f) + mPreviewPrintAreaRect.left);
+        point2.y = (int) (((mPreviewPrintAreaRect.bottom - mPreviewPrintAreaRect.top) / 2.0f) + mPreviewPrintAreaRect.top);
     }
 
     /* access modifiers changed from: package-private */

+ 4 - 4
app/src/main/java/epson/print/phlayout/CdLayoutPosition.java

@@ -98,7 +98,7 @@ class CdLayoutPosition implements ILayoutPosition {
 
     public void setPaperAndCalcPreviewPosition(Info_paper info_paper, int i, int i2, Point point) {
         setPaperSizeFromPaperInfo(info_paper);
-        if (this.mPaperWidth <= 0 || mPaperHeight <= 0) {
+        if (mPaperWidth <= 0 || mPaperHeight <= 0) {
             mPaperWidth = 2892;
             mPaperHeight = 4125;
         }
@@ -115,14 +115,14 @@ class CdLayoutPosition implements ILayoutPosition {
         altRect.right = altRect.left + i3;
         AltRect altRect2 = mPreviewPrintArea;
         altRect2.bottom = altRect2.top + i3;
-        point.x = ((this.mPreviewPrintArea.right - mPreviewPrintArea.left) / 2) + mPreviewPrintArea.left;
-        point.y = ((this.mPreviewPrintArea.bottom - mPreviewPrintArea.top) / 2) + mPreviewPrintArea.top;
+        point.x = ((mPreviewPrintArea.right - mPreviewPrintArea.left) / 2) + mPreviewPrintArea.left;
+        point.y = ((mPreviewPrintArea.bottom - mPreviewPrintArea.top) / 2) + mPreviewPrintArea.top;
         float width = ((float) mPreviewPrintArea.width()) / ((float) mPaperWidth);
         mTopMargin = (int) (((float) mTopMargin) * width);
         mLeftMargin = (int) (((float) mLeftMargin) * width);
         mRightMargin = (int) (((float) mRightMargin) * width);
         mBottomMargin = (int) (((float) mBottomMargin) * width);
-        if (this.mIsPaperLandScape) {
+        if (mIsPaperLandScape) {
             int i4 = mTopMargin;
             mTopMargin = mRightMargin;
             mRightMargin = mBottomMargin;

+ 38 - 38
app/src/main/java/epson/print/phlayout/PhotoPreview.java

@@ -121,7 +121,7 @@ public class PhotoPreview extends View {
         if (handler != null) {
             handler.sendEmptyMessage(2);
         }
-        adjustTrans(this.trans);
+        adjustTrans(trans);
         invalidate();
     }
 
@@ -138,7 +138,7 @@ public class PhotoPreview extends View {
     private void changeFitMode() {
         if (1 == mLayoutPosition.getLayoutId()) {
             fitCircumscribed();
-        } else if (this.mFitMode == 1) {
+        } else if (mFitMode == 1) {
             fitInscribed();
         } else {
             fitCircumscribed();
@@ -149,14 +149,14 @@ public class PhotoPreview extends View {
     private void fitCircumscribed() {
         scaleFactor = 1.0f;
         baseScaleFactor = 1.0f;
-        setPaper(this.mPaperSizeId);
+        setPaper(mPaperSizeId);
         mFitMode = 1;
     }
 
     private void fitInscribed() {
         EPImage currentEpImage;
         mFitMode = 2;
-        if (this.mLayoutPosition != null && (currentEpImage = getCurrentEpImage()) != null) {
+        if (mLayoutPosition != null && (currentEpImage = getCurrentEpImage()) != null) {
             RectF previewImageCircumscribedTargetSize = mLayoutPosition.getPreviewImageCircumscribedTargetSize();
             double[] fitInscribed = mFitLayout.fitInscribed(new double[]{(double) previewImageCircumscribedTargetSize.left, (double) previewImageCircumscribedTargetSize.top, (double) previewImageCircumscribedTargetSize.right, (double) previewImageCircumscribedTargetSize.bottom}, new double[]{(double) currentEpImage.previewWidth, (double) currentEpImage.previewHeight});
             if (fitInscribed != null) {
@@ -170,14 +170,14 @@ public class PhotoPreview extends View {
 
     @AnyThread
     private EPImage getCurrentEpImage() {
-        if (this.imageNo < 0 || imageNo >= imageList.size()) {
+        if (imageNo < 0 || imageNo >= imageList.size()) {
             return null;
         }
-        return imageList.get(this.imageNo);
+        return imageList.get(imageNo);
     }
 
     private PhotoPreviewImageList.Element getCurrentElement() {
-        return imageList.getElement(this.imageNo);
+        return imageList.getElement(imageNo);
     }
 
     @WorkerThread
@@ -199,8 +199,8 @@ public class PhotoPreview extends View {
 
     public EPImageList getImageList() {
         EPImageList ePImageList;
-        synchronized (this.lockObj) {
-            saveImage(this.imageNo);
+        synchronized (lockObj) {
+            saveImage(imageNo);
             ePImageList = new EPImageList();
             ePImageList.setRenderingMode(1);
             for (int i = 0; i < imageList.size(); i++) {
@@ -252,15 +252,15 @@ public class PhotoPreview extends View {
 
     @WorkerThread
     public void setIsPaperLandscape(boolean z, Activity activity) {
-        synchronized (this.lockObj) {
+        synchronized (lockObj) {
             mLayoutPosition.setPaperLandscape(z);
-            if (this.imageList == null || imageList.size() <= 0) {
-                setPaper(this.mPaperSizeId);
+            if (imageList == null || imageList.size() <= 0) {
+                setPaper(mPaperSizeId);
             } else {
                 scaleFactor = 1.0f;
                 baseScaleFactor = 1.0f;
                 mFitMode = 1;
-                setImage(this.imageNo, 1, activity);
+                setImage(imageNo, 1, activity);
             }
             postInvalidate();
         }
@@ -268,7 +268,7 @@ public class PhotoPreview extends View {
 
     @AnyThread
     public boolean setPaper(int i) {
-        synchronized (this.lockObj) {
+        synchronized (lockObj) {
             mPaperSizeId = i;
             Info_paper infoPaper = Info_paper.getInfoPaper(IprintApplication.getInstance(), mPaperSizeId);
             if (infoPaper == null) {
@@ -286,8 +286,8 @@ public class PhotoPreview extends View {
     @Nullable
     @AnyThread
     private synchronized int[] getViewSize() {
-        if (this.mViewSize[0] > 0) {
-            if (this.mViewSize[1] > 0) {
+        if (mViewSize[0] > 0) {
+            if (mViewSize[1] > 0) {
                 return mViewSize;
             }
         }
@@ -305,14 +305,14 @@ public class PhotoPreview extends View {
 
     @AnyThread
     public void invalidateImageNo() {
-        if (this.imageList != null) {
+        if (imageList != null) {
             imageNo = -1;
         }
     }
 
     public void invalidatePreview() {
-        if (this.imageList != null) {
-            synchronized (this.lockObj) {
+        if (imageList != null) {
+            synchronized (lockObj) {
                 for (int i = 0; i < imageList.size(); i++) {
                     imageList.get(i).previewImageFileName = null;
                 }
@@ -443,7 +443,7 @@ public class PhotoPreview extends View {
     private void setImageCore(int i, int i2) throws Exception {
         if (i < 0 || i >= imageList.size()) {
             throw new Exception();
-        } else if (this.imageNo < 0 || imageNo >= imageList.size() || saveImage(this.imageNo)) {
+        } else if (imageNo < 0 || imageNo >= imageList.size() || saveImage(imageNo)) {
             imageNo = i;
             PhotoPreviewImageList.Element currentElement = getCurrentElement();
             EPImage currentEpImage = getCurrentEpImage();
@@ -463,9 +463,9 @@ public class PhotoPreview extends View {
             mLayoutPosition.setPaperLandscape(ePImage.srcWidth > ePImage.srcHeight);
             fitCircumscribed();
         } else {
-            setPaper(this.mPaperSizeId);
+            setPaper(mPaperSizeId);
         }
-        if (this.mLayoutPosition.isPreviewImageSizeValid()) {
+        if (mLayoutPosition.isPreviewImageSizeValid()) {
             RectF previewImageCircumscribedTargetSize = mLayoutPosition.getPreviewImageCircumscribedTargetSize();
             mBitmap = localGetPreviewBitmap(ePImage, (int) previewImageCircumscribedTargetSize.width(), (int) previewImageCircumscribedTargetSize.height(), color, true, !z);
             return;
@@ -477,7 +477,7 @@ public class PhotoPreview extends View {
     private void setImageCore_RestorePreview(@NonNull PhotoPreviewImageList.Element element) throws Exception {
         restoreImage(element);
         reCalcPaperPosition();
-        if (this.mLayoutPosition.isPreviewImageSizeValid()) {
+        if (mLayoutPosition.isPreviewImageSizeValid()) {
             RectF previewImageCircumscribedTargetSize = mLayoutPosition.getPreviewImageCircumscribedTargetSize();
             mBitmap = localGetPreviewBitmap(element.getEPImage(), (int) previewImageCircumscribedTargetSize.width(), (int) previewImageCircumscribedTargetSize.height(), color, false, true);
             return;
@@ -487,7 +487,7 @@ public class PhotoPreview extends View {
 
     @WorkerThread
     private Bitmap localGetPreviewBitmap(EPImage ePImage, int i, int i2, int i3, boolean z, boolean z2) {
-        if (this.mPreviewBitmapMaker != null && z2) {
+        if (mPreviewBitmapMaker != null && z2) {
             mBitmap = mPreviewBitmapMaker.getPreviewBitmap(ePImage, i, i2, i3, z);
             Bitmap bitmap = mBitmap;
             if (bitmap != null) {
@@ -495,7 +495,7 @@ public class PhotoPreview extends View {
             }
         }
         mBitmap = getBitmap(ePImage, i, i2, i3, z);
-        if (this.mBitmap == null) {
+        if (mBitmap == null) {
             return null;
         }
         Log.i(LOG_TAG, "bitmap <" + mBitmap.getWidth() + PreferencesConstants.COOKIE_DELIMITER + mBitmap.getHeight() + "> preview WxH <" + ePImage.previewWidth + PreferencesConstants.COOKIE_DELIMITER + ePImage.previewHeight + ">");
@@ -513,14 +513,14 @@ public class PhotoPreview extends View {
             ePImage.previewImageRectCenterX = trans.x;
             ePImage.previewImageRectCenterY = trans.y;
             mLayoutPosition.copyPreviewPrintAreaToEpImage(ePImage);
-            RectF calcPreviewImageRect = calcPreviewImageRect(this.mBitmap, scaleFactor, trans);
+            RectF calcPreviewImageRect = calcPreviewImageRect(mBitmap, scaleFactor, trans);
             ePImage.previewImageRectLeft = calcPreviewImageRect.left;
             ePImage.previewImageRectTop = calcPreviewImageRect.top;
             ePImage.previewImageRectRight = calcPreviewImageRect.right;
             ePImage.previewImageRectBottom = calcPreviewImageRect.bottom;
             ePImage.scaleFactor = scaleFactor;
             imageList.set(i, ePImage);
-            element.setFitMode(this.mFitMode);
+            element.setFitMode(mFitMode);
             return true;
         } catch (IndexOutOfBoundsException unused) {
             return false;
@@ -559,19 +559,19 @@ public class PhotoPreview extends View {
 
     private void onMoving(float f, float f2) {
         mFitMode = 0;
-        if (this.mBitmap != null) {
+        if (mBitmap != null) {
             Point point = trans;
             point.x = (int) ((-f) + ((float) point.x));
             Point point2 = trans;
             point2.y = (int) ((-f2) + ((float) point2.y));
-            adjustTrans(this.trans);
+            adjustTrans(trans);
             invalidate();
         }
     }
 
     private void adjustTrans(@NonNull Point point) {
-        synchronized (this.lockObj) {
-            if (this.mLayoutPosition != null) {
+        synchronized (lockObj) {
+            if (mLayoutPosition != null) {
                 RectF previewImageCircumscribedTargetSize = mLayoutPosition.getPreviewImageCircumscribedTargetSize();
                 EPImage currentEpImage = getCurrentEpImage();
                 if (currentEpImage != null) {
@@ -616,25 +616,25 @@ public class PhotoPreview extends View {
 
     public void onDraw(Canvas canvas) {
         super.onDraw(canvas);
-        if (this.mDrawLock.tryLock()) {
+        if (mDrawLock.tryLock()) {
             try {
-                synchronized (this.lockObj) {
+                synchronized (lockObj) {
                     if (!canvas.isHardwareAccelerated()) {
-                        if (this.maxBitmapWidth > 0 && maxBitmapHeight > 0) {
+                        if (maxBitmapWidth > 0 && maxBitmapHeight > 0) {
                             maxBitmapWidth = -1;
                             maxBitmapHeight = -1;
                         }
-                    } else if (this.maxBitmapWidth < 0 || maxBitmapHeight < 0) {
+                    } else if (maxBitmapWidth < 0 || maxBitmapHeight < 0) {
                         maxBitmapWidth = canvas.getMaximumBitmapWidth();
                         maxBitmapHeight = canvas.getMaximumBitmapHeight();
                     }
-                    RectF calcPreviewImageRect = mBitmap != null ? calcPreviewImageRect(this.mBitmap, scaleFactor, trans) : null;
-                    if (this.mLayoutPosition.getLayoutId() == 4) {
+                    RectF calcPreviewImageRect = mBitmap != null ? calcPreviewImageRect(mBitmap, scaleFactor, trans) : null;
+                    if (mLayoutPosition.getLayoutId() == 4) {
                         drawCdPreviewAll(canvas, paint, mBitmap, mLayoutPosition, mBitmapDrawRect, maskExpandPreview, mPath, getResources().getColor(R.color.background_preview), calcPreviewImageRect);
                     } else {
                         drawPreview(canvas, paint, mBitmap, mLayoutPosition, mBitmapDrawRect, maskExpandPreview, getResources().getColor(R.color.background_preview), new int[]{getWidth(), getHeight()}, calcPreviewImageRect);
                     }
-                    if (this.drawEndHandler != null) {
+                    if (drawEndHandler != null) {
                         Message message = new Message();
                         message.what = 4;
                         message.arg1 = imageNo;

+ 3 - 3
app/src/main/java/epson/print/phlayout/PhotoPreviewImageList.java

@@ -107,15 +107,15 @@ public class PhotoPreviewImageList {
         }
 
         public EPImage getEPImage() {
-            return PhotoPreviewImageList.this.get(this.mIndex);
+            return PhotoPreviewImageList.this.get(mIndex);
         }
 
         public void setFitMode(int i) {
-            ((LayoutInfo) PhotoPreviewImageList.this.mLayoutInfoList.get(this.mIndex)).fitMode = i;
+            ((LayoutInfo) PhotoPreviewImageList.this.mLayoutInfoList.get(mIndex)).fitMode = i;
         }
 
         public int getFitMode() {
-            return ((LayoutInfo) PhotoPreviewImageList.this.mLayoutInfoList.get(this.mIndex)).fitMode;
+            return ((LayoutInfo) PhotoPreviewImageList.this.mLayoutInfoList.get(mIndex)).fitMode;
         }
     }
 

+ 63 - 63
app/src/main/java/epson/print/rpcopy/ActivityBase.java

@@ -86,16 +86,16 @@ class ActivityBase extends ActivityIACommon {
 
         private Dialog createCancelDialog() {
             AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-            builder.setMessage(ActivityBase.this.getString(R.string.str_msg_scan_cancel));
+            builder.setMessage(getString(R.string.str_msg_scan_cancel));
             builder.setCancelable(false);
-            builder.setPositiveButton(ActivityBase.this.getString(R.string.str_yes), new DialogInterface.OnClickListener() {
+            builder.setPositiveButton(getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
                     WheelDialog.this.cancelButton.setEnabled(false);
                     WheelDialog.this.cancelCallback.onCancelRequest();
                     dialogInterface.cancel();
                 }
             });
-            builder.setNegativeButton(ActivityBase.this.getString(R.string.str_no), new DialogInterface.OnClickListener() {
+            builder.setNegativeButton(getString(R.string.str_no), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
                     WheelDialog.this.cancelButton.setEnabled(true);
                     dialogInterface.cancel();
@@ -164,24 +164,24 @@ class ActivityBase extends ActivityIACommon {
         }
 
         private void showErrorDialog(int i) {
-            showErrorDialog((String) null, ActivityBase.this.getString(i));
+            showErrorDialog((String) null, getString(i));
         }
 
         private void showErrorDialog(String str, String str2, final DialogButtons dialogButtons, final IClose iClose) {
             String str3;
-            CustomTitleAlertDialogBuilder customTitleAlertDialogBuilder = new CustomTitleAlertDialogBuilder(this.context);
+            CustomTitleAlertDialogBuilder customTitleAlertDialogBuilder = new CustomTitleAlertDialogBuilder(context);
             String str4 = null;
             switch (dialogButtons) {
                 case Ok:
-                    str4 = ActivityBase.this.getString(R.string.str_ok);
+                    str4 = getString(R.string.str_ok);
                     str3 = null;
                     break;
                 case Cancel:
-                    str3 = ActivityBase.this.getString(R.string.str_cancel);
+                    str3 = getString(R.string.str_cancel);
                     break;
                 case ClearErrorCancel:
-                    str4 = ActivityBase.this.getString(R.string.str_continue);
-                    str3 = ActivityBase.this.getString(R.string.str_cancel);
+                    str4 = getString(R.string.str_continue);
+                    str3 = getString(R.string.str_cancel);
                     break;
                 default:
                     str3 = null;
@@ -229,20 +229,20 @@ class ActivityBase extends ActivityIACommon {
             String[] strArr = new String[2];
             switch (copyTaskResult) {
                 case ErrorCommunication:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_COMM_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.CopyCommErrorText);
+                    strArr[0] = getString(R.string.EPS_PRNERR_COMM_TITLE);
+                    strArr[1] = getString(R.string.CopyCommErrorText);
                     break;
                 case Busy:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNST_BUSY_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.EPS_PRNST_BUSY_MSG);
+                    strArr[0] = getString(R.string.EPS_PRNST_BUSY_TITLE);
+                    strArr[1] = getString(R.string.EPS_PRNST_BUSY_MSG);
                     break;
                 case RemoveAdfPaper:
-                    strArr[0] = ActivityBase.this.getString(R.string.CopyTaskResultRemoveAdfPaperTitle);
-                    strArr[1] = ActivityBase.this.getString(R.string.CopyTaskResultRemoveAdfPaper);
+                    strArr[0] = getString(R.string.CopyTaskResultRemoveAdfPaperTitle);
+                    strArr[1] = getString(R.string.CopyTaskResultRemoveAdfPaper);
                     break;
                 case ErrorOther:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_GENERAL_ERR);
-                    strArr[1] = ActivityBase.this.getString(R.string.CopyTaskResultErrorOtherText);
+                    strArr[0] = getString(R.string.EPS_PRNERR_GENERAL_ERR);
+                    strArr[1] = getString(R.string.CopyTaskResultErrorOtherText);
                     break;
             }
             return strArr;
@@ -252,13 +252,13 @@ class ActivityBase extends ActivityIACommon {
             String[] strArr = new String[2];
             switch (contextCreationError) {
                 case ErrorCommunication:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_COMM_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.EPS_PRNERR_COMM5);
+                    strArr[0] = getString(R.string.EPS_PRNERR_COMM_TITLE);
+                    strArr[1] = getString(R.string.EPS_PRNERR_COMM5);
                     break;
                 case ErrorNotCopySupported:
                 case Error:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_GENERAL_ERR);
-                    strArr[1] = ActivityBase.this.getString(R.string.CopyTaskResultErrorOtherText);
+                    strArr[0] = getString(R.string.EPS_PRNERR_GENERAL_ERR);
+                    strArr[1] = getString(R.string.CopyTaskResultErrorOtherText);
                     break;
             }
             return strArr;
@@ -268,13 +268,13 @@ class ActivityBase extends ActivityIACommon {
             String[] strArr = new String[2];
             switch (copyOptionChangedError) {
                 case ErrorCommunication:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_COMM_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.EPS_PRNERR_COMM5);
+                    strArr[0] = getString(R.string.EPS_PRNERR_COMM_TITLE);
+                    strArr[1] = getString(R.string.EPS_PRNERR_COMM5);
                     break;
                 case ErrorInvalidOption:
                 case Error:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_GENERAL_ERR);
-                    strArr[1] = ActivityBase.this.getString(R.string.CopyTaskResultErrorOtherText);
+                    strArr[0] = getString(R.string.EPS_PRNERR_GENERAL_ERR);
+                    strArr[1] = getString(R.string.CopyTaskResultErrorOtherText);
                     break;
             }
             return strArr;
@@ -284,40 +284,40 @@ class ActivityBase extends ActivityIACommon {
             String[] strArr = new String[2];
             switch (stopReason) {
                 case PrinterMarkerSupplyEmptyError:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_INKOUT_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.EPS_PRNERR_INKOUT_MSG);
+                    strArr[0] = getString(R.string.EPS_PRNERR_INKOUT_TITLE);
+                    strArr[1] = getString(R.string.EPS_PRNERR_INKOUT_MSG);
                     break;
                 case PrinterMarkerWasteFullError:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_WEB_REMOTE_MAINTENANCE_BOX_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.EPS_PRNERR_WEB_REMOTE_MAINTENANCE_BOX_MSG);
+                    strArr[0] = getString(R.string.EPS_PRNERR_WEB_REMOTE_MAINTENANCE_BOX_TITLE);
+                    strArr[1] = getString(R.string.EPS_PRNERR_WEB_REMOTE_MAINTENANCE_BOX_MSG);
                     break;
                 case PrinterMediaJamError:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_PAPERJAM_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.CopyPaperJamErrorText);
+                    strArr[0] = getString(R.string.EPS_PRNERR_PAPERJAM_TITLE);
+                    strArr[1] = getString(R.string.CopyPaperJamErrorText);
                     break;
                 case PrinterMediaEmptyError:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_PAPEROUT_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.EPS_PRNERR_PAPEROUT_MSG);
+                    strArr[0] = getString(R.string.EPS_PRNERR_PAPEROUT_TITLE);
+                    strArr[1] = getString(R.string.EPS_PRNERR_PAPEROUT_MSG);
                     break;
                 case ManualfeedGuide:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_MANUALFEED_SET_PAPER_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.EPS_PRNERR_MANUALFEED_SET_PAPER_MSG);
+                    strArr[0] = getString(R.string.EPS_PRNERR_MANUALFEED_SET_PAPER_TITLE);
+                    strArr[1] = getString(R.string.EPS_PRNERR_MANUALFEED_SET_PAPER_MSG);
                     break;
                 case PrinterCoverOpenError:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_COVEROPEN_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.EPS_PRNERR_COVEROPEN_MSG);
+                    strArr[0] = getString(R.string.EPS_PRNERR_COVEROPEN_TITLE);
+                    strArr[1] = getString(R.string.EPS_PRNERR_COVEROPEN_MSG);
                     break;
                 case PrinterOutputAreaFullError:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_CDRGUIDEOPEN_TITLE);
-                    strArr[1] = ActivityBase.this.getString(R.string.CopyCDdiscErrorText);
+                    strArr[0] = getString(R.string.EPS_PRNERR_CDRGUIDEOPEN_TITLE);
+                    strArr[1] = getString(R.string.CopyCDdiscErrorText);
                     break;
                 case PrinterOtherError:
-                    strArr[0] = ActivityBase.this.getString(R.string.EPS_PRNERR_GENERAL_ERR);
-                    strArr[1] = ActivityBase.this.getString(R.string.CopyTaskResultErrorOtherText);
+                    strArr[0] = getString(R.string.EPS_PRNERR_GENERAL_ERR);
+                    strArr[1] = getString(R.string.CopyTaskResultErrorOtherText);
                     break;
                 case ScannerOtherError:
-                    strArr[0] = ActivityBase.this.getString(R.string.str_err_msg_scan_generic_internal_title);
-                    strArr[1] = ActivityBase.this.getString(R.string.str_err_msg_scan_generic_internal);
+                    strArr[0] = getString(R.string.str_err_msg_scan_generic_internal_title);
+                    strArr[1] = getString(R.string.str_err_msg_scan_generic_internal);
                     break;
             }
             return strArr;
@@ -380,7 +380,7 @@ class ActivityBase extends ActivityIACommon {
         private String[] getKeyArray() {
             String[] strArr = new String[this.choices.size()];
             for (int i = 0; i < choices.size(); i++) {
-                strArr[i] = ActivityBase.this.getDisplayString(this.choices.get(i).name());
+                strArr[i] = getDisplayString(choices.get(i).name());
             }
             return strArr;
         }
@@ -398,11 +398,11 @@ class ActivityBase extends ActivityIACommon {
 
         private void updateWithAddition(int i) {
             try {
-                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) {
-                    changedListener.onOptionItemChanged(this.optionItem);
+                value = Integer.valueOf(editText.getText().toString()).intValue();
+                value = Math.min(Math.max(optionItem.getMinimumValue(), value + i), optionItem.getMaximumValue());
+                optionItem.selectValue(value);
+                if (changedListener != null) {
+                    changedListener.onOptionItemChanged(optionItem);
                 }
             } catch (NumberFormatException unused) {
             }
@@ -416,7 +416,7 @@ class ActivityBase extends ActivityIACommon {
             }
 
             public void onClick(View view) {
-                NumberOptionValue.this.updateWithAddition(this.amount);
+                NumberOptionValue.this.updateWithAddition(amount);
             }
         }
 
@@ -427,16 +427,16 @@ class ActivityBase extends ActivityIACommon {
 
         private void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
             optionItem = eCopyOptionItem;
-            editText = (TextView) ActivityBase.this.findViewById(i);
+            editText = (TextView) findViewById(i);
             value = eCopyOptionItem.getSelectedValue();
-            editText.setText(String.valueOf(this.value));
+            editText.setText(String.valueOf(value));
             editText.setEnabled(eCopyOptionItem.isEnabled());
         }
 
         private void bindCountUp(int i) {
-            countUp = (Button) ActivityBase.this.findViewById(i);
+            countUp = (Button) findViewById(i);
             countUp.setOnClickListener(new Counter(1));
-            if (this.value == optionItem.getMaximumValue()) {
+            if (value == optionItem.getMaximumValue()) {
                 countUp.setEnabled(false);
             } else {
                 countUp.setEnabled(true);
@@ -444,9 +444,9 @@ class ActivityBase extends ActivityIACommon {
         }
 
         private void bindCountDown(int i) {
-            countDown = (Button) ActivityBase.this.findViewById(i);
+            countDown = (Button) findViewById(i);
             countDown.setOnClickListener(new Counter(-1));
-            if (this.value == optionItem.getMinimumValue()) {
+            if (value == optionItem.getMinimumValue()) {
                 countDown.setEnabled(false);
             } else {
                 countDown.setEnabled(true);
@@ -473,7 +473,7 @@ class ActivityBase extends ActivityIACommon {
         }
 
         private SharedPreferences getPreferences() {
-            return ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_REPEAT_COPY, 0);
+            return getSharedPreferences(CommonDefine.PREFS_INFO_REPEAT_COPY, 0);
         }
 
         private String loadPrePrinter() {
@@ -489,7 +489,7 @@ class ActivityBase extends ActivityIACommon {
         }
 
         private void setCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
-            ECopyOptionContext bindedCopyOptionContext = ActivityBase.this.copyComponent.getBindedCopyOptionContext();
+            ECopyOptionContext bindedCopyOptionContext = copyComponent.getBindedCopyOptionContext();
             Iterator<ECopyOptionItem> it = arrayList.iterator();
             while (it.hasNext()) {
                 ECopyOptionItem next = it.next();
@@ -501,18 +501,18 @@ class ActivityBase extends ActivityIACommon {
             }
             Iterator<ECopyOptionItem> it2 = arrayList.iterator();
             while (it2.hasNext()) {
-                ActivityBase.this.copyComponent.setCopyOptionItem(it2.next());
+                copyComponent.setCopyOptionItem(it2.next());
             }
         }
 
         private void setOption(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey, ECopyOptionItem eCopyOptionItem) {
             presettings = getPreferences();
             if (eCopyOptionItem.getChoiceType() != ECopyOptionItem.ECopyOptionItemChoiceType.ChoiceArray) {
-                eCopyOptionItem.selectValue(this.presettings.getInt(eCopyOptionItemKey.name(), eCopyOptionItem.getDefaultValue()));
+                eCopyOptionItem.selectValue(presettings.getInt(eCopyOptionItemKey.name(), eCopyOptionItem.getDefaultValue()));
             } else if (eCopyOptionItem.getDefaultChoice() == null || eCopyOptionItem.getDefaultChoice().getParam() == null) {
                 throw new RuntimeException("key: <" + eCopyOptionItem.getKey() + "> error");
             } else {
-                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(presettings.getString(eCopyOptionItemKey.name(), eCopyOptionItem.getDefaultChoice().getParam().toString()))));
             }
         }
 
@@ -531,14 +531,14 @@ class ActivityBase extends ActivityIACommon {
         private void saveOption(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey, ECopyOptionItem eCopyOptionItem) {
             presettings = getPreferences();
             if (eCopyOptionItem.getChoiceType() == ECopyOptionItem.ECopyOptionItemChoiceType.ChoiceArray) {
-                String access$000 = ActivityBase.this.TAG;
+                String access$000 = TAG;
                 EPLog.i(access$000, "cursetting:" + eCopyOptionItem.getSelectedChoice().name());
                 editer = presettings.edit();
                 editer.putString(eCopyOptionItemKey.name(), eCopyOptionItem.getSelectedChoice().getParam().toString());
                 editer.commit();
                 return;
             }
-            String access$0002 = ActivityBase.this.TAG;
+            String access$0002 = TAG;
             EPLog.i(access$0002, "cursetting:" + String.valueOf(eCopyOptionItem.getSelectedValue()));
             editer = presettings.edit();
             editer.putInt(eCopyOptionItemKey.name(), eCopyOptionItem.getSelectedValue());

+ 4 - 4
app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/ECopyComponent.java

@@ -211,7 +211,7 @@ public final class ECopyComponent {
     }
 
     public ECopyOptionContext getBindedCopyOptionContext() {
-        if (this.optionContext.isNull()) {
+        if (optionContext.isNull()) {
             return null;
         }
         return optionContext;
@@ -243,10 +243,10 @@ public final class ECopyComponent {
     }
 
     protected ICopyCancelRequest execute(ITask iTask) {
-        iTask.setSystemSettings(this.systemSettings);
+        iTask.setSystemSettings(systemSettings);
         iTask.setRequestConnectionTimeout(((Integer) properties.get(Property.RequestConnectionTimeout)).intValue());
-        iTask.setClientID(this.clientID);
-        iTask.setOptionContext(this.optionContext);
+        iTask.setClientID(clientID);
+        iTask.setOptionContext(optionContext);
         return iTask.start();
     }
 }

+ 3 - 3
app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/ECopyOptionContext.java

@@ -31,13 +31,13 @@ public class ECopyOptionContext implements Parcelable {
     }
 
     public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeString(this.copyType.name());
-        parcel.writeInt(this.optionItems.size());
+        parcel.writeString(copyType.name());
+        parcel.writeInt(optionItems.size());
         Iterator<ECopyOptionItem> it = optionItems.iterator();
         while (it.hasNext()) {
             parcel.writeParcelable(it.next(), 0);
         }
-        parcel.writeString(this.copyOptionsResult.toString());
+        parcel.writeString(copyOptionsResult.toString());
     }
 
     ECopyOptionContext(Parcel parcel) {

+ 26 - 26
app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/ECopyOptionItem.java

@@ -62,11 +62,11 @@ public class ECopyOptionItem implements Parcelable {
                 return false;
             }
             ChoiceArray choiceArray = (ChoiceArray) obj;
-            if (this.selectedChoice != choiceArray.selectedChoice || defaultChoice != choiceArray.defaultChoice || choices.size() != choiceArray.choices.size()) {
+            if (selectedChoice != choiceArray.selectedChoice || defaultChoice != choiceArray.defaultChoice || choices.size() != choiceArray.choices.size()) {
                 return false;
             }
             for (int i = 0; i < choices.size(); i++) {
-                if (this.choices.get(i) != choiceArray.choices.get(i)) {
+                if (choices.get(i) != choiceArray.choices.get(i)) {
                     return false;
                 }
             }
@@ -100,7 +100,7 @@ public class ECopyOptionItem implements Parcelable {
                 return false;
             }
             NumberRange numberRange = (NumberRange) obj;
-            if (this.min == numberRange.min && max == numberRange.max && selectedValue == numberRange.selectedValue && defaultValue == numberRange.defaultValue && exceptionValue == numberRange.exceptionValue) {
+            if (min == numberRange.min && max == numberRange.max && selectedValue == numberRange.selectedValue && defaultValue == numberRange.defaultValue && exceptionValue == numberRange.exceptionValue) {
                 return true;
             }
             return false;
@@ -108,25 +108,25 @@ public class ECopyOptionItem implements Parcelable {
     }
 
     public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeString(this.key.name());
-        parcel.writeString(this.choiceType.name());
-        parcel.writeInt(this.enabled ? 1 : 0);
-        parcel.writeInt(this.isLocalOption ? 1 : 0);
-        if (this.choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
-            parcel.writeInt(this.choiceArray.choices.size());
+        parcel.writeString(key.name());
+        parcel.writeString(choiceType.name());
+        parcel.writeInt(enabled ? 1 : 0);
+        parcel.writeInt(isLocalOption ? 1 : 0);
+        if (choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
+            parcel.writeInt(choiceArray.choices.size());
             Iterator<ECopyOptionItemChoice> it = choiceArray.choices.iterator();
             while (it.hasNext()) {
                 parcel.writeString(it.next().param.name());
             }
-            parcel.writeInt(this.choiceArray.selectedChoice);
-            parcel.writeInt(this.choiceArray.defaultChoice);
+            parcel.writeInt(choiceArray.selectedChoice);
+            parcel.writeInt(choiceArray.defaultChoice);
             return;
         }
-        parcel.writeInt(this.numberRange.min);
-        parcel.writeInt(this.numberRange.max);
-        parcel.writeInt(this.numberRange.selectedValue);
-        parcel.writeInt(this.numberRange.defaultValue);
-        parcel.writeInt(this.numberRange.exceptionValue);
+        parcel.writeInt(numberRange.min);
+        parcel.writeInt(numberRange.max);
+        parcel.writeInt(numberRange.selectedValue);
+        parcel.writeInt(numberRange.defaultValue);
+        parcel.writeInt(numberRange.exceptionValue);
     }
 
     ECopyOptionItem(Parcel parcel) {
@@ -135,11 +135,11 @@ public class ECopyOptionItem implements Parcelable {
         boolean z = true;
         enabled = parcel.readInt() == 1;
         isLocalOption = parcel.readInt() != 1 ? false : z;
-        if (this.choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
+        if (choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
             choiceArray = new ChoiceArray();
             int readInt = parcel.readInt();
             for (int i = 0; i < readInt; i++) {
-                choiceArray.choices.add(ECopyOptionItemChoice.valueOf(this.key, ERemoteOperation.ERemoteParam.valueOf(parcel.readString())));
+                choiceArray.choices.add(ECopyOptionItemChoice.valueOf(key, ERemoteOperation.ERemoteParam.valueOf(parcel.readString())));
             }
             choiceArray.selectedChoice = parcel.readInt();
             choiceArray.defaultChoice = parcel.readInt();
@@ -174,7 +174,7 @@ public class ECopyOptionItem implements Parcelable {
         Iterator<ERemoteOperation.ERemoteParam> it = arrayList.iterator();
         while (it.hasNext()) {
             ERemoteOperation.ERemoteParam next = it.next();
-            choiceArray.choices.add(ECopyOptionItemChoice.valueOf(this.key, next));
+            choiceArray.choices.add(ECopyOptionItemChoice.valueOf(key, next));
             if (next == eRemoteParam) {
                 ChoiceArray choiceArray2 = choiceArray;
                 choiceArray2.defaultChoice = choiceArray2.choices.size() - 1;
@@ -194,7 +194,7 @@ public class ECopyOptionItem implements Parcelable {
         choiceType = eCopyOptionItem.choiceType;
         enabled = eCopyOptionItem.enabled;
         isLocalOption = eCopyOptionItem.isLocalOption;
-        if (this.choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
+        if (choiceType == ECopyOptionItemChoiceType.ChoiceArray) {
             choiceArray = new ChoiceArray(eCopyOptionItem.choiceArray);
         } else {
             numberRange = new NumberRange(eCopyOptionItem.numberRange);
@@ -210,7 +210,7 @@ public class ECopyOptionItem implements Parcelable {
             return false;
         }
         ECopyOptionItem eCopyOptionItem = (ECopyOptionItem) obj;
-        if (this.key != eCopyOptionItem.key || (eCopyOptionItemChoiceType = choiceType) != eCopyOptionItem.choiceType || isLocalOption != eCopyOptionItem.isLocalOption) {
+        if (key != eCopyOptionItem.key || (eCopyOptionItemChoiceType = choiceType) != eCopyOptionItem.choiceType || isLocalOption != eCopyOptionItem.isLocalOption) {
             return false;
         }
         if (eCopyOptionItemChoiceType == ECopyOptionItemChoiceType.ChoiceArray) {
@@ -1210,7 +1210,7 @@ public class ECopyOptionItem implements Parcelable {
     public void selectValue(int i) {
         NumberRange numberRange2 = numberRange;
         if (i != numberRange2.exceptionValue) {
-            i = Math.min(Math.max(this.numberRange.min, i), numberRange.max);
+            i = Math.min(Math.max(numberRange.min, i), numberRange.max);
         }
         numberRange2.selectedValue = i;
     }
@@ -1225,7 +1225,7 @@ public class ECopyOptionItem implements Parcelable {
 
     public ECopyOptionItemChoice getDefaultChoice() {
         try {
-            return choiceArray.choices.get(this.choiceArray.defaultChoice);
+            return choiceArray.choices.get(choiceArray.defaultChoice);
         } catch (IndexOutOfBoundsException unused) {
             return null;
         }
@@ -1277,20 +1277,20 @@ public class ECopyOptionItem implements Parcelable {
 
     public synchronized void updateChoicesXCutLine() {
         if (ERemoteOperation.ERemoteParam.dash.equals(getSelectedChoice().getParam())) {
-            if (this.choiceArray.choices.size() > 1) {
+            if (choiceArray.choices.size() > 1) {
                 choiceArray.choices.clear();
                 choiceArray.choices.add(ECopyOptionItemChoice.XCutLine_Dash);
                 choiceArray.selectedChoice = 0;
                 choiceArray.defaultChoice = 0;
             }
-        } else if (this.choiceArray.choices.indexOf(ECopyOptionItemChoice.XCutLine_Dash) != -1) {
+        } else if (choiceArray.choices.indexOf(ECopyOptionItemChoice.XCutLine_Dash) != -1) {
             ECopyOptionItemChoice selectedChoice = getSelectedChoice();
             ECopyOptionItemChoice defaultChoice = getDefaultChoice();
             choiceArray.choices.remove(ECopyOptionItemChoice.XCutLine_Dash);
             choiceArray.selectedChoice = choiceArray.choices.indexOf(selectedChoice);
             choiceArray.defaultChoice = choiceArray.choices.indexOf(defaultChoice);
         }
-        if (this.choiceArray.choices.size() > 1) {
+        if (choiceArray.choices.size() > 1) {
             enabled = true;
         } else {
             enabled = false;

+ 7 - 7
app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/RemoteCopyGetOptionTask.java

@@ -65,8 +65,8 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
         Result result = new Result();
         result.copyType = copyType;
         ERemoteDevice eRemoteDevice = new ERemoteDevice();
-        eRemoteDevice.setHostIP(this.operation.getHostIP());
-        eRemoteDevice.setRequestConnectionTimeout(this.operation.getRequestConnectionTimeout());
+        eRemoteDevice.setHostIP(operation.getHostIP());
+        eRemoteDevice.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
         ERemoteDevice.ERemoteDeviceFunctionsResult functions = eRemoteDevice.getFunctions(new ERemoteOperation.IRemoteOperationParameter() {
             public String client_id() {
                 return RemoteCopyGetOptionTask.this.clientID;
@@ -92,8 +92,8 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
             return result;
         }
         ERemotePrinter eRemotePrinter = new ERemotePrinter();
-        eRemotePrinter.setHostIP(this.operation.getHostIP());
-        eRemotePrinter.setRequestConnectionTimeout(this.operation.getRequestConnectionTimeout());
+        eRemotePrinter.setHostIP(operation.getHostIP());
+        eRemotePrinter.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
         ERemotePrinter.ERemotePrinterComponentsResult components = eRemotePrinter.getComponents(new ERemoteOperation.IRemoteOperationParameter() {
             public String client_id() {
                 return RemoteCopyGetOptionTask.this.clientID;
@@ -103,8 +103,8 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
             return getErrorResult(components);
         }
         ERemoteScanner eRemoteScanner = new ERemoteScanner();
-        eRemoteScanner.setHostIP(this.operation.getHostIP());
-        eRemoteScanner.setRequestConnectionTimeout(this.operation.getRequestConnectionTimeout());
+        eRemoteScanner.setHostIP(operation.getHostIP());
+        eRemoteScanner.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
         ERemoteScanner.ERemoteScannerComponentsResult components2 = eRemoteScanner.getComponents(new ERemoteOperation.IRemoteOperationParameter() {
             public String client_id() {
                 return RemoteCopyGetOptionTask.this.clientID;
@@ -117,7 +117,7 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
     }
 
     protected Result doInBackground(Void... voidArr) {
-        operation.setHostIP(this.systemSettings.getPrinterIPAddress());
+        operation.setHostIP(systemSettings.getPrinterIPAddress());
         Result checkDeviceError = checkDeviceError();
         if (checkDeviceError != null) {
             return checkDeviceError;

+ 6 - 6
app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/RemoteCopySetOptionTask.java

@@ -97,7 +97,7 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
 
     public void setOptionContext(ECopyOptionContext eCopyOptionContext) {
         optionContext = eCopyOptionContext;
-        replacedItem = optionContext.replace(new ECopyOptionItem(this.selectedItem));
+        replacedItem = optionContext.replace(new ECopyOptionItem(selectedItem));
         changableParams = new ArrayList<>();
         changableParams.add(ERemoteOperation.ERemoteParam.color_effects_type);
         changableParams.add(ERemoteOperation.ERemoteParam.layout);
@@ -120,8 +120,8 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
     }
 
     protected Result doInBackground(Void... voidArr) {
-        operation.setHostIP(this.systemSettings.getPrinterIPAddress());
-        if (this.selectedItem.isLocalOption) {
+        operation.setHostIP(systemSettings.getPrinterIPAddress());
+        if (selectedItem.isLocalOption) {
             return getResultLocalOptions();
         }
         ERemoteCopy.ERemoteCopyOptionsResult options = operation.getOptions(new ERemoteCopy.IRemoteCopyOptionsParameter() {
@@ -219,7 +219,7 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
             Iterator<ERemoteOperation.ERemoteParam> it = changableParams.iterator();
             while (it.hasNext()) {
                 ECopyOptionItem createOptionItem = ECopyOptionItem.createOptionItem(it.next(), options);
-                if (this.optionContext.isChanged(createOptionItem)) {
+                if (optionContext.isChanged(createOptionItem)) {
                     result.changedItems.add(createOptionItem);
                     optionContext.replace(createOptionItem);
                 }
@@ -233,8 +233,8 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
             } else {
                 result.error = ECopyComponent.ICopyOptionListener.CopyOptionChangedError.Error;
             }
-            result.selectedItem = new ECopyOptionItem(this.replacedItem);
-            optionContext.replace(this.replacedItem);
+            result.selectedItem = new ECopyOptionItem(replacedItem);
+            optionContext.replace(replacedItem);
         }
         return result;
     }

+ 20 - 20
app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/RemoteCopyTask.java

@@ -254,7 +254,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
     }
 
     private void resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
-        synchronized (this.progress) {
+        synchronized (progress) {
             progress.resumeState = resumeState;
             progress.notify();
         }
@@ -262,25 +262,25 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
 
     private void resumeExecute() {
         ERemoteCopy.ERemoteCopyStatusResult status;
-        if (this.progress.resumeRequest != null) {
-            synchronized (this.progress) {
+        if (progress.resumeRequest != null) {
+            synchronized (progress) {
                 while (true) {
                     try {
-                        if (this.progress.resumeState == null) {
+                        if (progress.resumeState == null) {
                             progress.wait(1000);
-                            switch (this.operation.getStatus(this.statusParameter).printer_state()) {
+                            switch (operation.getStatus(statusParameter).printer_state()) {
                                 case idle:
                                     progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Processing;
-                                    localPublishProgress(this.progress);
+                                    localPublishProgress(progress);
                                     resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState.Cancel);
                                     continue;
                                 case processing:
                                     progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Processing;
-                                    localPublishProgress(this.progress);
+                                    localPublishProgress(progress);
                                     resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState.ClearError);
                                     continue;
                                 case stopped:
-                                    if (this.progress.resumeRequest.getStopReason().equals(getPrinterStopReason(status.printer_state_reasons()))) {
+                                    if (progress.resumeRequest.getStopReason().equals(getPrinterStopReason(status.printer_state_reasons()))) {
                                         continue;
                                     } else {
                                         return;
@@ -291,17 +291,17 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                         }
                     } catch (InterruptedException e) {
                         e.printStackTrace();
-                        switch (this.progress.resumeState) {
+                        switch (progress.resumeState) {
                             case ClearError:
                                 ERemotePrinter eRemotePrinter = new ERemotePrinter();
-                                eRemotePrinter.setHostIP(this.operation.getHostIP());
-                                eRemotePrinter.setRequestConnectionTimeout(this.operation.getRequestConnectionTimeout());
+                                eRemotePrinter.setHostIP(operation.getHostIP());
+                                eRemotePrinter.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
                                 eRemotePrinter.clearError(new ERemoteOperation.IRemoteOperationParameter() {
                                     public String client_id() {
                                         return RemoteCopyTask.this.clientID;
                                     }
                                 });
-                                for (int i = 0; i < 6 && !this.operation.getStatus(this.statusParameter).printer_state().equals(ERemoteOperation.ERemoteParam.processing); i++) {
+                                for (int i = 0; i < 6 && !this.operation.getStatus(statusParameter).printer_state().equals(ERemoteOperation.ERemoteParam.processing); i++) {
                                     try {
                                         Thread.sleep(5000);
                                     } catch (InterruptedException e2) {
@@ -447,7 +447,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
     }
 
     protected Result doInBackground(Void... voidArr) {
-        operation.setHostIP(this.systemSettings.getPrinterIPAddress());
+        operation.setHostIP(systemSettings.getPrinterIPAddress());
         ERemoteOperation.ERemoteReasonResult startCopy = startCopy();
         if (!startCopy.success()) {
             return new Result(startCopy);
@@ -456,21 +456,21 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
         boolean z = false;
         boolean z2 = false;
         while (!z) {
-            if (this.cancelRequested && !z2) {
-                if (!this.operation.cancel(this.cancelParameter).success()) {
+            if (cancelRequested && !z2) {
+                if (!this.operation.cancel(cancelParameter).success()) {
                     return new Result(ERemoteOperation.ERemoteParam.canceled);
                 }
                 z2 = true;
             }
-            final ERemoteCopy.ERemoteCopyStatusResult status = operation.getStatus(this.statusParameter);
+            final ERemoteCopy.ERemoteCopyStatusResult status = operation.getStatus(statusParameter);
             if (!status.success()) {
-                sendLog(this.progress.currentPages);
+                sendLog(progress.currentPages);
                 return new Result((ERemoteOperation.ERemoteReasonResult) status);
             }
             Result result2 = new Result(status.job_result());
             progress.totalPages = status.job_print_total_pages();
             progress.currentPages = status.job_print_current_pages();
-            if (this.progress.currentPages < 1) {
+            if (progress.currentPages < 1) {
                 progress.currentPages = 1;
             }
             ERemoteOperation.ERemoteParam job_state = status.job_state();
@@ -506,7 +506,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                     };
                     break;
                 case finished:
-                    sendLog(this.progress.currentPages);
+                    sendLog(progress.currentPages);
                     result = result2;
                     z = true;
                     continue;
@@ -570,7 +570,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                         break;
                     }
             }
-            localPublishProgress(this.progress);
+            localPublishProgress(progress);
             resumeExecute();
             try {
                 Thread.sleep((long) 1000);

+ 7 - 7
app/src/main/java/epson/print/rpcopy/Component/eremoteoperation/ERemoteCopy.java

@@ -172,7 +172,7 @@ public class ERemoteCopy extends ERemoteOperation {
             }
 
             private void checkPaperSize(ERemoteOperation.ERemoteParam eRemoteParam, ERemoteOperation.ERemoteParam eRemoteParam2, ERemoteOperation.ERemoteParam eRemoteParam3) {
-                if (this.mediaSizeList.contains(eRemoteParam) && mediaSizeList.contains(eRemoteParam2)) {
+                if (mediaSizeList.contains(eRemoteParam) && mediaSizeList.contains(eRemoteParam2)) {
                     scalePresets.add(eRemoteParam3);
                 }
             }
@@ -240,7 +240,7 @@ public class ERemoteCopy extends ERemoteOperation {
     }
 
     public ERemoteCopyResult copy(IRemoteCopyParameter iRemoteCopyParameter, ERemoteOperation.ERemoteParam eRemoteParam, ERemoteOperation.ERemoteParam eRemoteParam2, ERemoteOperation.ERemoteParam eRemoteParam3, ERemoteOperation.ERemoteParam eRemoteParam4, ERemoteOperation.ERemoteParam eRemoteParam5) {
-        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(this.hostIP, ERemoteOperation.RequestParam.copy, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(hostIP, ERemoteOperation.RequestParam.copy, getRequestConnectionTimeout());
         requestCopy.add(ERemoteOperation.ERemoteParam.client_id, iRemoteCopyParameter.client_id());
         requestCopy.add(ERemoteOperation.ERemoteParam.layout, eRemoteParam);
         requestCopy.add(ERemoteOperation.ERemoteParam.print_media_type, iRemoteCopyParameter.print_media_type());
@@ -260,7 +260,7 @@ public class ERemoteCopy extends ERemoteOperation {
     }
 
     public ERemoteCopyOptionsResult getOptions(IRemoteCopyOptionsParameter iRemoteCopyOptionsParameter, ERemoteOperation.ERemoteParam eRemoteParam, ERemoteOperation.ERemoteParam eRemoteParam2, ERemoteOperation.ERemoteParam eRemoteParam3, ERemoteOperation.ERemoteParam eRemoteParam4, ERemoteOperation.ERemoteParam eRemoteParam5) {
-        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(this.hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
         requestCopy.add(ERemoteOperation.ERemoteParam.client_id, iRemoteCopyOptionsParameter.client_id());
         requestCopy.add(ERemoteOperation.ERemoteParam.layout, iRemoteCopyOptionsParameter.layout());
         requestCopy.add(ERemoteOperation.ERemoteParam.print_media_type, iRemoteCopyOptionsParameter.print_media_type());
@@ -283,7 +283,7 @@ public class ERemoteCopy extends ERemoteOperation {
 
     public ERemoteCopyOptionsResult getSelectableOptions() {
         ArrayList arrayList = new ArrayList();
-        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(this.hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(hostIP, ERemoteOperation.RequestParam.get_options, getRequestConnectionTimeout());
         requestCopy.add(ERemoteOperation.ERemoteParam.client_id, ERemoteOperation.ERemoteParam.x_null.string);
         requestCopy.add(ERemoteOperation.ERemoteParam.color_effects_type, ERemoteOperation.ERemoteParam.x_null);
         requestCopy.add(ERemoteOperation.ERemoteParam.layout, ERemoteOperation.ERemoteParam.x_null);
@@ -305,7 +305,7 @@ public class ERemoteCopy extends ERemoteOperation {
     }
 
     public ERemoteCopyStatusResult getStatus(IRemoteCopyStatusParameter iRemoteCopyStatusParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(this.hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
         requestCopy.add(ERemoteOperation.ERemoteParam.client_id, iRemoteCopyStatusParameter.client_id());
         requestCopy.add(ERemoteOperation.ERemoteParam.keys, iRemoteCopyStatusParameter.keys());
         requestCopy.add(ERemoteOperation.ERemoteParam.job_token, iRemoteCopyStatusParameter.job_token());
@@ -315,7 +315,7 @@ public class ERemoteCopy extends ERemoteOperation {
     }
 
     public ERemoteOperation.ERemoteReasonResult cancel(IRemoteCancelParameter iRemoteCancelParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(this.hostIP, ERemoteOperation.RequestParam.cancel, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(hostIP, ERemoteOperation.RequestParam.cancel, getRequestConnectionTimeout());
         requestCopy.add(ERemoteOperation.ERemoteParam.client_id, iRemoteCancelParameter.client_id());
         requestCopy.add(ERemoteOperation.ERemoteParam.job_token, iRemoteCancelParameter.job_token());
         ERemoteOperation.ERemoteReasonResult eRemoteReasonResult = new ERemoteOperation.ERemoteReasonResult(requestCopy.getRemoteRequest().execute());
@@ -324,7 +324,7 @@ public class ERemoteCopy extends ERemoteOperation {
     }
 
     public ERemoteOperation.ERemoteReasonResult documentChanged(IRemoteCopyDocumentChangedParameter iRemoteCopyDocumentChangedParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(this.hostIP, ERemoteOperation.RequestParam.document_changed, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestCopy = ERemoteOperation.ERemoteRequestBuilder.requestCopy(hostIP, ERemoteOperation.RequestParam.document_changed, getRequestConnectionTimeout());
         requestCopy.add(ERemoteOperation.ERemoteParam.client_id, iRemoteCopyDocumentChangedParameter.client_id());
         requestCopy.add(ERemoteOperation.ERemoteParam.job_token, iRemoteCopyDocumentChangedParameter.job_token());
         requestCopy.add(ERemoteOperation.ERemoteParam.next_document, iRemoteCopyDocumentChangedParameter.next_document());

+ 2 - 2
app/src/main/java/epson/print/rpcopy/Component/eremoteoperation/ERemoteDevice.java

@@ -47,7 +47,7 @@ public class ERemoteDevice extends ERemoteOperation {
     }
 
     public ERemoteDeviceFunctionsResult getFunctions(ERemoteOperation.IRemoteOperationParameter iRemoteOperationParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestDevice = ERemoteOperation.ERemoteRequestBuilder.requestDevice(this.hostIP, ERemoteOperation.RequestParam.get_functions, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestDevice = ERemoteOperation.ERemoteRequestBuilder.requestDevice(hostIP, ERemoteOperation.RequestParam.get_functions, getRequestConnectionTimeout());
         requestDevice.add(ERemoteOperation.ERemoteParam.client_id, iRemoteOperationParameter.client_id());
         ERemoteDeviceFunctionsResult eRemoteDeviceFunctionsResult = new ERemoteDeviceFunctionsResult(requestDevice.getRemoteRequest().execute());
         eRemoteDeviceFunctionsResult.setRemoteRequestBuilder(requestDevice);
@@ -55,7 +55,7 @@ public class ERemoteDevice extends ERemoteOperation {
     }
 
     public ERemoteDeviceStatusResult getStatus(ERemoteOperation.IRemoteStatusParameter iRemoteStatusParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestDevice = ERemoteOperation.ERemoteRequestBuilder.requestDevice(this.hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestDevice = ERemoteOperation.ERemoteRequestBuilder.requestDevice(hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
         requestDevice.add(ERemoteOperation.ERemoteParam.client_id, iRemoteStatusParameter.client_id());
         requestDevice.add(ERemoteOperation.ERemoteParam.keys, iRemoteStatusParameter.keys());
         ERemoteDeviceStatusResult eRemoteDeviceStatusResult = new ERemoteDeviceStatusResult(requestDevice.getRemoteRequest().execute());

+ 5 - 5
app/src/main/java/epson/print/rpcopy/Component/eremoteoperation/ERemoteOperation.java

@@ -436,7 +436,7 @@ public class ERemoteOperation {
         private ERemoteParam getParamValueOf(ERemoteParam eRemoteParam) {
             ERemoteParam eRemoteParam2 = ERemoteParam.x_null;
             try {
-                return ERemoteParam.stringOf(this.json.getString(eRemoteParam.string));
+                return ERemoteParam.stringOf(json.getString(eRemoteParam.string));
             } catch (Exception e) {
                 if (eRemoteParam == null) {
                     EPLog.e("ERemoteOpe", "param null");
@@ -525,9 +525,9 @@ public class ERemoteOperation {
                 request.getEntity().writeTo(byteArrayOutputStream);
                 Log.d("ERequest B", byteArrayOutputStream.toString());
                 IAHttpClient iAHttpClient = new IAHttpClient();
-                iAHttpClient.setConnectionTimeout(this.timeout);
-                iAHttpClient.setSoTimeout(this.timeout);
-                return ERemoteOperationResult.parseResponse(iAHttpClient.execute(this.request));
+                iAHttpClient.setConnectionTimeout(timeout);
+                iAHttpClient.setSoTimeout(timeout);
+                return ERemoteOperationResult.parseResponse(iAHttpClient.execute(request));
             } catch (Exception e) {
                 e.printStackTrace();
                 return new JSONObject();
@@ -668,7 +668,7 @@ public class ERemoteOperation {
         }
 
         public ERemoteRequest getRemoteRequest() {
-            return new ERemoteRequest(this.requestURI.toString(), messageBody, timeout);
+            return new ERemoteRequest(requestURI.toString(), messageBody, timeout);
         }
     }
 }

+ 3 - 3
app/src/main/java/epson/print/rpcopy/Component/eremoteoperation/ERemotePrinter.java

@@ -35,13 +35,13 @@ public class ERemotePrinter extends ERemoteOperation {
     }
 
     public ERemotePrinterComponentsResult getComponents(ERemoteOperation.IRemoteOperationParameter iRemoteOperationParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestPrinter = ERemoteOperation.ERemoteRequestBuilder.requestPrinter(this.hostIP, ERemoteOperation.RequestParam.get_components, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestPrinter = ERemoteOperation.ERemoteRequestBuilder.requestPrinter(hostIP, ERemoteOperation.RequestParam.get_components, getRequestConnectionTimeout());
         requestPrinter.add(ERemoteOperation.ERemoteParam.client_id, iRemoteOperationParameter.client_id());
         return new ERemotePrinterComponentsResult(requestPrinter.getRemoteRequest().execute());
     }
 
     public ERemotePrinterStatusResult getStatus(ERemoteOperation.IRemoteStatusParameter iRemoteStatusParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestPrinter = ERemoteOperation.ERemoteRequestBuilder.requestPrinter(this.hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestPrinter = ERemoteOperation.ERemoteRequestBuilder.requestPrinter(hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
         requestPrinter.add(ERemoteOperation.ERemoteParam.client_id, iRemoteStatusParameter.client_id());
         requestPrinter.add(ERemoteOperation.ERemoteParam.keys, iRemoteStatusParameter.keys());
         ERemotePrinterStatusResult eRemotePrinterStatusResult = new ERemotePrinterStatusResult(requestPrinter.getRemoteRequest().execute());
@@ -50,7 +50,7 @@ public class ERemotePrinter extends ERemoteOperation {
     }
 
     public ERemoteOperation.ERemoteOperationResult clearError(ERemoteOperation.IRemoteOperationParameter iRemoteOperationParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestPrinter = ERemoteOperation.ERemoteRequestBuilder.requestPrinter(this.hostIP, ERemoteOperation.RequestParam.clear_error, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestPrinter = ERemoteOperation.ERemoteRequestBuilder.requestPrinter(hostIP, ERemoteOperation.RequestParam.clear_error, getRequestConnectionTimeout());
         requestPrinter.add(ERemoteOperation.ERemoteParam.client_id, iRemoteOperationParameter.client_id());
         ERemotePrinterStatusResult eRemotePrinterStatusResult = new ERemotePrinterStatusResult(requestPrinter.getRemoteRequest().execute());
         eRemotePrinterStatusResult.setRemoteRequestBuilder(requestPrinter);

+ 3 - 3
app/src/main/java/epson/print/rpcopy/Component/eremoteoperation/ERemoteScanner.java

@@ -35,7 +35,7 @@ public class ERemoteScanner extends ERemoteOperation {
     }
 
     public ERemoteScannerComponentsResult getComponents(ERemoteOperation.IRemoteOperationParameter iRemoteOperationParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestScanner = ERemoteOperation.ERemoteRequestBuilder.requestScanner(this.hostIP, ERemoteOperation.RequestParam.get_components, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestScanner = ERemoteOperation.ERemoteRequestBuilder.requestScanner(hostIP, ERemoteOperation.RequestParam.get_components, getRequestConnectionTimeout());
         requestScanner.add(ERemoteOperation.ERemoteParam.client_id, iRemoteOperationParameter.client_id());
         ERemoteScannerComponentsResult eRemoteScannerComponentsResult = new ERemoteScannerComponentsResult(requestScanner.getRemoteRequest().execute());
         eRemoteScannerComponentsResult.setRemoteRequestBuilder(requestScanner);
@@ -43,7 +43,7 @@ public class ERemoteScanner extends ERemoteOperation {
     }
 
     public ERemoteScannerStatusResult getStatus(ERemoteOperation.IRemoteStatusParameter iRemoteStatusParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestScanner = ERemoteOperation.ERemoteRequestBuilder.requestScanner(this.hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestScanner = ERemoteOperation.ERemoteRequestBuilder.requestScanner(hostIP, ERemoteOperation.RequestParam.get_status, getRequestConnectionTimeout());
         requestScanner.add(ERemoteOperation.ERemoteParam.keys, iRemoteStatusParameter.keys());
         ERemoteScannerStatusResult eRemoteScannerStatusResult = new ERemoteScannerStatusResult(requestScanner.getRemoteRequest().execute());
         eRemoteScannerStatusResult.setRemoteRequestBuilder(requestScanner);
@@ -51,7 +51,7 @@ public class ERemoteScanner extends ERemoteOperation {
     }
 
     public ERemoteOperation.ERemoteOperationResult clearError(ERemoteOperation.IRemoteOperationParameter iRemoteOperationParameter) {
-        ERemoteOperation.ERemoteRequestBuilder requestScanner = ERemoteOperation.ERemoteRequestBuilder.requestScanner(this.hostIP, ERemoteOperation.RequestParam.clear_error, getRequestConnectionTimeout());
+        ERemoteOperation.ERemoteRequestBuilder requestScanner = ERemoteOperation.ERemoteRequestBuilder.requestScanner(hostIP, ERemoteOperation.RequestParam.clear_error, getRequestConnectionTimeout());
         requestScanner.add(ERemoteOperation.ERemoteParam.client_id, iRemoteOperationParameter.client_id());
         ERemoteOperation.ERemoteOperationResult eRemoteOperationResult = new ERemoteOperation.ERemoteOperationResult(requestScanner.getRemoteRequest().execute());
         eRemoteOperationResult.setRemoteRequestBuilder(requestScanner);

+ 9 - 9
app/src/main/java/epson/print/rpcopy/CopyActivity.java

@@ -103,7 +103,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         setupUi();
         setClickListener();
         setActionBar((int) R.string.FunctionName_iPrint_Copy, true);
-        if (this.mPrinter == null) {
+        if (mPrinter == null) {
             mPrinter = MaintainPrinter2.getInstance();
         }
         optionValueChangedListener = new ActivityBase.OptionItemChangedListener() {
@@ -141,7 +141,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
     }
 
     public void onResume() {
-        EPLog.v(this.TAG, "onResume()");
+        EPLog.v(TAG, "onResume()");
         super.onResume();
         isKeepSimpleAPConnection = false;
         getPrinterInfo();
@@ -169,7 +169,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
     }
 
     public void onPause() {
-        EPLog.v(this.TAG, "onPause()");
+        EPLog.v(TAG, "onPause()");
         super.onPause();
         int i = printerLocation;
         if (i == 1 || i == 3) {
@@ -270,7 +270,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             case R.id.copy_button /*2131230948*/:
                 String str = TAG;
                 EPLog.i(str, "NOW_PRINTER:" + printerId);
-                presettings.saveCopyOptions(this.copyComponent.getCopyOptionItems());
+                presettings.saveCopyOptions(copyComponent.getCopyOptionItems());
                 copyProcess = new CopyProcess(this);
                 copyProcess.startCopy(getApplicationContext());
                 return;
@@ -384,7 +384,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
     }
 
     private void fetchCopyOptionContext() {
-        ECopyComponent.createCopyOptionContext(this.copyComponent, copyType, new ECopyComponent.ICopyOptionContextListener() {
+        ECopyComponent.createCopyOptionContext(copyComponent, copyType, new ECopyComponent.ICopyOptionContextListener() {
             public void onCopyOptionContextCreated(ECopyComponent.ECopyType eCopyType, ECopyOptionContext eCopyOptionContext, ECopyComponent.ICopyOptionContextListener.ContextCreationError contextCreationError) {
                 CopyActivity copyActivity = CopyActivity.this;
                 copyActivity.mECopyOptionContext = eCopyOptionContext;
@@ -506,14 +506,14 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             optionItem = eCopyOptionItem;
             value = eCopyOptionItem.getSelectedValue();
             image = (ImageView) CopyActivity.this.findViewById(i);
-            image.setImageDrawable(this.images.getDrawable(this.value + 4));
+            image.setImageDrawable(images.getDrawable(value + 4));
             image.setEnabled(eCopyOptionItem.isEnabled());
         }
 
         private void bindCountUp(int i) {
             countUp = (Button) CopyActivity.this.findViewById(i);
             countUp.setOnClickListener(new CounterImage(1));
-            if (this.value == optionItem.getMaximumValue()) {
+            if (value == optionItem.getMaximumValue()) {
                 countUp.setEnabled(false);
             } else {
                 countUp.setEnabled(true);
@@ -523,7 +523,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         private void bindCountDown(int i) {
             countDown = (Button) CopyActivity.this.findViewById(i);
             countDown.setOnClickListener(new CounterImage(-1));
-            if (this.value == optionItem.getMinimumValue()) {
+            if (value == optionItem.getMinimumValue()) {
                 countDown.setEnabled(false);
             } else {
                 countDown.setEnabled(true);
@@ -544,7 +544,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             }
 
             public void onClick(View view) {
-                updateImage(this.amount);
+                updateImage(amount);
             }
         }
     }

+ 7 - 7
app/src/main/java/epson/print/rpcopy/CopyProcess.java

@@ -31,7 +31,7 @@ public class CopyProcess implements ECopyComponent.ICopyStatusListener {
         jobToken = str;
         ActivityBase activityBase3 = activityBase;
         activityBase3.getClass();
-        wheel = new ActivityBase.WheelDialog(this.activityBase);
+        wheel = new ActivityBase.WheelDialog(activityBase);
     }
 
     public void startCopy(Context context) {
@@ -40,7 +40,7 @@ public class CopyProcess implements ECopyComponent.ICopyStatusListener {
     }
 
     public void onStarted(ECopyComponent.ICopyStatusListener.CopyTaskType copyTaskType) {
-        wheel.show(this.activityBase.getString(R.string.CopyTaskProgressCopying), new ActivityBase.CancelRequestCallback() {
+        wheel.show(activityBase.getString(R.string.CopyTaskProgressCopying), new ActivityBase.CancelRequestCallback() {
             public void onCancelRequest() {
                 CopyProcess.this.cancelRequest.cancel();
             }
@@ -54,7 +54,7 @@ public class CopyProcess implements ECopyComponent.ICopyStatusListener {
         }
         if (copyTaskProgress.equals(ECopyComponent.ICopyStatusListener.CopyTaskProgress.Copying) || copyTaskProgress.equals(ECopyComponent.ICopyStatusListener.CopyTaskProgress.Processing)) {
             ActivityBase.WheelDialog wheelDialog = wheel;
-            wheelDialog.setText(this.activityBase.getString(R.string.CopyTaskProgressCopying) + " " + i2 + CommonDefine.SLASH + i);
+            wheelDialog.setText(activityBase.getString(R.string.CopyTaskProgressCopying) + " " + i2 + CommonDefine.SLASH + i);
         } else {
             wheel.setText("");
         }
@@ -62,7 +62,7 @@ public class CopyProcess implements ECopyComponent.ICopyStatusListener {
             case Stopped:
                 ActivityBase activityBase2 = activityBase;
                 activityBase2.getClass();
-                printererror = new ActivityBase.errorDialog(this.activityBase);
+                printererror = new ActivityBase.errorDialog(activityBase);
                 ECopyComponent.ICopyResumeRequest.StopReason stopReason = iCopyResumeRequest.getStopReason();
                 if (stopReason.equals(ECopyComponent.ICopyResumeRequest.StopReason.PrinterMediaEmptyError)) {
                     Iterator<ECopyOptionItem> it = copyComponent.getCopyOptionItems().iterator();
@@ -114,7 +114,7 @@ public class CopyProcess implements ECopyComponent.ICopyStatusListener {
             case ErrorOther:
                 ActivityBase activityBase2 = activityBase;
                 activityBase2.getClass();
-                printererror = new ActivityBase.errorDialog(this.activityBase);
+                printererror = new ActivityBase.errorDialog(activityBase);
                 String[] reasonText = printererror.getReasonText(copyTaskResult);
                 printererror.showErrorDialog(reasonText[0], reasonText[1], ActivityBase.DialogButtons.Ok, new ActivityBase.IClose() {
                     public void onClose(ActivityBase.ClickButton clickButton) {
@@ -122,8 +122,8 @@ public class CopyProcess implements ECopyComponent.ICopyStatusListener {
                 });
                 break;
         }
-        if (this.disconnectWifi) {
-            WiFiDirectManager.disconnect(this.activityBase, WiFiDirectManager.DEVICE_TYPE_PRINTER, ActivityBase.printerIp);
+        if (disconnectWifi) {
+            WiFiDirectManager.disconnect(activityBase, WiFiDirectManager.DEVICE_TYPE_PRINTER, ActivityBase.printerIp);
         }
     }
 

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