liuyuqi-dellpc 3 years ago
parent
commit
657126bae1
100 changed files with 765 additions and 765 deletions
  1. 3 3
      app/src/main/java/com/epson/cameracopy/ui/CropImageActivity.java
  2. 3 3
      app/src/main/java/com/epson/cameracopy/ui/DocumentSizeSettingActivity.java
  3. 1 1
      app/src/main/java/com/epson/iprint/storage/ConfirmCancelDialog.java
  4. 1 1
      app/src/main/java/com/epson/iprint/storage/LocalProgressDialog.java
  5. 1 1
      app/src/main/java/com/epson/iprint/storage/OneButtonDialogFragment.java
  6. 1 1
      app/src/main/java/com/epson/iprint/storage/StorageActivity.java
  7. 1 1
      app/src/main/java/com/epson/iprint/storage/StorageSecureStore.java
  8. 2 2
      app/src/main/java/com/epson/iprint/storage/dropbox/DropboxV2SignInActivity.java
  9. 13 13
      app/src/main/java/com/epson/iprint/storage/evernote/EvernoteClient.java
  10. 1 1
      app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleV3UploadSignInActivity.java
  11. 6 6
      app/src/main/java/com/epson/iprint/storage/gdrivev3/ListAndDownloadActivity.java
  12. 6 6
      app/src/main/java/com/epson/iprint/storage/onedrive/OneDriveClient.java
  13. 2 2
      app/src/main/java/com/epson/iprint/storage/onedrive/OneDriveSignInActivity.java
  14. 1 1
      app/src/main/java/com/epson/lib/escani2/EscanI2Lib.java
  15. 1 1
      app/src/main/java/com/epson/memcardacc/AltAlertDialogFragment.java
  16. 8 8
      app/src/main/java/com/epson/memcardacc/ConfirmReadMemcard.java
  17. 13 13
      app/src/main/java/com/epson/memcardacc/ConfirmWriteMemcard.java
  18. 2 2
      app/src/main/java/com/epson/memcardacc/DirectorySelecterActivity.java
  19. 1 1
      app/src/main/java/com/epson/memcardacc/LocalAlertDialogFragment.java
  20. 1 1
      app/src/main/java/com/epson/memcardacc/MemCardWriteConvertViewModel.java
  21. 9 9
      app/src/main/java/com/epson/memcardacc/MemcardImageGrid.java
  22. 2 2
      app/src/main/java/com/epson/memcardacc/MemcardPhotocopyTop.java
  23. 4 4
      app/src/main/java/com/epson/memcardacc/MemcardReadProgress.java
  24. 1 1
      app/src/main/java/com/epson/memcardacc/MemcardTop.java
  25. 4 4
      app/src/main/java/com/epson/memcardacc/MemcardTopSuper.java
  26. 3 3
      app/src/main/java/com/epson/memcardacc/MemcardWriteProgress.java
  27. 4 4
      app/src/main/java/com/epson/memcardacc/PasswordDialogFragment.java
  28. 1 1
      app/src/main/java/com/epson/memcardacc/PhotoCopyImageSelectActivity.java
  29. 1 1
      app/src/main/java/com/epson/mobilephone/common/ble/BleWork.java
  30. 1 1
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectBase.java
  31. 7 7
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityRequestLocationPermission.java
  32. 2 2
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityiPrintConnectStart.java
  33. 7 7
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ManageDefaultNetwork.java
  34. 7 7
      app/src/main/java/com/epson/mobilephone/common/wifidirect/SearchWiFiDirectPrinterTask.java
  35. 1 1
      app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiScanner.java
  36. 9 9
      app/src/main/java/epson/maintain/FirmwareManager.java
  37. 2 2
      app/src/main/java/epson/maintain/activity/CheckEulaActivity.java
  38. 1 1
      app/src/main/java/epson/maintain/activity/EccPrintLog.java
  39. 25 25
      app/src/main/java/epson/maintain/activity/GetPrinterReplyData.java
  40. 42 42
      app/src/main/java/epson/maintain/activity/MaintainActivity.java
  41. 6 6
      app/src/main/java/epson/maintain/activity/MaintainBuyInkOnlineRegTask.java
  42. 3 3
      app/src/main/java/epson/maintain/activity/NozzleGuidanceDialog.java
  43. 1 1
      app/src/main/java/epson/print/ActivityDocsPrintPreview.java
  44. 2 2
      app/src/main/java/epson/print/ActivityNfcPrinter.java
  45. 20 20
      app/src/main/java/epson/print/ActivityPrintWeb.java
  46. 2 2
      app/src/main/java/epson/print/ActivityRequestPermissions.java
  47. 2 2
      app/src/main/java/epson/print/CustomLayoutDialogFragment.java
  48. 2 2
      app/src/main/java/epson/print/CustomTitleDialogFragment.java
  49. 2 2
      app/src/main/java/epson/print/PhotoImageConvertViewModel.java
  50. 3 3
      app/src/main/java/epson/print/ThreeButtonDialog.java
  51. 5 5
      app/src/main/java/epson/print/copy/ActivityBase.java
  52. 1 1
      app/src/main/java/epson/print/copy/Component/ecopycomponent/ECopyComponent.java
  53. 25 25
      app/src/main/java/epson/print/copy/Component/ecopycomponent/ECopyPreview.java
  54. 4 4
      app/src/main/java/epson/print/copy/Component/ecopycomponent/PreviewScanTask.java
  55. 3 3
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyGetOptionTask.java
  56. 1 1
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyPhotoGetOptionTask.java
  57. 7 7
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyPhotoSetOptionTask.java
  58. 27 27
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyPhotoTask.java
  59. 10 10
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopySetOptionTask.java
  60. 12 12
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyTask.java
  61. 2 2
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteDeviceTask.java
  62. 34 34
      app/src/main/java/epson/print/copy/CopyScaleActivity.java
  63. 9 9
      app/src/main/java/epson/print/copy/CopySettingActivity.java
  64. 8 8
      app/src/main/java/epson/print/fileBrower.java
  65. 1 1
      app/src/main/java/epson/print/gdconv/ConvertProgressActivity.java
  66. 1 1
      app/src/main/java/epson/print/gdconv/ConvertTask.java
  67. 1 1
      app/src/main/java/epson/print/imgsel/BitmapCache.java
  68. 2 2
      app/src/main/java/epson/print/imgsel/ImageResizer.java
  69. 2 2
      app/src/main/java/epson/print/imgsel/ImageSelectActivity.java
  70. 1 1
      app/src/main/java/epson/print/imgsel/ImageViewMultiSelectFragment.java
  71. 1 1
      app/src/main/java/epson/print/imgsel/ImageViewPagerActivity.java
  72. 1 1
      app/src/main/java/epson/print/imgsel/LocalAlertDialogFragment.java
  73. 2 2
      app/src/main/java/epson/print/inkrpln/InkRplnProgressFragment.java
  74. 2 2
      app/src/main/java/epson/print/inkrpln/JumpUrlFragment.java
  75. 4 4
      app/src/main/java/epson/print/inkrpln/PrintSettingDependencyBuilder.java
  76. 6 6
      app/src/main/java/epson/print/pdf/pdfRender.java
  77. 3 3
      app/src/main/java/epson/print/phlayout/PhotoPreviewImageList.java
  78. 5 5
      app/src/main/java/epson/print/rpcopy/ActivityBase.java
  79. 3 3
      app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/RemoteCopyGetOptionTask.java
  80. 7 7
      app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/RemoteCopySetOptionTask.java
  81. 12 12
      app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/RemoteCopyTask.java
  82. 43 43
      app/src/main/java/epson/print/rpcopy/CopyActivity.java
  83. 1 1
      app/src/main/java/epson/print/rpcopy/CopyProcess.java
  84. 9 9
      app/src/main/java/epson/print/rpcopy/CopySettingActivity.java
  85. 23 23
      app/src/main/java/epson/print/screen/ActivityPrinterSetting.java
  86. 3 3
      app/src/main/java/epson/print/screen/ConfirmMultiScr.java
  87. 19 19
      app/src/main/java/epson/print/screen/PageRangeSetting.java
  88. 20 20
      app/src/main/java/epson/print/screen/PrintProgress.java
  89. 43 43
      app/src/main/java/epson/print/screen/PrinterFinder.java
  90. 53 53
      app/src/main/java/epson/print/screen/SearchPrinterScr.java
  91. 15 15
      app/src/main/java/epson/print/screen/SettingScr.java
  92. 1 1
      app/src/main/java/epson/print/screen/StringListSelectDialog.java
  93. 61 61
      app/src/main/java/epson/print/service/EpsonService.java
  94. 1 1
      app/src/main/java/epson/print/storage/ConfirmCancelDialog.java
  95. 1 1
      app/src/main/java/epson/print/storage/LocalProgressDialog.java
  96. 1 1
      app/src/main/java/epson/print/storage/OneButtonDialogFragment.java
  97. 9 9
      app/src/main/java/epson/print/storage/StorageActivity.java
  98. 1 1
      app/src/main/java/epson/print/storage/StorageSecureStore.java
  99. 2 2
      app/src/main/java/epson/print/storage/dropbox/DropboxV2SignInActivity.java
  100. 13 13
      app/src/main/java/epson/print/storage/evernote/EvernoteClient.java

+ 3 - 3
app/src/main/java/com/epson/cameracopy/ui/CropImageActivity.java

@@ -762,7 +762,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
                 new Thread(new Runnable() {
                     public void run() {
                         CropImageActivity.mImageCollect.MakePreviewImageRAW(CropImageActivity.mDeviceSize.width, CropImageActivity.mDeviceSize.height);
-                        CropImageActivity.this.GetPreviewImage(0);
+                        GetPreviewImage(0);
                         CropImageActivity.mHandler.sendEmptyMessage(CropImageActivity.MSG_PREVIEW_LOAD_FINISH);
                     }
                 }).start();
@@ -937,7 +937,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
                     contentValues.put("mime_type", "image/jpeg");
                     contentValues.put("_data", fromFile.getPath());
                     contentValues.put("datetaken", Long.valueOf(System.currentTimeMillis()));
-                    CropImageActivity.this.getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues);
+                    getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, contentValues);
                 }
                 CropImageActivity.mHandler.sendEmptyMessage(i);
             }
@@ -1208,7 +1208,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
                     if (motionEvent.getAction() != 0) {
                         return false;
                     }
-                    CustomToast.this.cancel();
+                    cancel();
                     return false;
                 }
             });

+ 3 - 3
app/src/main/java/com/epson/cameracopy/ui/DocumentSizeSettingActivity.java

@@ -199,7 +199,7 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
 
         public View getView(int i, View view, ViewGroup viewGroup) {
             if (view == null) {
-                view = DocumentSizeSettingActivity.this.getLayoutInflater().inflate(R.layout.select_list_row, viewGroup, false);
+                view = getLayoutInflater().inflate(R.layout.select_list_row, viewGroup, false);
             }
             RegistedDocumentSizeList registedDocumentSizeList = mRegistedDocumentSizeList;
             if (registedDocumentSizeList == null) {
@@ -237,12 +237,12 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
             builder.setMessage(string);
             builder.setPositiveButton(R.string.yes_button, new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
-                    ((DocumentSizeSettingActivity) NotifyDialogFragment.this.getActivity()).doPositiveClick(i);
+                    ((DocumentSizeSettingActivity) getActivity()).doPositiveClick(i);
                 }
             });
             builder.setNegativeButton(R.string.no_button, new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
-                    ((DocumentSizeSettingActivity) NotifyDialogFragment.this.getActivity()).doNegativeClick(i);
+                    ((DocumentSizeSettingActivity) getActivity()).doNegativeClick(i);
                 }
             });
             AlertDialog create = builder.create();

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

@@ -28,7 +28,7 @@ public class ConfirmCancelDialog extends DialogFragment {
         setCancelable(false);
         return new AlertDialog.Builder(getActivity()).setMessage(i).setPositiveButton((CharSequence) getString(R.string.str_yes), (DialogInterface.OnClickListener) new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                ConfirmCancelDialog.this.doCancel();
+                doCancel();
             }
         }).setNegativeButton((CharSequence) getString(R.string.str_no), (DialogInterface.OnClickListener) new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {

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

@@ -43,7 +43,7 @@ public class LocalProgressDialog extends DialogFragment {
         Button button = (Button) inflate.findViewById(R.id.cancelButton);
         button.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                LocalProgressDialog.this.showCancelConfirmDialog();
+                showCancelConfirmDialog();
             }
         });
         button.setText(R.string.str_cancel);

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

@@ -39,7 +39,7 @@ public class OneButtonDialogFragment extends DialogFragment {
         super.onCreateDialog(bundle);
         return new AlertDialog.Builder(getActivity()).setMessage(mMessageId).setPositiveButton(R.string.str_ok, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                FragmentActivity activity = OneButtonDialogFragment.this.getActivity();
+                FragmentActivity activity = getActivity();
                 if (activity != null) {
                     ((DialogCallback) activity).buttonPressed (mDialogId);
                 }

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

@@ -110,7 +110,7 @@ class StorageActivity extends ActivityIACommon {
                 public void onReceive(Context context, Intent intent) {
                     String action = intent.getAction();
                     int intExtra = intent.getIntExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, 0);
-                    if (action.equals(StorageWaitingActivity.CANCEL_REQUEST_ACTION) && OverlayProgress.this.mRequestCode == intExtra) {
+                    if (action.equals(StorageWaitingActivity.CANCEL_REQUEST_ACTION) && mRequestCode == intExtra) {
                         cancelRequestCallback.onCancelRequest(intent);
                     }
                 }

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

@@ -229,7 +229,7 @@ public class StorageSecureStore {
                 for (int i = 0; i < cursor.getCount(); i++) {
                     cursor.moveToPosition(i);
                     String string = cursor.getString(0);
-                    byte[] decodeAes = StorageSecureStore.this.decodeAes(cursor.getBlob(1), mSecretText);
+                    byte[] decodeAes = decodeAes(cursor.getBlob(1), mSecretText);
                     if (decodeAes != null) {
                         hashMap.put(string, new String(decodeAes));
                     }

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

@@ -40,9 +40,9 @@ public class DropboxV2SignInActivity extends StorageSignInActivity {
 
         protected void onPostExecute(Boolean bool) {
             if (bool == null || !bool.booleanValue()) {
-                DropboxV2SignInActivity.this.showLoginErrorAndFinish();
+                showLoginErrorAndFinish();
             } else {
-                DropboxV2SignInActivity.this.finish();
+                finish();
             }
         }
 

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

@@ -72,16 +72,16 @@ public class EvernoteClient extends StorageServiceClient {
                     StorageServiceClient.ProcessError processError2 = StorageServiceClient.ProcessError.NONE;
                     do {
                         try {
-                            StorageItem uploadFolder = C09441.this.request.getUploadFolder();
+                            StorageItem uploadFolder = request.getUploadFolder();
                             if (uploadFolder == null) {
-                                uploadFolder = C09441.this.request.newUploadFolder();
+                                uploadFolder = request.newUploadFolder();
                             }
-                            processError = C09441.this.uploader.upload(uploadFolder, str, str2);
+                            processError = uploader.upload(uploadFolder, str, str2);
                         } catch (Exception e) {
-                            processError = C09441.this.request.handleException(e);
+                            processError = request.handleException(e);
                         }
                     } while (StorageServiceClient.ProcessError.RETRY.equals(processError));
-                    C09441.this.uploaded.onUploadComplete(str, str2, processError);
+                    uploaded.onUploadComplete(str, str2, processError);
                     return null;
                 }
             }
@@ -117,12 +117,12 @@ public class EvernoteClient extends StorageServiceClient {
                     StorageServiceClient.ProcessError processError2 = StorageServiceClient.ProcessError.NONE;
                     do {
                         try {
-                            processError = C09452.this.downloader.download(storageItem.path, str);
+                            processError = downloader.download(storageItem.path, str);
                         } catch (Exception e) {
-                            processError = C09452.this.request.handleException(e);
+                            processError = request.handleException(e);
                         }
                     } while (StorageServiceClient.ProcessError.RETRY.equals(processError));
-                    C09452.this.downloaded.onDownloadComplete(storageItem, str, processError);
+                    downloaded.onDownloadComplete(storageItem, str, processError);
                     return null;
                 }
             }
@@ -146,7 +146,7 @@ public class EvernoteClient extends StorageServiceClient {
             private List<StorageItem> getPrintableItems(List<StorageItem> list) {
                 ArrayList arrayList = new ArrayList();
                 for (StorageItem next : list) {
-                    if (next.type != StorageItem.ItemType.FILE || EvernoteClient.this.isPrintableFileTypes(next)) {
+                    if (next.type != StorageItem.ItemType.FILE || isPrintableFileTypes(next)) {
                         arrayList.add(next);
                     }
                 }
@@ -166,17 +166,17 @@ public class EvernoteClient extends StorageServiceClient {
                     do {
                         try {
                             processError = StorageServiceClient.ProcessError.NONE;
-                            list = C09463.this.request.getItemList(storageItem);
+                            list = request.getItemList(storageItem);
                         } catch (Exception e) {
-                            processError = C09463.this.request.handleException(e);
+                            processError = request.handleException(e);
                         }
                     } while (StorageServiceClient.ProcessError.RETRY.equals(processError));
                     if (list != null) {
-                        list = C09463.this.getPrintableItems(list);
+                        list = getPrintableItems(list);
                     } else {
                         processError = StorageServiceClient.ProcessError.ERROR;
                     }
-                    C09463.this.enumerated.onEnumerateComplete(list, processError);
+                    enumerated.onEnumerateComplete(list, processError);
                     return null;
                 }
             }

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

@@ -78,7 +78,7 @@ public class GoogleV3UploadSignInActivity extends AppCompatActivity implements A
         if (mActivityForeground) {
             mForegroundRunnableList.addLast(new Runnable() {
                 public void run() {
-                    GoogleV3UploadSignInActivity.this.showErrorDialog(i, str);
+                    showErrorDialog(i, str);
                 }
             });
         } else {

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

@@ -79,8 +79,8 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         mListView.setAdapter(mFileListAdapter);
         mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
-                int unused = ListAndDownloadActivity.this.mPosition = i;
-                ListAndDownloadActivity.this.localOnItemClick(i);
+                int unused = mPosition = i;
+                localOnItemClick(i);
             }
         });
         mSignInMessage = (TextView) findViewById(16908292);
@@ -108,7 +108,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         if (mActivityForeground) {
             mForegroundRunnableList.addLast(new Runnable() {
                 public void run() {
-                    ListAndDownloadActivity.this.dismissDialog(str);
+                    dismissDialog(str);
                 }
             });
             return;
@@ -224,7 +224,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         if (mActivityForeground) {
             mForegroundRunnableList.addLast(new Runnable() {
                 public void run() {
-                    ListAndDownloadActivity.this.showErrorDialog(i, str);
+                    showErrorDialog(i, str);
                 }
             });
         } else {
@@ -258,7 +258,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         if (mActivityForeground) {
             mForegroundRunnableList.addLast(new Runnable() {
                 public void run() {
-                    ListAndDownloadActivity.this.showProgressFragment(z, i);
+                    showProgressFragment(z, i);
                 }
             });
             return;
@@ -353,7 +353,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         if (mActivityForeground) {
             mForegroundRunnableList.addLast(new Runnable() {
                 public void run() {
-                    ListAndDownloadActivity.this.removeProgressIfExists();
+                    removeProgressIfExists();
                 }
             });
             return;

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

@@ -525,10 +525,10 @@ public class OneDriveClient extends StorageServiceClient {
                 inputStream = null;
                 boolean z = false;
                 bCanceled = false;
-                bConvertPdf = isConvertPdfExtension((Item) OneDriveDownloader.this.mStorageItem.userInfo) || isConvertPdfMimeType((Item) OneDriveDownloader.this.mStorageItem.userInfo);
+                bConvertPdf = isConvertPdfExtension((Item) mStorageItem.userInfo) || isConvertPdfMimeType((Item) mStorageItem.userInfo);
                 if (bConvertPdf && !this.bCanceled) {
                     try {
-                        inputStream = getDownloadInputStreamPdf(oneDriveClient, OneDriveDownloader.this.mItemid);
+                        inputStream = getDownloadInputStreamPdf(oneDriveClient, mItemid);
                     } catch (ClientException e) {
                         e.printStackTrace();
                         if (e.isError(OneDriveErrorCodes.NotSupported)) {
@@ -540,13 +540,13 @@ public class OneDriveClient extends StorageServiceClient {
                 }
                 if (bConvertPdf && !this.bCanceled) {
                     try {
-                        inputStream = getDownloadInputStream(oneDriveClient, OneDriveDownloader.this.mItemid);
+                        inputStream = getDownloadInputStream(oneDriveClient, mItemid);
                     } catch (ClientException e2) {
                         e2.printStackTrace();
                         inputStream = null;
                     }
                 }
-                String access$1600 = bConvertPdf ? getConvertPdfName (mWriteFilename) : OneDriveDownloader.this.mWriteFilename;
+                String access$1600 = bConvertPdf ? getConvertPdfName (mWriteFilename) : mWriteFilename;
                 if (inputStream != null && !this.bCanceled) {
                     try {
                         File file = new File(access$1600);
@@ -683,7 +683,7 @@ public class OneDriveClient extends StorageServiceClient {
             if (uploadSession2 != null) {
                 uploadLargeFile(uploadSession2, fileInputStream, i, new IProgressCallback<Item>() {
                     public void success(Item item) {
-                        boolean unused = LocalUploader.this.result = true;
+                        boolean unused = result = true;
                     }
 
                     public void failure(ClientException clientException) {
@@ -692,7 +692,7 @@ public class OneDriveClient extends StorageServiceClient {
 
                     public void progress(long j, long j2) {
                         if  (bCanceled) {
-                            LocalUploader.this.uploadcancel();
+                            uploadcancel();
                         }
                     }
                 });

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

@@ -17,9 +17,9 @@ public class OneDriveSignInActivity extends StorageSignInActivity {
             OneDriveAuthenticator.getOneDriveClient(this, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
                 public void onNotifyOneDriveClient(IOneDriveClient iOneDriveClient) {
                     if (iOneDriveClient != null) {
-                        OneDriveSignInActivity.this.finish();
+                        finish();
                     } else {
-                        OneDriveSignInActivity.this.showLoginErrorAndFinish();
+                        showLoginErrorAndFinish();
                     }
                 }
             });

+ 1 - 1
app/src/main/java/com/epson/lib/escani2/EscanI2Lib.java

@@ -186,7 +186,7 @@ public class EscanI2Lib {
             }
             sEscanI2NativeInterface.setPageWriteCallback(new EscanI2NativeInterface.PageWriteCallback() {
                 public void pageWriteDone(int i, int i2) {
-                    EscanI2Lib.this.updatePages(i, i2);
+                    updatePages(i, i2);
                 }
             });
         } else {

+ 1 - 1
app/src/main/java/com/epson/memcardacc/AltAlertDialogFragment.java

@@ -31,7 +31,7 @@ public class AltAlertDialogFragment extends DialogFragment {
         String string = arguments.getString(ARG_TITLE);
         AlertDialog create = new AlertDialog.Builder(getActivity()).setMessage(arguments.getString(ARG_MESSAGE_STR)).setCancelable(false).setPositiveButton(R.string.str_btn_close, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                ((DialogCallback) AltAlertDialogFragment.this.getActivity()).onPositiveCallback();
+                ((DialogCallback) getActivity()).onPositiveCallback();
             }
         }).create();
         if (string != null) {

+ 8 - 8
app/src/main/java/com/epson/memcardacc/ConfirmReadMemcard.java

@@ -528,11 +528,11 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         protected void onPostExecute(Long l) {
             if (l != null) {
                 if (l.longValue() == 0) {
-                    ConfirmReadMemcard.this.localShowDialog(ConfirmReadMemcard.DIALOG_COPY_RESULT_CANCEL);
+                    localShowDialog(ConfirmReadMemcard.DIALOG_COPY_RESULT_CANCEL);
                 } else if (l.longValue() < 0) {
-                    ConfirmReadMemcard.this.localShowDialog(ConfirmReadMemcard.DIALOG_COMMUNICATION_ERROR);
+                    localShowDialog(ConfirmReadMemcard.DIALOG_COMMUNICATION_ERROR);
                 } else {
-                    ConfirmReadMemcard.this.updateFileSize(l.longValue());
+                    updateFileSize(l.longValue());
                 }
             }
             ConfirmReadMemcard.mModelDialog.doDismiss(ConfirmReadMemcard.DIALOG_PROGRESS);
@@ -579,16 +579,16 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
             ConfirmReadMemcard.mModelDialog.doDismiss(ConfirmReadMemcard.DIALOG_PROGRESS);
             switch (num.intValue()) {
                 case 0:
-                    ConfirmReadMemcard.this.startCopyActivity();
+                    startCopyActivity();
                     return;
                 case 1:
-                    ConfirmReadMemcard.this.localShowDialog(ConfirmReadMemcard.DIALOG_DISK_SPACE_SHORTAGE);
+                    localShowDialog(ConfirmReadMemcard.DIALOG_DISK_SPACE_SHORTAGE);
                     return;
                 case 10:
-                    ConfirmReadMemcard.this.localShowDialog(ConfirmReadMemcard.DIALOG_PRINTER_BUSY);
+                    localShowDialog(ConfirmReadMemcard.DIALOG_PRINTER_BUSY);
                     return;
                 case 11:
-                    ConfirmReadMemcard.this.localShowDialog(ConfirmReadMemcard.DIALOG_COMMUNICATION_ERROR);
+                    localShowDialog(ConfirmReadMemcard.DIALOG_COMMUNICATION_ERROR);
                     return;
                 default:
                     return;
@@ -598,7 +598,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         protected void onPreExecute() {
             ConfirmReadMemcard.mModelDialog.doShow(ConfirmReadMemcard.DIALOG_PROGRESS);
             if (ConfirmReadMemcard.mCopyTargetFolderName == null) {
-                ConfirmReadMemcard.this.setTargetDirectory(MemcardConfig.DEFAULT_READER_LOCAL_DIRECTORY);
+                setTargetDirectory(MemcardConfig.DEFAULT_READER_LOCAL_DIRECTORY);
             }
         }
     }

+ 13 - 13
app/src/main/java/com/epson/memcardacc/ConfirmWriteMemcard.java

@@ -133,7 +133,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         memCardWriteConvertViewModel.setOrigFileList(arrayList);
         memCardWriteConvertViewModel.getData().observe(this, new Observer<MemCardWriteConvertViewModel.ConvertResult>() {
             public void onChanged(@Nullable MemCardWriteConvertViewModel.ConvertResult convertResult) {
-                ConfirmWriteMemcard.this.onUpdateViewModelData(convertResult);
+                onUpdateViewModelData(convertResult);
             }
         });
     }
@@ -607,9 +607,9 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
 
         protected void onPostExecute(String str) {
             if (str == null) {
-                ConfirmWriteMemcard.this.setWriteDirName("");
+                setWriteDirName("");
             } else {
-                ConfirmWriteMemcard.this.setWriteDirName(str);
+                setWriteDirName(str);
             }
             ConfirmWriteMemcard.mModelDialog.doDismiss(ConfirmWriteMemcard.DIALOG_TARGET_DIRECTORY_NAME_TASK);
         }
@@ -619,7 +619,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         }
 
         protected String doInBackground(Void... voidArr) {
-            return ConfirmWriteMemcard.this.cifsGetTargetFoldername();
+            return cifsGetTargetFoldername();
         }
     }
 
@@ -638,13 +638,13 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
                     return 10;
                 default:
                     if  (!isWirteDirNameDetermined()) {
-                        String cifsGetTargetFoldername = ConfirmWriteMemcard.this.cifsGetTargetFoldername();
+                        String cifsGetTargetFoldername = cifsGetTargetFoldername();
                         if (cifsGetTargetFoldername == null || cifsGetTargetFoldername.length() <= 0) {
                             return 12;
                         }
-                        ConfirmWriteMemcard.this.setWriteDirName(cifsGetTargetFoldername);
+                        setWriteDirName(cifsGetTargetFoldername);
                     }
-                    int access$400 = ConfirmWriteMemcard.this.capacityCheck();
+                    int access$400 = capacityCheck();
                     if (access$400 != 0) {
                         return Integer.valueOf(access$400);
                     }
@@ -661,24 +661,24 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
             int intValue = num.intValue();
             switch (intValue) {
                 case 0:
-                    ConfirmWriteMemcard.this.startCopyActivity();
+                    startCopyActivity();
                     return;
                 case 1:
-                    ConfirmWriteMemcard.this.localShowDialog(ConfirmWriteMemcard.DIALOG_DISK_SPACE_SHORTAGE);
+                    localShowDialog(ConfirmWriteMemcard.DIALOG_DISK_SPACE_SHORTAGE);
                     return;
                 case 2:
-                    ConfirmWriteMemcard.this.localShowDialog(ConfirmWriteMemcard.DIALOG_STORAGE_CONNECT_ERROR);
+                    localShowDialog(ConfirmWriteMemcard.DIALOG_STORAGE_CONNECT_ERROR);
                     return;
                 default:
                     switch (intValue) {
                         case 10:
-                            ConfirmWriteMemcard.this.localShowDialog(ConfirmWriteMemcard.DIALOG_PRINTER_BUSY);
+                            localShowDialog(ConfirmWriteMemcard.DIALOG_PRINTER_BUSY);
                             return;
                         case 11:
-                            ConfirmWriteMemcard.this.localShowDialog(ConfirmWriteMemcard.DIALOG_COMMUNICATION_ERROR);
+                            localShowDialog(ConfirmWriteMemcard.DIALOG_COMMUNICATION_ERROR);
                             return;
                         case 12:
-                            ConfirmWriteMemcard.this.localShowDialog(ConfirmWriteMemcard.DIALOG_FILE_WRITE_ERROR);
+                            localShowDialog(ConfirmWriteMemcard.DIALOG_FILE_WRITE_ERROR);
                             return;
                         default:
                             return;

+ 2 - 2
app/src/main/java/com/epson/memcardacc/DirectorySelecterActivity.java

@@ -110,9 +110,9 @@ public class DirectorySelecterActivity extends Activity {
 
         public void afterTextChanged(Editable editable) {
             if (editable.length() <= 0) {
-                DirectorySelecterActivity.this.disableOkButton();
+                disableOkButton();
             } else {
-                DirectorySelecterActivity.this.enableOkButton();
+                enableOkButton();
             }
         }
     }

+ 1 - 1
app/src/main/java/com/epson/memcardacc/LocalAlertDialogFragment.java

@@ -46,7 +46,7 @@ public class LocalAlertDialogFragment extends DialogFragment {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setMessage(i).setPositiveButton(getActivity().getString(R.string.str_ok), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                LocalAlertDialogFragment.this.execCallback();
+                execCallback();
             }
         });
         if (!z) {

+ 1 - 1
app/src/main/java/com/epson/memcardacc/MemCardWriteConvertViewModel.java

@@ -50,7 +50,7 @@ public class MemCardWriteConvertViewModel extends AndroidViewModel {
         public void setOrigFileList(@NonNull final ArrayList<String> arrayList) {
             new AsyncTask<Void, Void, ConvertResult>() {
                 protected ConvertResult doInBackground(Void... voidArr) {
-                    return ConvertLiveData.this.convertAndGetFileSize(arrayList);
+                    return convertAndGetFileSize(arrayList);
                 }
 
                 protected void onPostExecute(ConvertResult convertResult) {

+ 9 - 9
app/src/main/java/com/epson/memcardacc/MemcardImageGrid.java

@@ -79,7 +79,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
                     MemcardImageGrid.mHandler.sendEmptyMessageDelayed(2, 300);
                     return;
                 case 2:
-                    MemcardImageGrid.this.execNextTaskOrIdle();
+                    execNextTaskOrIdle();
                     return;
                 default:
                     return;
@@ -109,7 +109,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         if (memcardBitmapCache == null || !memcardBitmapCache.checkEnv()) {
             new MemcardTempAlertDialog().showAlertDialog(this, new MemcardTempAlertDialog.DialogCallback() {
                 public void onPositiveCallback() {
-                    MemcardImageGrid.this.finish();
+                    finish();
                 }
             });
         }
@@ -127,7 +127,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         mSelectedFileNumText = (TextView) findViewById(R.id.textSelectedImageNum);
         mGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
-                MemcardImageGrid.this.gridViewItemClicked(adapterView, view, i, j);
+                gridViewItemClicked(adapterView, view, i, j);
             }
         });
         mThumbnailWidth = getResources().getDimensionPixelSize(R.dimen.image_selector_grid_thumbnail_size);
@@ -616,7 +616,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
                     }
                 }
                 MemcardImageGrid.mStartDirectory = false;
-                MemcardImageGrid.this.selectFileList(fileList);
+                selectFileList(fileList);
                 mBaseDir = str;
                 mFileList = fileList;
                 mAdapterUpdateWaitDone = false;
@@ -658,8 +658,8 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
                 MemcardImageGrid.mImageFileListAdapter.setFileList(mBaseDir, mFileList);
                 MemcardImageGrid.mImageFileListAdapter.notifyDataSetChanged();
                 mAdapterUpdateWaitDone = true;
-                MemcardImageGrid.this.updateSelectedNumber();
-                MemcardImageGrid.this.dismissProgressDialog();
+                updateSelectedNumber();
+                dismissProgressDialog();
                 return;
             }
             MemcardImageGrid.mImageFileListAdapter.notifyDataSetChanged();
@@ -668,8 +668,8 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         protected void onPostExecute(Integer num) {
             EPLog.i(MemcardImageGrid.LOG_TAG, "doInBackground() done.");
             if (num == null) {
-                MemcardImageGrid.this.dismissProgressDialog();
-                MemcardImageGrid.this.localShowDialog(MemcardImageGrid.DIALOG_FILE_READ_ERROR);
+                dismissProgressDialog();
+                localShowDialog(MemcardImageGrid.DIALOG_FILE_READ_ERROR);
                 return;
             }
             switch (num.intValue()) {
@@ -677,7 +677,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
                     MemcardImageGrid.mImageFileListAdapter.notifyDataSetChanged();
                     return;
                 case 1:
-                    MemcardImageGrid.this.localShowDialog(MemcardImageGrid.DIALOG_FILE_READ_ERROR);
+                    localShowDialog(MemcardImageGrid.DIALOG_FILE_READ_ERROR);
                     return;
                 default:
                     return;

+ 2 - 2
app/src/main/java/com/epson/memcardacc/MemcardPhotocopyTop.java

@@ -20,7 +20,7 @@ public class MemcardPhotocopyTop extends MemcardTopSuper {
         if (mBitmapCache == null || !mBitmapCache.checkEnv()) {
             new MemcardTempAlertDialog().showAlertDialog(this, new MemcardTempAlertDialog.DialogCallback() {
                 public void onPositiveCallback() {
-                    MemcardPhotocopyTop.this.finish();
+                    finish();
                 }
             });
         }
@@ -33,7 +33,7 @@ public class MemcardPhotocopyTop extends MemcardTopSuper {
         mLaunchType = 0;
         findViewById(R.id.photocopy_button).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                MemcardPhotocopyTop.this.launchWriter();
+                launchWriter();
             }
         });
     }

+ 4 - 4
app/src/main/java/com/epson/memcardacc/MemcardReadProgress.java

@@ -60,7 +60,7 @@ public class MemcardReadProgress extends Activity {
         mCancelButton = (Button) findViewById(R.id.cancel_button);
         mCancelButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                MemcardReadProgress.this.actionCancel();
+                actionCancel();
             }
         });
         mCopyTask = new CopyTask();
@@ -115,12 +115,12 @@ public class MemcardReadProgress extends Activity {
         protected void onCancelled() {
             MemcardUtil.clearKeepScreenOn (getWindow());
             EPLog.i(MemcardReadProgress.LOG_TAG, "canceld in AsyncTask");
-            MemcardReadProgress.this.finishWithState(0, mCommonLog);
+            finishWithState(0, mCommonLog);
         }
 
         protected void onPostExecute(Integer num) {
             MemcardUtil.clearKeepScreenOn (getWindow());
-            MemcardReadProgress.this.finishWithState(num.intValue(), mCommonLog);
+            finishWithState(num.intValue(), mCommonLog);
         }
 
         protected void onPreExecute() {
@@ -131,7 +131,7 @@ public class MemcardReadProgress extends Activity {
         }
 
         protected void onProgressUpdate(Integer... numArr) {
-            MemcardReadProgress.this.setProgress(numArr[0].intValue(), MemcardReadProgress.mImageList.size());
+            setProgress(numArr[0].intValue(), MemcardReadProgress.mImageList.size());
         }
 
         protected Integer doInBackground(Void... voidArr) {

+ 1 - 1
app/src/main/java/com/epson/memcardacc/MemcardTop.java

@@ -21,7 +21,7 @@ public class MemcardTop extends MemcardTopSuper {
         if (mBitmapCache == null || !mBitmapCache.checkEnv()) {
             new MemcardTempAlertDialog().showAlertDialog(this, new MemcardTempAlertDialog.DialogCallback() {
                 public void onPositiveCallback() {
-                    MemcardTop.this.finish();
+                    finish();
                 }
             });
         }

+ 4 - 4
app/src/main/java/com/epson/memcardacc/MemcardTopSuper.java

@@ -137,15 +137,15 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
         if (memcardCheckTask == null || memcardCheckTask.getStatus() == AsyncTask.Status.FINISHED) {
             mMemcardCheckTask = new MemcardCheckTask(this, new MemcardCheckTask.MemcardCheckCallback() {
                 public void onAuthInfoRequired(MemcardCheckTask memcardCheckTask, boolean z) {
-                    MemcardTopSuper.this.authInfoRequested(memcardCheckTask, z);
+                    authInfoRequested(memcardCheckTask, z);
                 }
 
                 public void onPreExecute() {
-                    MemcardTopSuper.this.onPreMemcardChek();
+                    onPreMemcardChek();
                 }
 
                 public void onMemcardCheckEnd(Integer num, int i) {
-                    MemcardTopSuper.this.onMemcardCheckEnd(num, i);
+                    onMemcardCheckEnd(num, i);
                 }
             }, getStorageSetType());
             mMemcardCheckTask.execute(new Void[0]);
@@ -193,7 +193,7 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
                 public void run() {
                     MemcardCheckTask memcardCheckTask = memcardCheckTask;
                     if (memcardCheckTask != null && !memcardCheckTask.isCancelled()) {
-                        MemcardTopSuper.this.showPasswordDialog(z);
+                        showPasswordDialog(z);
                     }
                 }
             });

+ 3 - 3
app/src/main/java/com/epson/memcardacc/MemcardWriteProgress.java

@@ -80,7 +80,7 @@ public class MemcardWriteProgress extends Activity {
         mCancelButton = (Button) findViewById(R.id.cancel_button);
         mCancelButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                MemcardWriteProgress.this.actionCancelTask();
+                actionCancelTask();
             }
         });
         execCopyTask();
@@ -210,7 +210,7 @@ public class MemcardWriteProgress extends Activity {
 
         public void tryConnectWifiDirect() {
             if (!mCheckWifiDirect) {
-                MemcardWriteProgress.this.connectOk();
+                connectOk();
                 return;
             }
             if (!WiFiDirectManager.isNeedConnect(mActivity, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
@@ -221,7 +221,7 @@ public class MemcardWriteProgress extends Activity {
                     return;
                 }
             }
-            MemcardWriteProgress.this.connectOk();
+            connectOk();
         }
 
         public void tryDisconnectWifiDirect() {

+ 4 - 4
app/src/main/java/com/epson/memcardacc/PasswordDialogFragment.java

@@ -56,14 +56,14 @@ public class PasswordDialogFragment extends DialogFragment implements DialogInte
         });
         builder.setView(inflate).setPositiveButton(R.string.str_ok, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                String userName = PasswordDialogFragment.this.getUserName();
-                String password = PasswordDialogFragment.this.getPassword();
+                String userName = getUserName();
+                String password = getPassword();
                 CifsAccess.setSmbAuthInfo(new SmbAuthInfo(userName, password));
-                ((Callback) PasswordDialogFragment.this.getActivity()).onPositiveClicked(userName, password);
+                ((Callback) getActivity()).onPositiveClicked(userName, password);
             }
         }).setNegativeButton(R.string.str_cancel, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                PasswordDialogFragment.this.cancelAuthentication();
+                cancelAuthentication();
             }
         }).setTitle(R.string.str_enter_pass);
         AlertDialog create = builder.create();

+ 1 - 1
app/src/main/java/com/epson/memcardacc/PhotoCopyImageSelectActivity.java

@@ -25,7 +25,7 @@ public class PhotoCopyImageSelectActivity extends ImageSelectActivity implements
     private DialogType mDialogType;
     private final Observer<FileConvertViewModel.FileConvertStatus> mFileConvertStateObserver = new Observer<FileConvertViewModel.FileConvertStatus>() {
         public void onChanged(@Nullable FileConvertViewModel.FileConvertStatus fileConvertStatus) {
-            PhotoCopyImageSelectActivity.this.onStateChanged(fileConvertStatus);
+            onStateChanged(fileConvertStatus);
         }
     };
     private FileConvertViewModel mFileConvertViewModel;

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

@@ -969,7 +969,7 @@ public class BleWork {
                         notifySetThread.stop = true;
                         notifySetThread.success = true;
                     } else {
-                        NotifySetThread.this.stop = true;
+                        stop = true;
                     }
                 }
             });

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectBase.java

@@ -180,7 +180,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
 
                 protected void onPostExecute(Void voidR) {
                     EPLog.i(ActivityConnectBase.TAG, "Timeout ConnectingObserver");
-                    ActivityConnectBase.this.onError();
+                    onError();
                 }
             }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
         }

+ 7 - 7
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityRequestLocationPermission.java

@@ -72,15 +72,15 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
                                 ActivityRequestLocationPermission activityRequestLocationPermission = ActivityRequestLocationPermission.this;
                                 activityRequestLocationPermission.requestPermissions(new String[]{activityRequestLocationPermission.requestPermission}, 1);
                             } else {
-                                ActivityRequestLocationPermission.this.startActivityForResult(new Intent("android.settings.APPLICATION_DETAILS_SETTINGS", Uri.parse("package:" + ActivityRequestLocationPermission.this.getPackageName())), 3);
+                                startActivityForResult(new Intent("android.settings.APPLICATION_DETAILS_SETTINGS", Uri.parse("package:" + getPackageName())), 3);
                             }
                             dialogInterface.dismiss();
                         }
                     }).setNegativeButton(R.string.str_cancel, new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
-                            ActivityRequestLocationPermission.this.setRejectRequestPermission();
+                            setRejectRequestPermission();
                             dialogInterface.dismiss();
-                            ActivityRequestLocationPermission.this.onError();
+                            onError();
                         }
                     }).setCancelable(false).create().show();
                     return;
@@ -229,17 +229,17 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
                         Status status = locationSettingsResult.getStatus();
                         int statusCode = status.getStatusCode();
                         if (statusCode == 0) {
-                            ActivityRequestLocationPermission.this.onSuccess();
+                            onSuccess();
                         } else if (statusCode == 6) {
                             try {
                                 status.startResolutionForResult(ActivityRequestLocationPermission.this, 1);
                             } catch (IntentSender.SendIntentException e) {
                                 e.printStackTrace();
-                                ActivityRequestLocationPermission.this.onError();
+                                onError();
                             }
                         } else if (statusCode == 8502) {
                             EPLog.e(ActivityRequestLocationPermission.TAG, "Receive LocationSettingsStatusCodes.SETTINGS_CHANGE_UNAVAILABLE;");
-                            ActivityRequestLocationPermission.this.onError();
+                            onError();
                         }
                     }
                 });
@@ -317,7 +317,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
                 } else if (instance.isUserResolvableError(isGooglePlayServicesAvailable)) {
                     instance.showErrorDialogFragment(this, isGooglePlayServicesAvailable, 2, new DialogInterface.OnCancelListener() {
                         public void onCancel(DialogInterface dialogInterface) {
-                            ActivityRequestLocationPermission.this.onError();
+                            onError();
                         }
                     });
                 } else {

+ 2 - 2
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityiPrintConnectStart.java

@@ -33,7 +33,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
         btnNext = (Button) viewGroup.findViewById(R.id.btn_next);
         btnNext.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                ActivityiPrintConnectStart.this.startActivityForResult(new Intent(ActivityiPrintConnectStart.this, ActivityiPrintConnect.class), 10);
+                startActivityForResult(new Intent(ActivityiPrintConnectStart.this, ActivityiPrintConnect.class), 10);
             }
         });
         mEscprLib.epsWrapperGetSetupConnectStrings(settingsTempAp);
@@ -113,7 +113,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
         public void onReceive(Context context, Intent intent) {
             if (intent.getAction().equals("android.net.wifi.SCAN_RESULTS")) {
                 EPLog.d(ActivityiPrintConnectStart.TAG, "Scan Results Available");
-                ActivityiPrintConnectStart.this.onScanResultAvailable();
+                onScanResultAvailable();
             }
         }
     }

+ 7 - 7
app/src/main/java/com/epson/mobilephone/common/wifidirect/ManageDefaultNetwork.java

@@ -76,15 +76,15 @@ public class ManageDefaultNetwork {
                             EPLog.d(ManageDefaultNetwork.TAG, "getResponseCode() : " + responseCode);
                             httpURLConnection.disconnect();
                             if (responseCode > 0) {
-                                ManageDefaultNetwork.this.canConnected = true;
+                                canConnected = true;
                             }
                         } catch (IOException unused) {
                             EPLog.e(ManageDefaultNetwork.TAG, "HttpURLConnection failed");
-                            ManageDefaultNetwork.this.canConnected = false;
+                            canConnected = false;
                         }
                         synchronized  (lock) {
                             try {
-                                ManageDefaultNetwork.this.lock.notifyAll();
+                                lock.notifyAll();
                             } catch (IllegalMonitorStateException e) {
                                 e.printStackTrace();
                             }
@@ -204,14 +204,14 @@ public class ManageDefaultNetwork {
             EPLog.d(ManageDefaultNetwork.TAG, "Call onAvailable");
             super.onAvailable(network);
             if (Build.VERSION.SDK_INT < 23) {
-                ConnectivityManager unused = ManageDefaultNetwork.this.connectivityManager;
+                ConnectivityManager unused = connectivityManager;
                 if (ConnectivityManager.getProcessDefaultNetwork() == null) {
-                    ConnectivityManager unused2 = ManageDefaultNetwork.this.connectivityManager;
+                    ConnectivityManager unused2 = connectivityManager;
                     if (ConnectivityManager.setProcessDefaultNetwork(network)) {
                         EPLog.d(ManageDefaultNetwork.TAG, "setProcessDefaultNetwork");
                     }
                 }
-            } else if  (connectivityManager.getBoundNetworkForProcess() == null && ManageDefaultNetwork.this.connectivityManager.bindProcessToNetwork(network)) {
+            } else if  (connectivityManager.getBoundNetworkForProcess() == null && connectivityManager.bindProcessToNetwork(network)) {
                 EPLog.d(ManageDefaultNetwork.TAG, "bindProcessToNetwork");
             }
         }
@@ -219,7 +219,7 @@ public class ManageDefaultNetwork {
         public void onLost(Network network) {
             EPLog.d(ManageDefaultNetwork.TAG, "Call onLost");
             super.onLost(network);
-            ManageDefaultNetwork.this.resetDefaultNetwork();
+            resetDefaultNetwork();
         }
     }
 }

+ 7 - 7
app/src/main/java/com/epson/mobilephone/common/wifidirect/SearchWiFiDirectPrinterTask.java

@@ -59,13 +59,13 @@ public class SearchWiFiDirectPrinterTask {
                 WifiP2pUtils.ConnectionInfo connectionInfo = WifiP2pUtils.getInstance (context).getConnectionInfo();
                 if (connectionInfo != null) {
                     if  (context).isExcludedMacAddress(WiFiControl.p2pAddr2PtrAddr(connectionInfo.p2PMacAdder, connectionInfo.printerName))) {
-                        SearchWiFiDirectPrinterTask.this.bDisConnectP2P = true;
+                        bDisConnectP2P = true;
                     }
                 }
                 SearchWiFiDirectPrinterTask.mWiFiP2PManager.discoverPeers (p2pChannnel, new WifiP2pManager.ActionListener() {
                     public void onSuccess() {
                         EPLog.d(SearchWiFiDirectPrinterTask.TAG, "discoverPeers Start");
-                        SearchWiFiDirectPrinterTask.this.serarchingStatus |= 2;
+                        serarchingStatus |= 2;
                     }
 
                     public void onFailure(int i) {
@@ -81,8 +81,8 @@ public class SearchWiFiDirectPrinterTask {
                                 if  (!bDisConnectP2P && WifiP2pUtils.getInstance (context).isConnectedWiFiP2P()) {
                                     EPLog.w(SearchWiFiDirectPrinterTask.TAG, "Disconnect P2P and And Retry");
                                     WifiP2pUtils.getInstance (context).disconnect();
-                                    SearchWiFiDirectPrinterTask.this.bDisConnectP2P = true;
-                                    SearchWiFiDirectPrinterTask.this.searchHandler.sendEmptyMessageDelayed(0, 1000);
+                                    bDisConnectP2P = true;
+                                    searchHandler.sendEmptyMessageDelayed(0, 1000);
                                     return;
                                 }
                             default:
@@ -288,7 +288,7 @@ public class SearchWiFiDirectPrinterTask {
         public void onReceive(Context context, Intent intent) {
             if (intent.getAction().equals("android.net.wifi.SCAN_RESULTS")) {
                 EPLog.d(SearchWiFiDirectPrinterTask.TAG, "Scan Results Available");
-                SearchWiFiDirectPrinterTask.this.onScanResultAvailable();
+                onScanResultAvailable();
             }
         }
     }
@@ -313,7 +313,7 @@ public class SearchWiFiDirectPrinterTask {
                     } else if (MacAddrFilter.getInstance(context).isExcludedMacAddress(WiFiControl.p2pAddr2PtrAddr(next.deviceAddress, next.deviceName))) {
                         EPLog.i(SearchWiFiDirectPrinterTask.TAG, "Excluded Printer " + next.deviceName);
                     } else {
-                        SearchWiFiDirectPrinterTask.this.onFindPrinterResult(WiFiControl.addSSIDPrefix(next.deviceName, WiFiControl.ConnectType.WiFiP2P), -1, next.deviceAddress);
+                        onFindPrinterResult(WiFiControl.addSSIDPrefix(next.deviceName, WiFiControl.ConnectType.WiFiP2P), -1, next.deviceAddress);
                     }
                 }
                 EPLog.i(SearchWiFiDirectPrinterTask.TAG, "Continue discover Peers()");
@@ -351,7 +351,7 @@ public class SearchWiFiDirectPrinterTask {
                 protected void onPostExecute(Void voidR) {
                     EPLog.i(SearchWiFiDirectPrinterTask.TAG, "Timeout ScanningObserver");
                     SearchWiFiDirectPrinterTask.mHandler.sendEmptyMessage (idResult);
-                    SearchWiFiDirectPrinterTask.this.interrupt();
+                    interrupt();
                 }
             }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
         }

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiScanner.java

@@ -26,7 +26,7 @@ public class WiFiScanner {
             refWiFiManager = new WeakReference<>(wifiManager);
             wifiScannerHandler.postDelayed(new Runnable() {
                 public void run() {
-                    WifiManager wifiManager = (WifiManager) WiFiScanner.this.refWiFiManager.get();
+                    WifiManager wifiManager = (WifiManager) refWiFiManager.get();
                     if  (refWiFiManager != null) {
                         EPLog.d (TAG, "Started Delayed startScan()");
                         if (!wifiManager.startScan()) {

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

@@ -392,7 +392,7 @@ public class FirmwareManager {
             firmwareManager.mProcStep = fWUpdateStep;
             switch (iArr[fWUpdateStep.ordinal()]) {
                 case 1:
-                    return FirmwareManager.this.getPrinterFWVer();
+                    return getPrinterFWVer();
                 case 2:
                     if (FirmwareManager.mUpdateInfUrl == null) {
                         return FWUpdateProcResult.NotSupport;
@@ -429,27 +429,27 @@ public class FirmwareManager {
             if (fWUpdateProcResult == FWUpdateProcResult.Success) {
                 switch (FirmwareManager.mProcStep) {
                     case GetPrinterFWVersion:
-                        FirmwareManager.this.endWithProcResult(fWUpdateProcResult);
+                        endWithProcResult(fWUpdateProcResult);
                         return;
                     case GetUpdateInf:
                         FirmwareManager firmwareManager = FirmwareManager.this;
                         firmwareManager.localCheckInfFileVersion(firmwareManager.mDlData);
                         return;
                     case Download:
-                        FirmwareManager.this.endWithProcResult(fWUpdateProcResult);
+                        endWithProcResult(fWUpdateProcResult);
                         return;
                     case ReadyUpdate:
-                        FirmwareManager.this.startProc(FWUpdateStep.Send);
+                        startProc(FWUpdateStep.Send);
                         return;
                     case Send:
-                        FirmwareManager.this.endWithProcResult(fWUpdateProcResult);
+                        endWithProcResult(fWUpdateProcResult);
                         return;
                     default:
-                        FirmwareManager.this.endWithProcResult(FWUpdateProcResult.Fail);
+                        endWithProcResult(FWUpdateProcResult.Fail);
                         return;
                 }
             } else {
-                FirmwareManager.this.endWithProcResult(fWUpdateProcResult);
+                endWithProcResult(fWUpdateProcResult);
             }
         }
 
@@ -878,13 +878,13 @@ public class FirmwareManager {
             FWUpdateProcResult fWUpdateProcResult = FWUpdateProcResult.Success;
             try {
                 File createNewSaveFile = FirmwareManager.createNewSaveFile();
-                String access$5002 = FirmwareManager.this.getNextRomURL();
+                String access$5002 = getNextRomURL();
                 if (access$5002 == null || FirmwareManager.mCurVer == null || FirmwareManager.mFirmInfFile.getMainVersion() == null) {
                     return FWUpdateProcResult.Fail;
                 }
                 int romNum = FirmwareManager.mFirmInfFile.getRomNum();
                 FWUpdateProcResult download = download(access$5002, createNewSaveFile, false, FirmwareManager.mCurRomNum, romNum);
-                while (download == FWUpdateProcResult.Success && (access$500 = FirmwareManager.this.getNextRomURL()) != null) {
+                while (download == FWUpdateProcResult.Success && (access$500 = getNextRomURL()) != null) {
                     if (isCancelled()) {
                         return FWUpdateProcResult.Cancel;
                     }

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

@@ -25,12 +25,12 @@ public class CheckEulaActivity extends AppCompatActivity {
 
         ((Button) findViewById(R.id.eulaAgreeButton)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                CheckEulaActivity.this.finishWithResult(-1);
+                finishWithResult(-1);
             }
         });
         ((Button) findViewById(R.id.eulaDisagreeButton)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                CheckEulaActivity.this.finishWithResult(0);
+                finishWithResult(0);
             }
         });
         mScrollView = (RestoreScrollView) findViewById(R.id.eulaCheckMainScrollView);

+ 1 - 1
app/src/main/java/epson/maintain/activity/EccPrintLog.java

@@ -71,7 +71,7 @@ public class EccPrintLog extends ActivityIACommon implements DialogProgress.Dial
                     }
                 }
                 i2 = -1100;
-                EccPrintLog.this.show_message_and_finish(i2);
+                show_message_and_finish(i2);
             }
         });
         startRemotePrintHistoryTask();

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

@@ -83,53 +83,53 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
             if (i != 99) {
                 switch (i) {
                     case 0:
-                        GetPrinterReplyData.this.showProDia();
+                        showProDia();
                         return;
                     case 1:
                         EPLog.i("Maintain", "********Maintain finish********");
-                        GetPrinterReplyData.this.interrupMaintainThread();
+                        interrupMaintainThread();
                         return;
                     case 2:
-                        GetPrinterReplyData.this.updateStatus(message.getData().getInt("GET_STT_RESULT"));
+                        updateStatus(message.getData().getInt("GET_STT_RESULT"));
                         return;
                     case 3:
-                        GetPrinterReplyData.this.updateInkInfo(message.getData().getInt("GET_INK_RESULT"));
+                        updateInkInfo(message.getData().getInt("GET_INK_RESULT"));
                         return;
                     case 4:
-                        GetPrinterReplyData.this.cancelLoadConPro();
-                        GetPrinterReplyData.this.interrupMaintainThread();
+                        cancelLoadConPro();
+                        interrupMaintainThread();
                         return;
                     case 5:
-                        GetPrinterReplyData.this.updateSelectedPrinter();
+                        updateSelectedPrinter();
                         return;
                     case 6:
-                        GetPrinterReplyData.this.showLoadConPro();
+                        showLoadConPro();
                         return;
                     case 7:
-                        GetPrinterReplyData.this.setResult(1);
-                        GetPrinterReplyData.this.finish();
+                        setResult(1);
+                        finish();
                         return;
                     case 9:
-                        GetPrinterReplyData.this.cancelLoadConPro();
-                        GetPrinterReplyData.this.endLoadConThread();
-                        GetPrinterReplyData.this.setResult(1);
-                        GetPrinterReplyData.this.finish();
+                        cancelLoadConPro();
+                        endLoadConThread();
+                        setResult(1);
+                        finish();
                         return;
                     case 10:
-                        GetPrinterReplyData.this.setupErrorMessage(10);
-                        GetPrinterReplyData.this.interrupMaintainThread();
+                        setupErrorMessage(10);
+                        interrupMaintainThread();
                         return;
                     default:
                         return;
                 }
             } else {
-                GetPrinterReplyData.this.endBackGroundThread();
-                GetPrinterReplyData.this.cancelLoadConPro();
-                GetPrinterReplyData.this.endLoadConThread();
+                endBackGroundThread();
+                cancelLoadConPro();
+                endLoadConThread();
                 Intent intent = new Intent();
-                intent.putExtra("extStatus", GetPrinterReplyData.this.extParam);
-                GetPrinterReplyData.this.setResult(message.getData().getInt("END_RELPY_RESULT"), intent);
-                GetPrinterReplyData.this.finish();
+                intent.putExtra("extStatus", extParam);
+                setResult(message.getData().getInt("END_RELPY_RESULT"), intent);
+                finish();
             }
         }
     };
@@ -245,7 +245,7 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 }
-                GetPrinterReplyData.this.loadConfig();
+                loadConfig();
                 if (GetPrinterReplyData.mPrinterId == null || GetPrinterReplyData.mPrinterName == null) {
                     GetPrinterReplyData getPrinterReplyData = GetPrinterReplyData.this;
                     getPrinterReplyData.mHavePrinter = false;
@@ -569,8 +569,8 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
             if (mLayoutId == R.layout.maintain_executing_dialog) {
                 ((Button) inflate.findViewById(R.id.close_btn)).setOnClickListener(new View.OnClickListener() {
                     public void onClick(View view) {
-                        CustomProDialog.this.cancel();
-                        GetPrinterReplyData.this.interrupMaintainThread();
+                        cancel();
+                        interrupMaintainThread();
                     }
                 });
             }

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

@@ -214,74 +214,74 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         public boolean handleMessage(Message message) {
             switch (message.what) {
                 case 0:
-                    MaintainActivity.this.showProDia();
+                    showProDia();
                     break;
                 case 1:
                     EPLog.i("Maintain", "********Maintain finish********");
-                    MaintainActivity.this.interrupMaintainThread();
-                    MaintainActivity.this.cancelProDia();
+                    interrupMaintainThread();
+                    cancelProDia();
                     break;
                 case 2:
-                    MaintainActivity.this.updateStatus(message.getData().getInt("GET_STT_RESULT"));
+                    updateStatus(message.getData().getInt("GET_STT_RESULT"));
                     break;
                 case 3:
-                    MaintainActivity.this.updateInkInfo(message.getData().getInt("GET_INK_RESULT"));
+                    updateInkInfo(message.getData().getInt("GET_INK_RESULT"));
                     break;
                 case 4:
-                    MaintainActivity.this.interrupMaintainThread();
+                    interrupMaintainThread();
                     break;
                 case 5:
-                    MaintainActivity.this.updateSelectedPrinter();
+                    updateSelectedPrinter();
                     break;
                 case 6:
-                    MaintainActivity.this.showLoadProgressBar();
-                    MaintainActivity.this.setButtonClickable(false);
-                    MaintainActivity.this.setEpsonConnectButton(1);
+                    showLoadProgressBar();
+                    setButtonClickable(false);
+                    setEpsonConnectButton(1);
                     break;
                 case 7:
-                    MaintainActivity.this.handlerError(message.getData().getInt(MaintainActivity.PROBE_RESULT), true);
+                    handlerError(message.getData().getInt(MaintainActivity.PROBE_RESULT), true);
                     break;
                 case 8:
                     MaintainActivity.mTvPrinterName.setText (printerName);
                     switch  (printerLocation) {
                         case 2:
-                            ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setVisibility(View.VISIBLE);
-                            ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.drawable.print_remote);
+                            ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setVisibility(View.VISIBLE);
+                            ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.drawable.print_remote);
                             break;
                         case 3:
-                            ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setVisibility(View.VISIBLE);
-                            ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.drawable.print_ip);
+                            ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setVisibility(View.VISIBLE);
+                            ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.drawable.print_ip);
                             break;
                         default:
                             if  (!printerName.equals("")) {
-                                ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setVisibility(View.VISIBLE);
-                                ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.drawable.print_local);
+                                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setVisibility(View.VISIBLE);
+                                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.drawable.print_local);
                                 break;
                             } else {
-                                ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setVisibility(View.GONE);
+                                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setVisibility(View.GONE);
                                 break;
                             }
                     }
                 case 9:
                     MaintainActivity.mUiHandler.sendEmptyMessage(11);
-                    MaintainActivity.this.hideLoadProgressBar();
-                    MaintainActivity.this.stopLoadConfigThread();
+                    hideLoadProgressBar();
+                    stopLoadConfigThread();
                     break;
                 case 10:
-                    MaintainActivity.this.setupErrorMessage(10);
-                    MaintainActivity.this.interrupMaintainThread();
+                    setupErrorMessage(10);
+                    interrupMaintainThread();
                     break;
                 case 11:
-                    MaintainActivity.this.updateButton();
+                    updateButton();
                     break;
                 case 14:
-                    MaintainActivity.this.hideLoadProgressBar();
+                    hideLoadProgressBar();
                     break;
                 case 15:
-                    MaintainActivity.this.updateBatteryInfoEx(message.getData().getInt("GET_BATTERY_RESULT"), (BatteryInfoEx) message.getData().getParcelable("GET_BATTERY_INFO"));
+                    updateBatteryInfoEx(message.getData().getInt("GET_BATTERY_RESULT"), (BatteryInfoEx) message.getData().getParcelable("GET_BATTERY_INFO"));
                     break;
                 case 16:
-                    MaintainActivity.this.updateMaintenanceBoxInfo((int[]) message.obj);
+                    updateMaintenanceBoxInfo((int[]) message.obj);
                     break;
             }
             return false;
@@ -913,7 +913,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 }
                 icon.setTitle(i).setPositiveButton(R.string.str_yes, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        MaintainActivity.this.performMaintain(2);
+                        performMaintain(2);
                     }
                 }).setNegativeButton(R.string.str_no, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
@@ -958,20 +958,20 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
 
                     protected void onPreExecute() {
                         super.onPreExecute();
-                        MaintainActivity.this.hideLoadProgressBar();
+                        hideLoadProgressBar();
                         dialog.show();
                     }
 
                     protected Void doInBackground(Void... voidArr) {
-                        MaintainActivity.this.stopLoadConfigThread();
-                        MaintainActivity.this.endBackGroundThread();
+                        stopLoadConfigThread();
+                        endBackGroundThread();
                         MaintainActivity maintainActivity = MaintainActivity.this;
                         WiFiDirectManager.disconnect(maintainActivity, WiFiDirectManager.DEVICE_TYPE_PRINTER, maintainActivity.printerIp);
                         return null;
                     }
 
                     protected void onPostExecute(Void voidR) {
-                        MaintainActivity.this.startSelectPrinterActivity();
+                        startSelectPrinterActivity();
                         dialog.dismiss();
                     }
                 }.execute(new Void[0]);
@@ -987,10 +987,10 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                         }
                         new AlertDialog.Builder(mContext).setCancelable(false).setMessage(R.string.str_webconfig_warn_message).setPositiveButton(R.string.str_ok, new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialogInterface, int i) {
-                                boolean unused = MaintainActivity.this.isKeepSimpleAPConnection = true;
+                                boolean unused = isKeepSimpleAPConnection = true;
                                 MaintainActivity maintainActivity = MaintainActivity.this;
                                 String unused2 = maintainActivity.printerIp = maintainActivity.mPrinter.doGetIp();
-                                MaintainActivity.this.startActivity(new Intent("android.intent.action.VIEW", Uri.parse(CommonDefine.HTTP_PREFIX + MaintainActivity.this.printerIp + CommonDefine.SLASH)));
+                                startActivity(new Intent("android.intent.action.VIEW", Uri.parse(CommonDefine.HTTP_PREFIX + printerIp + CommonDefine.SLASH)));
                             }
                         }).create().show();
                         return;
@@ -1063,14 +1063,14 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         builder.setMessage(getString(R.string.epsonconnect_str_preview_warning) + "\n\n" + getString(R.string.epsonconnect_str_preview_warning2));
         C20299 r1 = new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                SharedPreferences.Editor edit = MaintainActivity.this.getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).edit();
+                SharedPreferences.Editor edit = getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).edit();
                 edit.putBoolean(Constants.ENABLE_SHOW_PREVIEW, true);
                 edit.commit();
             }
         };
         C201610 r2 = new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                MaintainActivity.this.btnTogglePreview.setChecked(false);
+                btnTogglePreview.setChecked(false);
             }
         };
         builder.setPositiveButton(R.string.str_yes, r1);
@@ -1185,7 +1185,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                         } else {
                             bundle3 = bundle4;
                         }
-                        MaintainActivity.this.sendMaintenanceBoxInfoMessage(MaintainActivity.mUiHandler, MaintainActivity.mPrinter.getMaintenanceBoxInformation());
+                        sendMaintenanceBoxInfoMessage(MaintainActivity.mUiHandler, MaintainActivity.mPrinter.getMaintenanceBoxInformation());
                         Thread.sleep(4000);
                     } catch (InterruptedException e) {
                         EPLog.w("startBackgroundThread", "InterruptedException");
@@ -1765,8 +1765,8 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
             if (mLayoutId == R.layout.maintain_executing_dialog) {
                 ((Button) inflate.findViewById(R.id.close_btn)).setOnClickListener(new View.OnClickListener() {
                     public void onClick(View view) {
-                        CustomProDialog.this.cancel();
-                        MaintainActivity.this.interrupMaintainThread();
+                        cancel();
+                        interrupMaintainThread();
                     }
                 });
             }
@@ -1880,7 +1880,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         }
 
         protected void onPreExecute() {
-            MaintainActivity.this.showProDia();
+            showProDia();
         }
 
         protected Integer doInBackground(Void... voidArr) {
@@ -1888,11 +1888,11 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         }
 
         protected void onPostExecute(Integer num) {
-            MaintainActivity.this.cancelProDia();
+            cancelProDia();
             if (num.intValue() == 108) {
-                MaintainActivity.this.setupErrorMessage(10);
+                setupErrorMessage(10);
             } else {
-                MaintainActivity.this.showNozzleCheckGuidanceDialog();
+                showNozzleCheckGuidanceDialog();
             }
         }
     }

+ 6 - 6
app/src/main/java/epson/maintain/activity/MaintainBuyInkOnlineRegTask.java

@@ -47,7 +47,7 @@ public class MaintainBuyInkOnlineRegTask extends AndroidViewModel {
         new AsyncTask<Void, Void, Uri>() {
             protected void onPreExecute() {
                 super.onPreExecute();
-                MaintainBuyInkOnlineRegTask.this.setReady(false);
+                setReady(false);
             }
 
             protected Uri doInBackground(Void... voidArr) {
@@ -60,8 +60,8 @@ public class MaintainBuyInkOnlineRegTask extends AndroidViewModel {
 
             protected void onPostExecute(Uri uri) {
                 super.onPostExecute(uri);
-                MaintainBuyInkOnlineRegTask.this.setUriEvent(uri);
-                MaintainBuyInkOnlineRegTask.this.setReady(true);
+                setUriEvent(uri);
+                setReady(true);
             }
         }.execute(new Void[0]);
     }
@@ -71,7 +71,7 @@ public class MaintainBuyInkOnlineRegTask extends AndroidViewModel {
         new AsyncTask<Void, Void, Uri>() {
             protected void onPreExecute() {
                 super.onPreExecute();
-                MaintainBuyInkOnlineRegTask.this.setReady(false);
+                setReady(false);
             }
 
             protected Uri doInBackground(Void... voidArr) {
@@ -81,8 +81,8 @@ public class MaintainBuyInkOnlineRegTask extends AndroidViewModel {
 
             protected void onPostExecute(Uri uri) {
                 super.onPostExecute(uri);
-                MaintainBuyInkOnlineRegTask.this.setUriEvent(uri);
-                MaintainBuyInkOnlineRegTask.this.setReady(true);
+                setUriEvent(uri);
+                setReady(true);
             }
         }.execute(new Void[0]);
     }

+ 3 - 3
app/src/main/java/epson/maintain/activity/NozzleGuidanceDialog.java

@@ -17,13 +17,13 @@ public class NozzleGuidanceDialog extends DialogFragment {
         View inflate = getActivity().getLayoutInflater().inflate(R.layout.dialog_nozzle_check_guidance, (ViewGroup) null);
         ((Button) inflate.findViewById(R.id.close_button)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                NozzleGuidanceDialog.this.dismiss();
+                dismiss();
             }
         });
         ((Button) inflate.findViewById(R.id.browse_button)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                NozzleGuidanceDialog.this.startBrowser();
-                NozzleGuidanceDialog.this.dismiss();
+                startBrowser();
+                dismiss();
             }
         });
         builder.setView(inflate);

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

@@ -1881,7 +1881,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
             View inflate = getLayoutInflater().inflate(mLayoutId, (ViewGroup) null);
             ((Button) inflate.findViewById(R.id.close_btn)).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
-                    ((Button) CustomProDialog.this.findViewById(R.id.close_btn)).setEnabled(false);
+                    ((Button) findViewById(R.id.close_btn)).setEnabled(false);
                     if (loadRemotePreviewTask != null) {
                         loadRemotePreviewTask.cancel(true);
                     }

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

@@ -612,8 +612,8 @@ public class ActivityNfcPrinter extends Activity {
         create.setButton(-1, getString(R.string.str_ok), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 create.dismiss();
-                ActivityNfcPrinter.this.setResult(0);
-                ActivityNfcPrinter.this.finish();
+                setResult(0);
+                finish();
             }
         });
         create.show();

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

@@ -153,21 +153,21 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
             if (i != 100) {
                 switch (i) {
                     case 1:
-                        Toast.makeText(ActivityPrintWeb.mContext, ActivityPrintWeb.this.getString(R.string.str_err_msg_out_of_memory_title), 1).show();
+                        Toast.makeText(ActivityPrintWeb.mContext, getString(R.string.str_err_msg_out_of_memory_title), 1).show();
                         return;
                     case 2:
-                        Toast.makeText(ActivityPrintWeb.mContext, ActivityPrintWeb.this.getString(R.string.EPS_PRNERR_COMM_TITLE3), 1).show();
+                        Toast.makeText(ActivityPrintWeb.mContext, getString(R.string.EPS_PRNERR_COMM_TITLE3), 1).show();
                         return;
                     default:
                         switch (i) {
                             case 4:
                                 ActivityPrintWeb.mPrint.setEnabled(false);
-                                SharedPreferences sharedPreferences = ActivityPrintWeb.this.getSharedPreferences("PrintSetting", 0);
-                                ActivityPrintWeb.this.printWeb.clear();
+                                SharedPreferences sharedPreferences = getSharedPreferences("PrintSetting", 0);
+                                printWeb.clear();
                                 EPImageList ePImageList = new EPImageList();
                                 for (int access$1400 = ActivityPrintWeb.mStartPage; access$1400 <= ActivityPrintWeb.mEndPage; access$1400++) {
                                     int i2 = access$1400 - 1;
-                                    EPImage ePImage = ActivityPrintWeb.this.imageList.get(i2);
+                                    EPImage ePImage = imageList.get(i2);
                                     ePImage.previewPaperRectLeft = ActivityPrintWeb.mLn_zoomview.getLeft() + ActivityPrintWeb.mLn_zoomview.getPaddingLeft();
                                     ePImage.previewPaperRectTop = ActivityPrintWeb.mLn_zoomview.getTop() + ActivityPrintWeb.mLn_zoomview.getPaddingTop();
                                     ePImage.previewPaperRectRight = ActivityPrintWeb.mLn_zoomview.getRight() - ActivityPrintWeb.mLn_zoomview.getPaddingRight();
@@ -184,7 +184,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                                         ePImage.isPaperLandScape = false;
                                     }
                                     ePImage.isPaperLandScape = ActivityPrintWeb.mPreviewPaperAreaLandscape;
-                                    EPImage ePImage2 = ActivityPrintWeb.this.imageList.get(i2);
+                                    EPImage ePImage2 = imageList.get(i2);
                                     if  (fromActivity == 1) {
                                         ePImage2.setType(4098);
                                     } else {
@@ -194,12 +194,12 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                                 }
                                 sharedPreferences.edit();
                                 if  (isRemotePrinter) {
-                                    SharedPreferences.Editor edit = ActivityPrintWeb.this.getSharedPreferences("PrintSetting", 0).edit();
+                                    SharedPreferences.Editor edit = getSharedPreferences("PrintSetting", 0).edit();
                                     edit.putInt(Constants.SOURCE_TYPE, 3);
                                     edit.commit();
                                 }
                                 EPImageList unused = ActivityPrintWeb.mPrintImageList = ePImageList;
-                                ActivityPrintWeb.this.check3GAndStartPrint();
+                                check3GAndStartPrint();
                                 return;
                             case 5:
                                 EPLog.v(ActivityPrintWeb.TAG, "INIT");
@@ -234,15 +234,15 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
 
                                         protected void onPostExecute(Void voidR) {
                                             super.onPostExecute(voidR);
-                                            ActivityPrintWeb.this.setOrentationView(ActivityPrintWeb.mIsPortrait);
+                                            setOrentationView(ActivityPrintWeb.mIsPortrait);
                                             ActivityPrintWeb.mLn_zoomview.setVisibility(View.VISIBLE);
                                             if (progress.isShowing()) {
                                                 progress.dismiss();
                                             }
                                             if  (bAutoStartPrint) {
-                                                ActivityPrintWeb.this.onClick(ActivityPrintWeb.mPrint);
+                                                onClick(ActivityPrintWeb.mPrint);
                                                 EPLog.d(ActivityPrintWeb.TAG, "onClick(mPrint)");
-                                                ActivityPrintWeb.this.bAutoStartPrint = false;
+                                                bAutoStartPrint = false;
                                             }
                                         }
                                     }.executeOnExecutor(new Void[0]);
@@ -257,21 +257,21 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                         }
                 }
             } else {
-                ArrayList unused2 = ActivityPrintWeb.this.aPaperSourceSetting = message.getData().getParcelableArrayList(PaperSourceInfo.KEY_PAPERSOURCEINFO);
+                ArrayList unused2 = aPaperSourceSetting = message.getData().getParcelableArrayList(PaperSourceInfo.KEY_PAPERSOURCEINFO);
                 if  (aPaperSourceSetting != null) {
                     ActivityPrintWeb.mSizeInfo.setBackgroundColor (getResources().getColor(R.color.epson_blue));
                     ActivityPrintWeb.mSizeInfo.setTextColor (getResources().getColor(R.color.all_white));
                     PrintSetting printSetting = new PrintSetting(ActivityPrintWeb.this, PrintSetting.Kind.document);
                     printSetting.loadSettings();
-                    if  (paperSourceInfo.checkPaperMissmatch(printSetting, ActivityPrintWeb.this.aPaperSourceSetting)) {
-                        ActivityPrintWeb.this.paperMissmath.setVisibility(View.VISIBLE);
+                    if  (paperSourceInfo.checkPaperMissmatch(printSetting, aPaperSourceSetting)) {
+                        paperMissmath.setVisibility(View.VISIBLE);
                     } else {
-                        ActivityPrintWeb.this.paperMissmath.setVisibility(View.GONE);
+                        paperMissmath.setVisibility(View.GONE);
                     }
                 } else {
                     ActivityPrintWeb.mSizeInfo.setBackground (getResources().getDrawable(R.drawable.text_view_boder));
                     ActivityPrintWeb.mSizeInfo.setTextColor (getResources().getColor(R.color.epson_blue));
-                    ActivityPrintWeb.this.paperMissmath.setVisibility(View.GONE);
+                    paperMissmath.setVisibility(View.GONE);
                 }
             }
         }
@@ -291,7 +291,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
         mReviewInvitationViewModel.getShowInvitationLiveData().observe(this, new Observer<Boolean>() {
             public void onChanged(@Nullable Boolean bool) {
                 if (bool.booleanValue()) {
-                    ActivityPrintWeb.this.showStoreDialog();
+                    showStoreDialog();
                 }
             }
         });
@@ -367,7 +367,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
         loadConfig();
         mImageView.setOnTouchListener(new View.OnTouchListener() {
             public boolean onTouch(View view, MotionEvent motionEvent) {
-                Display defaultDisplay = ActivityPrintWeb.this.getWindowManager().getDefaultDisplay();
+                Display defaultDisplay = getWindowManager().getDefaultDisplay();
                 Point point = new Point();
                 defaultDisplay.getSize(point);
                 float f = (float) point.y;
@@ -387,12 +387,12 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                 }
                 float f3 = f / 10.0f;
                 if (ActivityPrintWeb.mMoveX > f3) {
-                    ActivityPrintWeb.this.nextPage();
+                    nextPage();
                     return true;
                 } else if (ActivityPrintWeb.mMoveX >= f3 * -1.0f) {
                     return true;
                 } else {
-                    ActivityPrintWeb.this.prevPage();
+                    prevPage();
                     return true;
                 }
             }

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

@@ -109,11 +109,11 @@ public class ActivityRequestPermissions extends Activity {
                     activityRequestPermissions.startApplicationManagementActivity(activityRequestPermissions.getPackageName());
                     return;
                 }
-                ActivityRequestPermissions.this.requestPermissions(new String[]{str}, 1);
+                requestPermissions(new String[]{str}, 1);
             }
         }).setNegativeButton(R.string.str_cancel, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                ActivityRequestPermissions.this.finish();
+                finish();
             }
         }).show();
     }

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

@@ -63,7 +63,7 @@ public class CustomLayoutDialogFragment extends DialogFragment {
         Button button = (Button) inflate.findViewById(R.id.close_button);
         button.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                CustomLayoutDialogFragment.this.dismiss();
+                dismiss();
                 callback.onLocalNegativeCallback(i);
             }
         });
@@ -71,7 +71,7 @@ public class CustomLayoutDialogFragment extends DialogFragment {
         Button button2 = (Button) inflate.findViewById(R.id.browse_button);
         button2.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                CustomLayoutDialogFragment.this.dismiss();
+                dismiss();
                 callback.onLocalPositiveCallback(i);
             }
         });

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

@@ -61,14 +61,14 @@ public class CustomTitleDialogFragment extends DialogFragment {
         CustomTitleAlertDialogBuilder customTitleDialogBuilder = Utils.getCustomTitleDialogBuilder((Activity) callback);
         customTitleDialogBuilder.setMessage(string).setPositiveButton(i3, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                CustomTitleDialogFragment.this.dismiss();
+                dismiss();
                 callback.onLocalPositiveCallback(i);
             }
         });
         if (i4 != 0) {
             customTitleDialogBuilder.setNegativeButton(i4, new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
-                    CustomTitleDialogFragment.this.dismiss();
+                    dismiss();
                     callback.onLocalNegativeCallback(i);
                 }
             });

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

@@ -54,7 +54,7 @@ public class PhotoImageConvertViewModel extends AndroidViewModel {
         public void setOriginalList(final ArrayList<String> arrayList, @NonNull final Application application) {
             new AsyncTask<Void, Void, Result>() {
                 protected Result doInBackground(Void... voidArr) {
-                    ArrayList access$000 = FilenameListLiveData.this.convertHeifImageList(arrayList, application);
+                    ArrayList access$000 = convertHeifImageList(arrayList, application);
                     if  (!checkEpImage(access$000)) {
                         return new Result((ArrayList<PhotoPreviewImageList.EpImageWrapper>) null);
                     }
@@ -62,7 +62,7 @@ public class PhotoImageConvertViewModel extends AndroidViewModel {
                 }
 
                 protected void onPostExecute(Result result) {
-                    FilenameListLiveData.this.setValue(result);
+                    setValue(result);
                 }
             }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
         }

+ 3 - 3
app/src/main/java/epson/print/ThreeButtonDialog.java

@@ -50,7 +50,7 @@ public class ThreeButtonDialog extends AppCompatDialogFragment {
         if (button != null) {
             button.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
-                    ThreeButtonDialog.this.execCallbackAndDismiss(1);
+                    execCallbackAndDismiss(1);
                 }
             });
         }
@@ -58,7 +58,7 @@ public class ThreeButtonDialog extends AppCompatDialogFragment {
         if (button2 != null) {
             button2.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
-                    ThreeButtonDialog.this.execCallbackAndDismiss(2);
+                    execCallbackAndDismiss(2);
                 }
             });
         }
@@ -66,7 +66,7 @@ public class ThreeButtonDialog extends AppCompatDialogFragment {
         if (button3 != null) {
             button3.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
-                    ThreeButtonDialog.this.execCallbackAndDismiss(3);
+                    execCallbackAndDismiss(3);
                 }
             });
         }

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

@@ -87,14 +87,14 @@ class ActivityBase extends ActivityIACommon {
             builder.setCancelable(false);
             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();
+                    cancelButton.setEnabled(false);
+                    cancelCallback.onCancelRequest();
                     dialogInterface.cancel();
                 }
             });
             builder.setNegativeButton(getString(R.string.str_no), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
-                    WheelDialog.this.cancelButton.setEnabled(true);
+                    cancelButton.setEnabled(true);
                     dialogInterface.cancel();
                 }
             });
@@ -116,7 +116,7 @@ class ActivityBase extends ActivityIACommon {
                 public void onClick(View view) {
                     WheelDialog wheelDialog = WheelDialog.this;
                     wheelDialog.cancelDialog = wheelDialog.createCancelDialog();
-                    WheelDialog.this.cancelDialog.show();
+                    cancelDialog.show();
                 }
             });
             cancelButton.setVisibility(0);
@@ -414,7 +414,7 @@ class ActivityBase extends ActivityIACommon {
             }
 
             public void onClick(View view) {
-                NumberOptionValue.this.updateWithAddition(amount);
+                updateWithAddition(amount);
             }
         }
 

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

@@ -272,7 +272,7 @@ public final class ECopyComponent {
         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;
+                optionContext = eCopyOptionContext;
             }
         });
         return createPreview;

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

@@ -148,7 +148,7 @@ public class ECopyPreview extends View {
     private void requestInvalidateView() {
         ((Activity) getContext()).runOnUiThread(new Runnable() {
             public void run() {
-                ECopyPreview.this.listener.needInvalidateView();
+                listener.needInvalidateView();
             }
         });
     }
@@ -352,31 +352,31 @@ public class ECopyPreview extends View {
             if  (optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XScale).getSelectedChoice() == ECopyOptionItem.ECopyOptionItemChoice.XScale_Autofit) {
                 autofitEnabled = true;
             }
-            ECopyOptionItem copyOptionItemOf = ECopyPreview.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize);
+            ECopyOptionItem copyOptionItemOf = optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize);
             switch (copyOptionItemOf.getSelectedChoice()) {
                 case PrintMediaSize_A4:
-                    paperSize = ECopyPreview.this.f360A4;
+                    paperSize = f360A4;
                     break;
                 case PrintMediaSize_B5:
-                    paperSize = ECopyPreview.this.f361B5;
+                    paperSize = f361B5;
                     break;
                 case PrintMediaSize_L:
-                    paperSize = ECopyPreview.this.f363L;
+                    paperSize = f363L;
                     break;
                 case PrintMediaSize_2L:
-                    paperSize = ECopyPreview.this.f364L2;
+                    paperSize = f364L2;
                     break;
                 case PrintMediaSize_Postcard:
-                    paperSize = ECopyPreview.this.Hagaki;
+                    paperSize = Hagaki;
                     break;
                 case PrintMediaSize_KG:
-                    paperSize = ECopyPreview.this.f362KG;
+                    paperSize = f362KG;
                     break;
                 case PrintMediaSize_8x10in:
-                    paperSize = ECopyPreview.this.f365P6;
+                    paperSize = f365P6;
                     break;
                 default:
-                    paperSize = ECopyPreview.this.Max;
+                    paperSize = Max;
                     break;
             }
             float f = (float) i;
@@ -392,8 +392,8 @@ public class ECopyPreview extends View {
             rectF2.bottom -= 18.0f;
             scaleRect(aspectFitScale, rectF2);
             paperBorderClipPath.addRect(rectF2, Path.Direction.CW);
-            float aspectFitScale2 = getAspectFitScale(f, f2, (float) ECopyPreview.this.Max.width, (float) ECopyPreview.this.Max.height, Layout.AspectFit.Min);
-            RectF rectF3 = new RectF(0.0f, 0.0f, (float) ECopyPreview.this.Max.width, (float) ECopyPreview.this.Max.height);
+            float aspectFitScale2 = getAspectFitScale(f, f2, (float) Max.width, (float) Max.height, Layout.AspectFit.Min);
+            RectF rectF3 = new RectF(0.0f, 0.0f, (float) Max.width, (float) Max.height);
             scaleRect(aspectFitScale2, rectF3);
             maxPaperImage = Bitmap.createBitmap((int) rectF3.width(), (int) rectF3.height(), Bitmap.Config.ARGB_8888);
             invalidatePaperSize();
@@ -404,8 +404,8 @@ public class ECopyPreview extends View {
             Bitmap bitmap = showPaper ? paperImage : maxPaperImage;
             canvas = new Canvas(bitmap);
             canvas.save();
-            ECopyPreview.this.paperDrawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
-            ECopyPreview.this.paperDrawable.draw(canvas);
+            paperDrawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
+            paperDrawable.draw(canvas);
             Bitmap bitmap2 = scanImage;
             if (bitmap2 != null) {
                 if (showPaper) {
@@ -426,7 +426,7 @@ public class ECopyPreview extends View {
         }
 
         private float getScanImageScale(int i, int i2) {
-            imageScale = getAspectFitScale((float)  (drawSize.width - ECopyPreview.this.paperPadding.left) - ECopyPreview.this.paperPadding.right), (float)  (drawSize.height - ECopyPreview.this.paperPadding.top) - ECopyPreview.this.paperPadding.bottom), (float) i, (float) i2, Layout.AspectFit.Min);
+            imageScale = getAspectFitScale((float)  (drawSize.width - paperPadding.left) - paperPadding.right), (float)  (drawSize.height - paperPadding.top) - paperPadding.bottom), (float) i, (float) i2, Layout.AspectFit.Min);
             return imageScale;
         }
 
@@ -477,7 +477,7 @@ public class ECopyPreview extends View {
         }
 
         private void invalidatePaperSize() {
-            Size size = showPaper() ? paperSize : ECopyPreview.this.Max;
+            Size size = showPaper() ? paperSize : Max;
             float aspectFitScale = getAspectFitScale((float) layoutWidth, (float) layoutHeight, (float) size.width, (float) size.height, Layout.AspectFit.Min);
             paper = new RectF(0.0f, 0.0f, (float) size.width, (float) size.height);
             scaleRect(aspectFitScale, paper);
@@ -504,8 +504,8 @@ public class ECopyPreview extends View {
             Bitmap bitmap = showPaper ? paperImage : maxPaperImage;
             canvas = new Canvas(bitmap);
             canvas.save();
-            ECopyPreview.this.paperDrawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
-            ECopyPreview.this.paperDrawable.draw(canvas);
+            paperDrawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
+            paperDrawable.draw(canvas);
             if (scanImage != null) {
                 if (showPaper) {
                     float f = copyScale / limitCopyScaleDown;
@@ -542,7 +542,7 @@ public class ECopyPreview extends View {
 
         LayoutBorderless(int i, int i2) {
             super(i, i2);
-            ECopyOptionItem.ECopyOptionItemChoice selectedChoice = ECopyPreview.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize).getSelectedChoice();
+            ECopyOptionItem.ECopyOptionItemChoice selectedChoice = optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize).getSelectedChoice();
             if (selectedChoice == ECopyOptionItem.ECopyOptionItemChoice.PrintMediaSize_KG || selectedChoice == ECopyOptionItem.ECopyOptionItemChoice.PrintMediaSize_L || selectedChoice == ECopyOptionItem.ECopyOptionItemChoice.PrintMediaSize_Postcard) {
                 f368LO = 15;
                 f369RO = 15;
@@ -561,8 +561,8 @@ public class ECopyPreview extends View {
             Bitmap bitmap = showPaper ? paperImage : maxPaperImage;
             canvas = new Canvas(bitmap);
             canvas.save();
-            ECopyPreview.this.paperDrawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
-            ECopyPreview.this.paperDrawable.draw(canvas);
+            paperDrawable.setBounds(0, 0, bitmap.getWidth(), bitmap.getHeight());
+            paperDrawable.draw(canvas);
             if (scanImage != null) {
                 if (showPaper) {
                     float f = copyScale;
@@ -612,8 +612,8 @@ public class ECopyPreview extends View {
         }
 
         Layout2Up(int i, int i2) {
-            Size size = ECopyPreview.this.A4_2Up;
-            Size size2 = ECopyPreview.this.A4_2UpPage;
+            Size size = A4_2Up;
+            Size size2 = 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(page1.right + 35.0f, page1.top, page1.right + 35.0f + ((float) size2.width), page1.bottom);
@@ -630,8 +630,8 @@ public class ECopyPreview extends View {
         public Bitmap getBitmap() {
             Bitmap createBitmap = Bitmap.createBitmap((int) paper.width(), (int) paper.height(), Bitmap.Config.ARGB_8888);
             Canvas canvas = new Canvas(createBitmap);
-            ECopyPreview.this.paperDrawable.setBounds(0, 0, createBitmap.getWidth(), createBitmap.getHeight());
-            ECopyPreview.this.paperDrawable.draw(canvas);
+            paperDrawable.setBounds(0, 0, createBitmap.getWidth(), createBitmap.getHeight());
+            paperDrawable.draw(canvas);
             Bitmap createBitmap2 = Bitmap.createBitmap((int) page1.width(), (int) page1.height(), Bitmap.Config.ARGB_8888);
             new Canvas(createBitmap2).drawColor(-3355444);
             Bitmap bitmap = page1Bitmap;

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

@@ -44,7 +44,7 @@ class PreviewScanTask extends AsyncTask<Void, Void, Void> implements IScanContro
         return new ECopyComponent.ICopyCancelRequest() {
             public void cancel() {
                 synchronized (this) {
-                    PreviewScanTask.this.cancelRequested = true;
+                    cancelRequested = true;
                 }
             }
         };
@@ -144,13 +144,13 @@ class PreviewScanTask extends AsyncTask<Void, Void, Void> implements IScanContro
                         } else {
                             copyTaskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Busy;
                         }
-                        PreviewScanTask.this.statusListener.onFinished(ECopyComponent.ICopyStatusListener.CopyTaskType.Preview, copyTaskResult);
+                        statusListener.onFinished(ECopyComponent.ICopyStatusListener.CopyTaskType.Preview, copyTaskResult);
                         return;
                     case 3:
-                        PreviewScanTask.this.previewScanBitmap.eraseColor(-1);
+                        previewScanBitmap.eraseColor(-1);
                         return;
                     case 4:
-                        PreviewScanTask.this.copyPreview.drawScanPreview (previewScanBitmap);
+                        copyPreview.drawScanPreview (previewScanBitmap);
                         return;
                     default:
                         return;

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

@@ -69,7 +69,7 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
         eRemoteDevice.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
         ERemoteDevice.ERemoteDeviceFunctionsResult functions = eRemoteDevice.getFunctions(new ERemoteOperation.IRemoteOperationParameter() {
             public String client_id() {
-                return RemoteCopyGetOptionTask.this.clientID;
+                return clientID;
             }
         });
         if (!functions.success()) {
@@ -96,7 +96,7 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
         eRemotePrinter.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
         ERemotePrinter.ERemotePrinterComponentsResult components = eRemotePrinter.getComponents(new ERemoteOperation.IRemoteOperationParameter() {
             public String client_id() {
-                return RemoteCopyGetOptionTask.this.clientID;
+                return clientID;
             }
         });
         if (!components.success()) {
@@ -107,7 +107,7 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
         eRemoteScanner.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
         ERemoteScanner.ERemoteScannerComponentsResult components2 = eRemoteScanner.getComponents(new ERemoteOperation.IRemoteOperationParameter() {
             public String client_id() {
-                return RemoteCopyGetOptionTask.this.clientID;
+                return clientID;
             }
         });
         if (!components2.success()) {

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

@@ -69,7 +69,7 @@ class RemoteCopyPhotoGetOptionTask extends AsyncTask<Void, Void, Result> impleme
             }
 
             public String client_id() {
-                return RemoteCopyPhotoGetOptionTask.this.clientID;
+                return clientID;
             }
 
             public ERemoteOperation.ERemoteParam layout() {

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

@@ -79,31 +79,31 @@ class RemoteCopyPhotoSetOptionTask extends AsyncTask<Void, Void, Result> impleme
             }
 
             public String client_id() {
-                return RemoteCopyPhotoSetOptionTask.this.clientID;
+                return clientID;
             }
 
             public ERemoteOperation.ERemoteParam layout() {
-                return RemoteCopyPhotoSetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XBorderless).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XBorderless).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_media_type() {
-                return RemoteCopyPhotoSetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaType).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaType).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_media_size() {
-                return RemoteCopyPhotoSetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_quality() {
-                return RemoteCopyPhotoSetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintQuality).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintQuality).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_media_source() {
-                return RemoteCopyPhotoSetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSource).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSource).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam x_apf() {
-                return RemoteCopyPhotoSetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XApf).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XApf).getSelectedChoice().param;
             }
 
             public ArrayList<ERemoteOperation.ERemoteParam> fixed_parameters() {

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

@@ -91,7 +91,7 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
         return new ECopyComponent.ICopyCancelRequest() {
             public void cancel() {
                 synchronized (this) {
-                    RemoteCopyPhotoTask.this.cancelRequested = true;
+                    cancelRequested = true;
                 }
             }
         };
@@ -116,20 +116,20 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
     protected void onPreExecute() {
         cancelParameter = new ERemoteCopy.IRemoteCancelParameter() {
             public String client_id() {
-                return RemoteCopyPhotoTask.this.clientID;
+                return clientID;
             }
 
             public String job_token() {
-                return RemoteCopyPhotoTask.this.jobToken;
+                return jobToken;
             }
         };
         statusParameter = new ERemoteCopy.IRemoteCopyStatusParameter() {
             public String client_id() {
-                return RemoteCopyPhotoTask.this.clientID;
+                return clientID;
             }
 
             public String job_token() {
-                return RemoteCopyPhotoTask.this.jobToken;
+                return jobToken;
             }
 
             public ArrayList<ERemoteOperation.ERemoteParam> keys() {
@@ -183,7 +183,7 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
                 eRemotePrinter.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
                 eRemotePrinter.clearError(new ERemoteOperation.IRemoteOperationParameter() {
                     public String client_id() {
-                        return RemoteCopyPhotoTask.this.clientID;
+                        return clientID;
                     }
                 });
                 i = 15000;
@@ -201,74 +201,74 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
     private ERemoteOperation.ERemoteReasonResult startCopy() {
         ERemoteCopy.ERemoteCopyResult copy = operation.copy(new ERemoteCopyPhoto.IRemoteCopyPhotoParameter() {
             public String client_id() {
-                return RemoteCopyPhotoTask.this.clientID;
+                return clientID;
             }
 
             public ERemoteOperation.ERemoteParam layout() {
-                return RemoteCopyPhotoTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XBorderless).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XBorderless).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_media_type() {
-                return RemoteCopyPhotoTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaType).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaType).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_media_size() {
-                return RemoteCopyPhotoTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_quality() {
-                return RemoteCopyPhotoTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintQuality).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintQuality).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_media_source() {
-                return RemoteCopyPhotoTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSource).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSource).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam x_apf() {
-                return RemoteCopyPhotoTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XApf).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XApf).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam x_color_restoration() {
-                return RemoteCopyPhotoTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XColorRestoration).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XColorRestoration).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam color_effects_type() {
-                return RemoteCopyPhotoTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.ColorEffectsType).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.ColorEffectsType).getSelectedChoice().param;
             }
 
             public int scan_count() {
-                return RemoteCopyPhotoTask.this.photoSetting.getScanCount();
+                return photoSetting.getScanCount();
             }
 
             public ArrayList<String> copies() {
-                return RemoteCopyPhotoTask.this.photoSetting.scanCopies;
+                return photoSetting.scanCopies;
             }
 
             public ArrayList<String> scan_area_x() {
-                return RemoteCopyPhotoTask.this.photoSetting.scanAreaX;
+                return photoSetting.scanAreaX;
             }
 
             public ArrayList<String> scan_area_y() {
-                return RemoteCopyPhotoTask.this.photoSetting.scanAreaY;
+                return photoSetting.scanAreaY;
             }
 
             public ArrayList<String> scan_area_width() {
-                return RemoteCopyPhotoTask.this.photoSetting.scanAreaWidth;
+                return photoSetting.scanAreaWidth;
             }
 
             public ArrayList<String> scan_area_height() {
-                return RemoteCopyPhotoTask.this.photoSetting.scanAreaHeight;
+                return photoSetting.scanAreaHeight;
             }
 
             public ArrayList<String> scan_area_resolution() {
-                return RemoteCopyPhotoTask.this.photoSetting.scanAreaResolution;
+                return photoSetting.scanAreaResolution;
             }
 
             public ERemoteOperation.ERemoteParam print_x_bleed() {
                 if  (optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XBorderless).getSelectedChoice().param == ERemoteOperation.ERemoteParam.standard) {
                     return ERemoteOperation.ERemoteParam.x_null;
                 }
-                return RemoteCopyPhotoTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintXBleed).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintXBleed).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_x_auto_pg() {
@@ -276,11 +276,11 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
             }
 
             public ArrayList<String> x_fit_gamma() {
-                return RemoteCopyPhotoTask.this.photoSetting.xFitGamma;
+                return photoSetting.xFitGamma;
             }
 
             public ArrayList<String> x_fit_matrix() {
-                return RemoteCopyPhotoTask.this.photoSetting.xFitMatrix;
+                return photoSetting.xFitMatrix;
             }
         });
         if (copy.success()) {
@@ -384,10 +384,10 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
                             }
 
                             public void resume(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
-                                RemoteCopyPhotoTask.this.progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Processing;
+                                progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Processing;
                                 RemoteCopyPhotoTask remoteCopyPhotoTask = RemoteCopyPhotoTask.this;
                                 remoteCopyPhotoTask.publishProgress(new Progress[]{remoteCopyPhotoTask.progress});
-                                RemoteCopyPhotoTask.this.resumeNotify(resumeState);
+                                resumeNotify(resumeState);
                             }
                         };
                         break;

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

@@ -226,7 +226,7 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
             }
 
             public String client_id() {
-                return RemoteCopySetOptionTask.this.clientID;
+                return clientID;
             }
 
             public ERemoteOperation.ERemoteParam layout() {
@@ -234,39 +234,39 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
             }
 
             public ERemoteOperation.ERemoteParam scan_sides() {
-                return RemoteCopySetOptionTask.this.optionContext.getCopyOptionsResult().parameter_default(ERemoteOperation.ERemoteParam.scan_sides);
+                return optionContext.getCopyOptionsResult().parameter_default(ERemoteOperation.ERemoteParam.scan_sides);
             }
 
             public ERemoteOperation.ERemoteParam print_sides() {
-                return RemoteCopySetOptionTask.this.optionContext.getCopyOptionsResult().parameter_default(ERemoteOperation.ERemoteParam.print_sides);
+                return optionContext.getCopyOptionsResult().parameter_default(ERemoteOperation.ERemoteParam.print_sides);
             }
 
             public ERemoteOperation.ERemoteParam scan_media_size() {
-                return RemoteCopySetOptionTask.this.optionContext.getCopyOptionsResult().parameter_default(ERemoteOperation.ERemoteParam.scan_media_size);
+                return optionContext.getCopyOptionsResult().parameter_default(ERemoteOperation.ERemoteParam.scan_media_size);
             }
 
             public ERemoteOperation.ERemoteParam scan_content_type() {
-                return RemoteCopySetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.ScanContentType).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.ScanContentType).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_media_type() {
-                return RemoteCopySetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaType).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaType).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_media_size() {
-                return RemoteCopySetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_media_source() {
-                return RemoteCopySetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSource).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSource).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_quality() {
-                return RemoteCopySetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintQuality).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintQuality).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_sheet_collate() {
-                return RemoteCopySetOptionTask.this.optionContext.getCopyOptionsResult().parameter_default(ERemoteOperation.ERemoteParam.print_sheet_collate);
+                return optionContext.getCopyOptionsResult().parameter_default(ERemoteOperation.ERemoteParam.print_sheet_collate);
             }
 
             public ArrayList<ERemoteOperation.ERemoteParam> fixed_parameters() {

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

@@ -189,7 +189,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
         return new ECopyComponent.ICopyCancelRequest() {
             public void cancel() {
                 synchronized (this) {
-                    RemoteCopyTask.this.cancelRequested = true;
+                    cancelRequested = true;
                 }
             }
         };
@@ -214,20 +214,20 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
     protected void onPreExecute() {
         cancelParameter = new ERemoteCopy.IRemoteCancelParameter() {
             public String client_id() {
-                return RemoteCopyTask.this.clientID;
+                return clientID;
             }
 
             public String job_token() {
-                return RemoteCopyTask.this.jobToken;
+                return jobToken;
             }
         };
         statusParameter = new ERemoteCopy.IRemoteCopyStatusParameter() {
             public String client_id() {
-                return RemoteCopyTask.this.clientID;
+                return clientID;
             }
 
             public String job_token() {
-                return RemoteCopyTask.this.jobToken;
+                return jobToken;
             }
 
             public ArrayList<ERemoteOperation.ERemoteParam> keys() {
@@ -297,7 +297,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                                 eRemotePrinter.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
                                 eRemotePrinter.clearError(new ERemoteOperation.IRemoteOperationParameter() {
                                     public String client_id() {
-                                        return RemoteCopyTask.this.clientID;
+                                        return clientID;
                                     }
                                 });
                                 for (int i = 0; i < 6 && !this.operation.getStatus(statusParameter).printer_state().equals(ERemoteOperation.ERemoteParam.processing); i++) {
@@ -315,15 +315,15 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                             case NextPageNotExist:
                                 boolean success = operation.documentChanged(new ERemoteCopy.IRemoteCopyDocumentChangedParameter() {
                                     public String client_id() {
-                                        return RemoteCopyTask.this.clientID;
+                                        return clientID;
                                     }
 
                                     public String job_token() {
-                                        return RemoteCopyTask.this.jobToken;
+                                        return jobToken;
                                     }
 
                                     public boolean next_document() {
-                                        return RemoteCopyTask.this.progress.resumeState == ECopyComponent.ICopyResumeRequest.ResumeState.NextPageReady;
+                                        return progress.resumeState == ECopyComponent.ICopyResumeRequest.ResumeState.NextPageReady;
                                     }
                                 }).success();
                                 break;
@@ -468,7 +468,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                         }
 
                         public void resume(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
-                            RemoteCopyTask.this.resumeNotify(resumeState);
+                            resumeNotify(resumeState);
                         }
                     };
                     break;
@@ -528,10 +528,10 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                             }
 
                             public void resume(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
-                                RemoteCopyTask.this.progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Processing;
+                                progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Processing;
                                 RemoteCopyTask remoteCopyTask = RemoteCopyTask.this;
                                 remoteCopyTask.publishProgress(new Progress[]{remoteCopyTask.progress});
-                                RemoteCopyTask.this.resumeNotify(resumeState);
+                                resumeNotify(resumeState);
                             }
                         };
                         break;

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

@@ -177,7 +177,7 @@ class RemoteDeviceTask extends AsyncTask<Void, Void, Result> implements ECopyCom
             }
 
             public String client_id() {
-                return RemoteDeviceTask.this.clientID;
+                return clientID;
             }
 
             public ArrayList<ERemoteOperation.ERemoteParam> keys() {
@@ -196,7 +196,7 @@ class RemoteDeviceTask extends AsyncTask<Void, Void, Result> implements ECopyCom
         operation.setHostIP(systemSettings.getPrinterIPAddress());
         ERemoteDevice.ERemoteDeviceStatusResult status = operation.getStatus(new ERemoteOperation.IRemoteStatusParameter() {
             public String client_id() {
-                return RemoteDeviceTask.this.clientID;
+                return clientID;
             }
 
             public ArrayList<ERemoteOperation.ERemoteParam> keys() {

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

@@ -114,9 +114,9 @@ public class CopyScaleActivity extends ActivityBase {
                 public void onClick(View view) {
                     XScaleValue xScaleValue = XScaleValue.this;
                     xScaleValue.selected = (ECopyOptionItem.ECopyOptionItemChoice) xScaleValue.choices.get(0);
-                    XScaleValue.this.optionItem.selectChoice (selected);
+                    optionItem.selectChoice (selected);
                     if  (changedListener != null) {
-                        XScaleValue.this.changedListener.onOptionItemChanged (optionItem);
+                        changedListener.onOptionItemChanged (optionItem);
                     }
                     isKeepSimpleAPConnection = true;
                     finish();
@@ -132,9 +132,9 @@ public class CopyScaleActivity extends ActivityBase {
                 public void onClick(View view) {
                     XScaleValue xScaleValue = XScaleValue.this;
                     xScaleValue.selected = (ECopyOptionItem.ECopyOptionItemChoice) xScaleValue.choices.get(1);
-                    XScaleValue.this.optionItem.selectChoice (selected);
+                    optionItem.selectChoice (selected);
                     if  (changedListener != null) {
-                        XScaleValue.this.changedListener.onOptionItemChanged (optionItem);
+                        changedListener.onOptionItemChanged (optionItem);
                     }
                     isKeepSimpleAPConnection = true;
                     finish();
@@ -150,9 +150,9 @@ public class CopyScaleActivity extends ActivityBase {
                 public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
                     XScaleValue xScaleValue = XScaleValue.this;
                     xScaleValue.selected = (ECopyOptionItem.ECopyOptionItemChoice) xScaleValue.choices.get(i + 3);
-                    XScaleValue.this.optionItem.selectChoice (selected);
+                    optionItem.selectChoice (selected);
                     if  (changedListener != null) {
-                        XScaleValue.this.changedListener.onOptionItemChanged (optionItem);
+                        changedListener.onOptionItemChanged (optionItem);
                     }
                     isKeepSimpleAPConnection = true;
                     finish();
@@ -178,7 +178,7 @@ public class CopyScaleActivity extends ActivityBase {
                 ((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) {
+                if (i == selectedItemPos - 3) {
                     ((ImageView) view.findViewById(R.id.setting_active_icon)).setVisibility(0);
                 } else {
                     ((ImageView) view.findViewById(R.id.setting_active_icon)).setVisibility(8);
@@ -222,27 +222,27 @@ public class CopyScaleActivity extends ActivityBase {
             ((LinearLayout) findViewById(R.id.copy_scale_custom)).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     View inflate = LayoutInflater.from(CopyScaleActivity.this).inflate(R.layout.copy_custom_scale, (ViewGroup) null);
-                    CopyMagnificationValue.this.editText = (TextView) inflate.findViewById(R.id.SettingCopyMagnification);
+                    editText = (TextView) inflate.findViewById(R.id.SettingCopyMagnification);
                     CopyMagnificationValue copyMagnificationValue = CopyMagnificationValue.this;
                     copyMagnificationValue.value = copyMagnificationValue.optionItem.getSelectedValue();
                     if  (value == ECopyOptionItem.CopyMagnificationAutofitValue) {
-                        CopyMagnificationValue.this.value = 100;
+                        value = 100;
                     }
-                    CopyMagnificationValue.this.editText.setText (value));
-                    CopyMagnificationValue.this.countUp = (Button) inflate.findViewById(R.id.SettingButonCopyMagnificationCountUp);
-                    CopyMagnificationValue.this.countUp.setOnClickListener(new CountCustomScale(1));
-                    if  (value == CopyMagnificationValue.this.optionItem.getMaximumValue()) {
-                        CopyMagnificationValue.this.countUp.setEnabled(false);
+                    editText.setText (value));
+                    countUp = (Button) inflate.findViewById(R.id.SettingButonCopyMagnificationCountUp);
+                    countUp.setOnClickListener(new CountCustomScale(1));
+                    if  (value == optionItem.getMaximumValue()) {
+                        countUp.setEnabled(false);
                     } else {
-                        CopyMagnificationValue.this.countUp.setEnabled(true);
+                        countUp.setEnabled(true);
                     }
                     LongTapRepeatAdapter.bless (countUp);
-                    CopyMagnificationValue.this.countDown = (Button) inflate.findViewById(R.id.SettingButonCopyMagnificationCountDown);
-                    CopyMagnificationValue.this.countDown.setOnClickListener(new CountCustomScale(-1));
-                    if  (value == CopyMagnificationValue.this.optionItem.getMinimumValue()) {
-                        CopyMagnificationValue.this.countDown.setEnabled(false);
+                    countDown = (Button) inflate.findViewById(R.id.SettingButonCopyMagnificationCountDown);
+                    countDown.setOnClickListener(new CountCustomScale(-1));
+                    if  (value == optionItem.getMinimumValue()) {
+                        countDown.setEnabled(false);
                     } else {
-                        CopyMagnificationValue.this.countDown.setEnabled(true);
+                        countDown.setEnabled(true);
                     }
                     LongTapRepeatAdapter.bless (countDown);
                     AlertDialog.Builder builder = new AlertDialog.Builder(CopyScaleActivity.this);
@@ -253,20 +253,20 @@ public class CopyScaleActivity extends ActivityBase {
                             ActivityBase.ListOptionValue listOptionValue = (ActivityBase.ListOptionValue) optionValueMap.get(ECopyOptionItem.ECopyOptionItemKey.XScale);
                             listOptionValue.optionItem.selectChoice(ECopyOptionItem.ECopyOptionItemChoice.XScale_Custom);
                             if  (changedListener != null) {
-                                CopyMagnificationValue.this.changedListener.onOptionItemChanged(listOptionValue.optionItem);
+                                changedListener.onOptionItemChanged(listOptionValue.optionItem);
                             }
-                            CopyMagnificationValue.this.optionItem.selectValue (editText.getText().toString()));
+                            optionItem.selectValue (editText.getText().toString()));
                             if  (changedListener != null) {
-                                CopyMagnificationValue.this.changedListener.onOptionItemChanged (optionItem);
+                                changedListener.onOptionItemChanged (optionItem);
                             }
                             isKeepSimpleAPConnection = true;
-                            CopyMagnificationValue.this.onDismissDialog();
+                            onDismissDialog();
                             finish();
                         }
                     });
                     builder.setNegativeButton(getString(R.string.str_cancel), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
-                            CopyMagnificationValue.this.onDismissDialog();
+                            onDismissDialog();
                         }
                     });
                     builder.show();
@@ -289,20 +289,20 @@ public class CopyScaleActivity extends ActivityBase {
 
             public void onClick(View view) {
                 try {
-                    CopyMagnificationValue.this.value = Integer.valueOf (editText.getText().toString()).intValue();
-                    CopyMagnificationValue.this.value = Math.min (optionItem.getMinimumValue(), CopyMagnificationValue.this.value + amount), CopyMagnificationValue.this.optionItem.getMaximumValue());
+                    value = Integer.valueOf (editText.getText().toString()).intValue();
+                    value = Math.min (optionItem.getMinimumValue(), value + amount), optionItem.getMaximumValue());
                 } catch (NumberFormatException unused) {
                 }
-                CopyMagnificationValue.this.editText.setText (value));
-                if  (value >= CopyMagnificationValue.this.optionItem.getMaximumValue()) {
-                    CopyMagnificationValue.this.countUp.setEnabled(false);
+                editText.setText (value));
+                if  (value >= optionItem.getMaximumValue()) {
+                    countUp.setEnabled(false);
                 } else {
-                    CopyMagnificationValue.this.countUp.setEnabled(true);
+                    countUp.setEnabled(true);
                 }
-                if  (value <= CopyMagnificationValue.this.optionItem.getMinimumValue()) {
-                    CopyMagnificationValue.this.countDown.setEnabled(false);
+                if  (value <= optionItem.getMinimumValue()) {
+                    countDown.setEnabled(false);
                 } else {
-                    CopyMagnificationValue.this.countDown.setEnabled(true);
+                    countDown.setEnabled(true);
                 }
             }
         }

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

@@ -39,12 +39,12 @@ public class CopySettingActivity extends ActivityBase {
         }
         optionValueChangedListener = new ActivityBase.OptionItemChangedListener() {
             public void onOptionItemChanged(ECopyOptionItem eCopyOptionItem) {
-                CopySettingActivity.this.copyComponent.setCopyOptionItem(eCopyOptionItem);
+                copyComponent.setCopyOptionItem(eCopyOptionItem);
             }
         };
         optionListener = new ECopyComponent.ICopyOptionListener() {
             public void onCopyOptionChanged(ECopyOptionItem eCopyOptionItem, ArrayList<ECopyOptionItem> arrayList, ECopyComponent.ICopyOptionListener.CopyOptionChangedError copyOptionChangedError) {
-                CopySettingActivity.this.loading.dismiss();
+                loading.dismiss();
                 if (copyOptionChangedError != null) {
                     CopySettingActivity copySettingActivity = CopySettingActivity.this;
                     ActivityBase.errorDialog errordialog = new ActivityBase.errorDialog(copySettingActivity);
@@ -52,7 +52,7 @@ public class CopySettingActivity extends ActivityBase {
                     errordialog.showErrorDialog(reasonText[0], reasonText[1]);
                     return;
                 }
-                CopySettingActivity.this.finish();
+                finish();
             }
         };
         optionContext = copyComponent.getBindedCopyOptionContext();
@@ -87,15 +87,15 @@ public class CopySettingActivity extends ActivityBase {
         }
 
         private void capabilitySetting(ECopyOptionItem eCopyOptionItem, Context context) {
-            ListView listView = (ListView) CopySettingActivity.this.findViewById(R.id.copy_setting_list);
+            ListView listView = (ListView) findViewById(R.id.copy_setting_list);
             listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                 public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
-                    CopySettingActivity.this.loading.show();
-                    OthersettingValue.this.optionItem.selectChoice((ECopyOptionItem.ECopyOptionItemChoice) OthersettingValue.this.choices.get(i));
+                    loading.show();
+                    optionItem.selectChoice((ECopyOptionItem.ECopyOptionItemChoice) choices.get(i));
                     if  (changedListener != null) {
-                        OthersettingValue.this.changedListener.onOptionItemChanged (optionItem);
+                        changedListener.onOptionItemChanged (optionItem);
                     }
-                    CopySettingActivity.this.isKeepSimpleAPConnection = true;
+                    isKeepSimpleAPConnection = true;
                 }
             });
             listView.setAdapter(getArrayAdapter(this, context));
@@ -122,7 +122,7 @@ public class CopySettingActivity extends ActivityBase {
                     view = inflater.inflate(R.layout.setting_item, (ViewGroup) null);
                 }
                 ((TextView) view.findViewById(R.id.setting_name)).setText(items[i]);
-                if (i == OthersettingValue.this.selectedItemPos) {
+                if (i == selectedItemPos) {
                     ((ImageView) view.findViewById(R.id.setting_active_icon)).setVisibility(0);
                 } else {
                     ((ImageView) view.findViewById(R.id.setting_active_icon)).setVisibility(8);

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

@@ -64,14 +64,14 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
         list = (ListView) findViewById(R.id.filelist);
         list.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
-                fileBrower.this.onListItemClick((ListView) adapterView, view, i, j);
+                onListItemClick((ListView) adapterView, view, i, j);
             }
         });
         list.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
             public boolean onItemLongClick(AdapterView<?> adapterView, View view, int i, long j) {
                 if (i == 0) {
-                    if (((String) fileBrower.this.directoryEntries.get(i)).equals("..")) {
-                        Log.v("select", (String) fileBrower.this.directoryEntries.get(i));
+                    if (((String) directoryEntries.get(i)).equals("..")) {
+                        Log.v("select", (String) directoryEntries.get(i));
                         return true;
                     }
                     fileBrower filebrower = fileBrower.this;
@@ -105,7 +105,7 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setMessage(getString(R.string.str_no_sdcard)).setTitle(R.string.unknow_error_title).setCancelable(false).setPositiveButton(getString(R.string.str_exit_btn), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                fileBrower.this.finish();
+                finish();
             }
         });
         builder.create().show();
@@ -144,9 +144,9 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
                             if (!file.isDirectory() || file.listFiles().length <= 0) {
                                 file.delete();
                             } else {
-                                fileBrower.this.deleteSubfile(file);
+                                deleteSubfile(file);
                             }
-                            fileBrower.this.browseTo(file2);
+                            browseTo(file2);
                         } catch (SecurityException e) {
                             e.printStackTrace();
                         } catch (IOException e2) {
@@ -200,7 +200,7 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
                                     Toast.makeText (getApplicationContext(), R.string.str_error_Filename, 1).show();
                                 }
                             } else if (file3.renameTo(file)) {
-                                fileBrower.this.browseTo(file4);
+                                browseTo(file4);
                             } else {
                                 Toast.makeText (getApplicationContext(), R.string.str_error_Filename, 1).show();
                             }
@@ -261,7 +261,7 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
                     if (!file.exists()) {
                         try {
                             if (file.mkdirs()) {
-                                fileBrower.this.browseTo(new File(absolutePath));
+                                browseTo(new File(absolutePath));
                             } else {
                                 fileBrower.mMessage();
                             }

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

@@ -40,7 +40,7 @@ public class ConvertProgressActivity extends AppCompatActivity implements Conver
         mIprintGoogleSignIn = new IprintGoogleSignIn();
         ((Button) findViewById(R.id.close_btn)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                ConvertProgressActivity.this.cancelTaskAndFinish();
+                cancelTaskAndFinish();
             }
         });
         mMessageText = (TextView) findViewById(R.id.loading_tv);

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

@@ -64,7 +64,7 @@ public class ConvertTask extends AsyncTask<String, ConvertStatus, Integer> {
             }
             createDriveWriter.convertFileToPdf(str, mimeType, createDriveWriter.findOrCreateFolder("Epson iPrint"), createOutFilename, new DriveWriter.ConvertStatusNotifier() {
                 public void changeStatus(ConvertStatus convertStatus) {
-                    ConvertTask.this.publishProgress(new ConvertStatus[]{convertStatus});
+                    publishProgress(new ConvertStatus[]{convertStatus});
                 }
             });
             return 100;

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

@@ -23,7 +23,7 @@ public class BitmapCache {
     private long mCacheSizeLimit = 10000000;
     private final Callable<Void> mCleanupCallable = new Callable<Void>() {
         public Void call() throws Exception {
-            BitmapCache.this.trimToSize();
+            trimToSize();
             return null;
         }
     };

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

@@ -78,7 +78,7 @@ public class ImageResizer {
         protected Bitmap doInBackground(Void... voidArr) {
             File file;
             Bitmap bitmap;
-            if (isCancelled() || !ImageResizer.this.mIsTargetActivityForeground || (file = mOrgFile) == null) {
+            if (isCancelled() || mIsTargetActivityForeground || (file = mOrgFile) == null) {
                 return null;
             }
             try {
@@ -94,7 +94,7 @@ public class ImageResizer {
                 return bitmap;
             }
             Bitmap rotateBitmap = rotateBitmap(mOrgFile, bitmap);
-            ImageResizer.this.mBitmapCache.addBitmap(mOrgFile, rotateBitmap);
+            mBitmapCache.addBitmap(mOrgFile, rotateBitmap);
             return rotateBitmap;
         }
 

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

@@ -225,7 +225,7 @@ public abstract class ImageSelectActivity extends ActivityIACommon implements Im
             AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
             builder.setPositiveButton(R.string.f343ok, new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
-                    OsCacheDialog.this.onOkPressed();
+                    onOkPressed();
                 }
             }).setNegativeButton(R.string.str_cancel, new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
@@ -233,7 +233,7 @@ public abstract class ImageSelectActivity extends ActivityIACommon implements Im
             }).setMultiChoiceItems(charSequenceArr, zArr, new DialogInterface.OnMultiChoiceClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i, boolean z) {
                     if (i == 0) {
-                        boolean unused = OsCacheDialog.this.mUseMediaStoreThumbnail = z;
+                        boolean unused = mUseMediaStoreThumbnail = z;
                     }
                 }
             });

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

@@ -72,7 +72,7 @@ public class ImageViewMultiSelectFragment extends ImageViewBaseFragment {
             mToggleText.setClickable(false);
             view.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
-                    MyToggleButton.this.toggleCheckStatus();
+                    toggleCheckStatus();
                 }
             });
             forceSetChecked(z);

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

@@ -179,7 +179,7 @@ public class ImageViewPagerActivity extends ActivityIACommon implements ImageVie
         }
 
         public Fragment getItem(int i) {
-            return ImageViewBaseFragment.newInstance(mFileList.get(i), ImageViewPagerActivity.this.mSingleFileMode, ImageViewPagerActivity.this.mMessageType);
+            return ImageViewBaseFragment.newInstance(mFileList.get(i), mSingleFileMode, mMessageType);
         }
 
         public int getCount() {

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

@@ -50,7 +50,7 @@ public class LocalAlertDialogFragment extends DialogFragment {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setMessage(string).setPositiveButton(getActivity().getString(R.string.str_ok), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                LocalAlertDialogFragment.this.execCallback();
+                execCallback();
             }
         });
         if (!z) {

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

@@ -161,7 +161,7 @@ public class InkRplnProgressFragment extends Fragment {
 
         protected Void doInBackground(Void... voidArr) {
             try {
-                InkRplnProgressFragment.this.getIPrintInkDsManager().tryRecordPrinterInfoFromServer(IprintApplication.getInstance());
+                getIPrintInkDsManager().tryRecordPrinterInfoFromServer(IprintApplication.getInstance());
                 return null;
             } catch (IOException | IllegalArgumentException e) {
                 EPLog.e("InkDeliverySystemTask", "exception <" + e.toString() + ">");
@@ -170,7 +170,7 @@ public class InkRplnProgressFragment extends Fragment {
         }
 
         protected void onPostExecute(Void voidR) {
-            InkRplnProgressFragment.this.requestToShowDialogOrFinish();
+            requestToShowDialogOrFinish();
         }
     }
 }

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

@@ -152,9 +152,9 @@ public class JumpUrlFragment extends Fragment {
 
         protected void onPostExecute(Uri uri) {
             if (uri == null) {
-                JumpUrlFragment.this.requestShowErrorDialogAndFinishActivity();
+                requestShowErrorDialogAndFinishActivity();
             } else {
-                JumpUrlFragment.this.requestStartBrowser(uri);
+                requestStartBrowser(uri);
             }
         }
     }

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

@@ -34,21 +34,21 @@ public class PrintSettingDependencyBuilder extends DependencyBuilder {
         }
 
         public String getSerialNo(@NonNull Context context) {
-            return PrintSettingDependencyBuilder.this.mPrinterSerialNumber;
+            return mPrinterSerialNumber;
         }
 
         public String getNonRemotePrinterDeviceId(@NonNull Context context) {
-            return PrintSettingDependencyBuilder.this.mPrinterModelName;
+            return mPrinterModelName;
         }
 
         public boolean isRemotePrinter(@NonNull Context context) {
-            return PrintSettingDependencyBuilder.this.mPrinterLocation == 2;
+            return mPrinterLocation == 2;
         }
 
         public void activateEma() {
             MaintainPrinter2 instance = MaintainPrinter2.getInstance();
             instance.doInitDriver(IprintApplication.getInstance(), 2);
-            if (instance.doProbePrinter(60, PrintSettingDependencyBuilder.this.mEscprLibPrinterId, PrintSettingDependencyBuilder.this.mPrinterIpAddress, PrintSettingDependencyBuilder.this.mPrinterLocation) == 0) {
+            if (instance.doProbePrinter(60, mEscprLibPrinterId, mPrinterIpAddress, mPrinterLocation) == 0) {
                 instance.setMSearchPos(0);
                 instance.doSetPrinter();
                 super.activateEma();

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

@@ -58,21 +58,21 @@ public class pdfRender implements CommonDefine {
                     try {
                         if  (mPdfFile != null) {
                             if (i3 == 0) {
-                                pdfRender.this.mPreviewmode = true;
-                                pdfRender.this.mUiHandler.sendEmptyMessage(4);
+                                mPreviewmode = true;
+                                mUiHandler.sendEmptyMessage(4);
                                 Log.d(pdfRender.TAG, "convert4Preview :start");
-                                pdfRender.this.convert4Preview(i);
+                                convert4Preview(i);
                                 Log.d(pdfRender.TAG, "convert4Preview :finish");
                             } else if (i3 == 1) {
-                                pdfRender.this.mPreviewmode = false;
+                                mPreviewmode = false;
                                 Log.d(pdfRender.TAG, "printing");
-                                pdfRender.this.convert4Print(i, i2);
+                                convert4Print(i, i2);
                             }
                         }
                     } catch (Exception e) {
                         Log.e(pdfRender.TAG, "GOT ERROR WHEN CONVERT: " + e);
                     }
-                    Thread unused = pdfRender.this.backgroundThread = null;
+                    Thread unused = backgroundThread = null;
                 }
             });
             backgroundThread.start();

+ 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(mIndex);
+            return get(mIndex);
         }
 
         public void setFitMode(int i) {
-            ((LayoutInfo) PhotoPreviewImageList.this.mLayoutInfoList.get(mIndex)).fitMode = i;
+            ((LayoutInfo) mLayoutInfoList.get(mIndex)).fitMode = i;
         }
 
         public int getFitMode() {
-            return ((LayoutInfo) PhotoPreviewImageList.this.mLayoutInfoList.get(mIndex)).fitMode;
+            return ((LayoutInfo) mLayoutInfoList.get(mIndex)).fitMode;
         }
     }
 

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

@@ -90,14 +90,14 @@ class ActivityBase extends ActivityIACommon {
             builder.setCancelable(false);
             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();
+                    cancelButton.setEnabled(false);
+                    cancelCallback.onCancelRequest();
                     dialogInterface.cancel();
                 }
             });
             builder.setNegativeButton(getString(R.string.str_no), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
-                    WheelDialog.this.cancelButton.setEnabled(true);
+                    cancelButton.setEnabled(true);
                     dialogInterface.cancel();
                 }
             });
@@ -119,7 +119,7 @@ class ActivityBase extends ActivityIACommon {
                 public void onClick(View view) {
                     WheelDialog wheelDialog = WheelDialog.this;
                     wheelDialog.cancelDialog = wheelDialog.createCancelDialog();
-                    WheelDialog.this.cancelDialog.show();
+                    cancelDialog.show();
                 }
             });
             cancelButton.setVisibility(0);
@@ -416,7 +416,7 @@ class ActivityBase extends ActivityIACommon {
             }
 
             public void onClick(View view) {
-                NumberOptionValue.this.updateWithAddition(amount);
+                updateWithAddition(amount);
             }
         }
 

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

@@ -69,7 +69,7 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
         eRemoteDevice.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
         ERemoteDevice.ERemoteDeviceFunctionsResult functions = eRemoteDevice.getFunctions(new ERemoteOperation.IRemoteOperationParameter() {
             public String client_id() {
-                return RemoteCopyGetOptionTask.this.clientID;
+                return clientID;
             }
         });
         if (!functions.success()) {
@@ -96,7 +96,7 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
         eRemotePrinter.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
         ERemotePrinter.ERemotePrinterComponentsResult components = eRemotePrinter.getComponents(new ERemoteOperation.IRemoteOperationParameter() {
             public String client_id() {
-                return RemoteCopyGetOptionTask.this.clientID;
+                return clientID;
             }
         });
         if (!components.success()) {
@@ -107,7 +107,7 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
         eRemoteScanner.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
         ERemoteScanner.ERemoteScannerComponentsResult components2 = eRemoteScanner.getComponents(new ERemoteOperation.IRemoteOperationParameter() {
             public String client_id() {
-                return RemoteCopyGetOptionTask.this.clientID;
+                return clientID;
             }
         });
         if (!components2.success()) {

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

@@ -146,31 +146,31 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
             }
 
             public String client_id() {
-                return RemoteCopySetOptionTask.this.clientID;
+                return clientID;
             }
 
             public ERemoteOperation.ERemoteParam layout() {
-                return RemoteCopySetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.RepeatLayout).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.RepeatLayout).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_media_type() {
-                return RemoteCopySetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaType).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaType).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_media_size() {
-                return RemoteCopySetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_media_source() {
-                return RemoteCopySetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSource).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSource).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_quality() {
-                return RemoteCopySetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintQuality).getSelectedChoice().param;
+                return optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintQuality).getSelectedChoice().param;
             }
 
             public ERemoteOperation.ERemoteParam print_sheet_collate() {
-                return RemoteCopySetOptionTask.this.optionContext.getCopyOptionsResult().parameter_default(ERemoteOperation.ERemoteParam.print_sheet_collate);
+                return optionContext.getCopyOptionsResult().parameter_default(ERemoteOperation.ERemoteParam.print_sheet_collate);
             }
 
             public ArrayList<ERemoteOperation.ERemoteParam> fixed_parameters() {

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

@@ -190,7 +190,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
         return new ECopyComponent.ICopyCancelRequest() {
             public void cancel() {
                 synchronized (this) {
-                    RemoteCopyTask.this.cancelRequested = true;
+                    cancelRequested = true;
                 }
             }
         };
@@ -215,20 +215,20 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
     protected void onPreExecute() {
         cancelParameter = new ERemoteCopy.IRemoteCancelParameter() {
             public String client_id() {
-                return RemoteCopyTask.this.clientID;
+                return clientID;
             }
 
             public String job_token() {
-                return RemoteCopyTask.this.jobToken;
+                return jobToken;
             }
         };
         statusParameter = new ERemoteCopy.IRemoteCopyStatusParameter() {
             public String client_id() {
-                return RemoteCopyTask.this.clientID;
+                return clientID;
             }
 
             public String job_token() {
-                return RemoteCopyTask.this.jobToken;
+                return jobToken;
             }
 
             public ArrayList<ERemoteOperation.ERemoteParam> keys() {
@@ -298,7 +298,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                                 eRemotePrinter.setRequestConnectionTimeout(operation.getRequestConnectionTimeout());
                                 eRemotePrinter.clearError(new ERemoteOperation.IRemoteOperationParameter() {
                                     public String client_id() {
-                                        return RemoteCopyTask.this.clientID;
+                                        return clientID;
                                     }
                                 });
                                 for (int i = 0; i < 6 && !this.operation.getStatus(statusParameter).printer_state().equals(ERemoteOperation.ERemoteParam.processing); i++) {
@@ -316,15 +316,15 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                             case NextPageNotExist:
                                 boolean success = operation.documentChanged(new ERemoteCopy.IRemoteCopyDocumentChangedParameter() {
                                     public String client_id() {
-                                        return RemoteCopyTask.this.clientID;
+                                        return clientID;
                                     }
 
                                     public String job_token() {
-                                        return RemoteCopyTask.this.jobToken;
+                                        return jobToken;
                                     }
 
                                     public boolean next_document() {
-                                        return RemoteCopyTask.this.progress.resumeState == ECopyComponent.ICopyResumeRequest.ResumeState.NextPageReady;
+                                        return progress.resumeState == ECopyComponent.ICopyResumeRequest.ResumeState.NextPageReady;
                                     }
                                 }).success();
                                 break;
@@ -501,7 +501,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                         }
 
                         public void resume(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
-                            RemoteCopyTask.this.resumeNotify(resumeState);
+                            resumeNotify(resumeState);
                         }
                     };
                     break;
@@ -561,10 +561,10 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
                             }
 
                             public void resume(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
-                                RemoteCopyTask.this.progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Processing;
+                                progress.taskProgress = ECopyComponent.ICopyStatusListener.CopyTaskProgress.Processing;
                                 RemoteCopyTask remoteCopyTask = RemoteCopyTask.this;
                                 remoteCopyTask.localPublishProgress(remoteCopyTask.progress);
-                                RemoteCopyTask.this.resumeNotify(resumeState);
+                                resumeNotify(resumeState);
                             }
                         };
                         break;

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

@@ -55,27 +55,27 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                     EPLog.i (TAG, "PROBE_PRINTER");
                     CopyActivity copyActivity = CopyActivity.this;
                     ProbePrinter unused = copyActivity.task = new ProbePrinter();
-                    CopyActivity.this.task.execute(new Void[0]);
+                    task.execute(new Void[0]);
                     return true;
                 case 1:
                     EPLog.i (TAG, "COMM_ERROR");
                     CopyActivity copyActivity2 = CopyActivity.this;
                     ActivityBase.errorDialog unused2 = copyActivity2.errordialog = new ActivityBase.errorDialog(copyActivity2);
-                    CopyActivity.this.errordialog.showErrorDialog (getString(R.string.EPS_PRNERR_COMM_TITLE), CopyActivity.this.getString(R.string.EPS_PRNERR_COMM5), ActivityBase.DialogButtons.Ok, new ActivityBase.IClose() {
+                    errordialog.showErrorDialog (getString(R.string.EPS_PRNERR_COMM_TITLE), getString(R.string.EPS_PRNERR_COMM5), ActivityBase.DialogButtons.Ok, new ActivityBase.IClose() {
                         public void onClose(ActivityBase.ClickButton clickButton) {
-                            CopyActivity.this.returnToHome();
+                            returnToHome();
                         }
                     });
                     return true;
                 case 2:
                     EPLog.i (TAG, "UPDATE_SETTING");
                     if  (mECopyOptionContext == null) {
-                        CopyActivity.this.fetchCopyOptionContext();
+                        fetchCopyOptionContext();
                         return true;
                     }
                     CopyActivity copyActivity3 = CopyActivity.this;
                     copyActivity3.mECopyOptionContext = copyActivity3.copyComponent.getBindedCopyOptionContext();
-                    CopyActivity.this.copyComponent.bindCopyOptionContext (mECopyOptionContext, CopyActivity.this.optionListener);
+                    copyComponent.bindCopyOptionContext (mECopyOptionContext, optionListener);
                     CopyActivity copyActivity4 = CopyActivity.this;
                     copyActivity4.buildCopyOptions(copyActivity4.copyComponent.getCopyOptionItems());
                     return true;
@@ -108,13 +108,13 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         }
         optionValueChangedListener = new ActivityBase.OptionItemChangedListener() {
             public void onOptionItemChanged(ECopyOptionItem eCopyOptionItem) {
-                CopyActivity.this.copyComponent.setCopyOptionItem(eCopyOptionItem);
+                copyComponent.setCopyOptionItem(eCopyOptionItem);
             }
         };
         optionListener = new ECopyComponent.ICopyOptionListener() {
             public void onCopyOptionChanged(ECopyOptionItem eCopyOptionItem, ArrayList<ECopyOptionItem> arrayList, ECopyComponent.ICopyOptionListener.CopyOptionChangedError copyOptionChangedError) {
                 if (copyOptionChangedError != null) {
-                    CopyActivity.this.loading.dismiss();
+                    loading.dismiss();
                     CopyActivity copyActivity = CopyActivity.this;
                     ActivityBase.errorDialog errordialog = new ActivityBase.errorDialog(copyActivity);
                     String[] reasonText = errordialog.getReasonText(copyOptionChangedError);
@@ -123,19 +123,19 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                 }
                 ArrayList arrayList2 = new ArrayList();
                 if  (doClear) {
-                    if  (clearindex != CopyActivity.this.copyComponent.getCopyOptionItems().size()) {
-                        CopyActivity.this.allClear();
+                    if  (clearindex != copyComponent.getCopyOptionItems().size()) {
+                        allClear();
                         return;
                     }
-                    boolean unused = CopyActivity.this.doClear = false;
-                    int unused2 = CopyActivity.this.clearindex = 0;
+                    boolean unused = doClear = false;
+                    int unused2 = clearindex = 0;
                     arrayList2.addAll (copyComponent.getCopyOptionItems());
                 }
                 arrayList2.add(eCopyOptionItem);
                 if (arrayList != null) {
                     arrayList2.addAll(arrayList);
                 }
-                CopyActivity.this.buildCopyOptions(arrayList2);
+                buildCopyOptions(arrayList2);
             }
         };
     }
@@ -210,7 +210,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         mNormalCopyButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             public void onCheckedChanged(CompoundButton compoundButton, boolean z) {
                 if (z) {
-                    CopyActivity.this.switchToNormalCopy();
+                    switchToNormalCopy();
                 }
             }
         });
@@ -389,24 +389,24 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                 CopyActivity copyActivity = CopyActivity.this;
                 copyActivity.mECopyOptionContext = eCopyOptionContext;
                 if (contextCreationError == null) {
-                    copyActivity.copyComponent.bindCopyOptionContext (mECopyOptionContext, CopyActivity.this.optionListener);
-                    ArrayList<ECopyOptionItem> copyOptionItems = CopyActivity.this.copyComponent.getCopyOptionItems();
-                    ECopyOptionContext bindedCopyOptionContext = CopyActivity.this.copyComponent.getBindedCopyOptionContext();
+                    copyActivity.copyComponent.bindCopyOptionContext (mECopyOptionContext, optionListener);
+                    ArrayList<ECopyOptionItem> copyOptionItems = copyComponent.getCopyOptionItems();
+                    ECopyOptionContext bindedCopyOptionContext = copyComponent.getBindedCopyOptionContext();
                     if (bindedCopyOptionContext != null && bindedCopyOptionContext.hasCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XCutLine)) {
-                        CopyActivity.this.setupUiPostCommunication();
-                        CopyActivity.this.setClickListenerPostCommunication();
+                        setupUiPostCommunication();
+                        setClickListenerPostCommunication();
                     }
                     if  (presettings.loadPrePrinter())) {
-                        CopyActivity.this.presettings.setCopyOptions(copyOptionItems);
+                        presettings.setCopyOptions(copyOptionItems);
                     } else {
-                        CopyActivity.this.buildCopyOptions(copyOptionItems);
+                        buildCopyOptions(copyOptionItems);
                     }
                 } else {
                     ActivityBase.errorDialog unused = copyActivity.errordialog = new ActivityBase.errorDialog(copyActivity);
-                    String[] reasonText = CopyActivity.this.errordialog.getReasonText(contextCreationError);
-                    CopyActivity.this.errordialog.showErrorDialog(reasonText[0], reasonText[1], ActivityBase.DialogButtons.Ok, new ActivityBase.IClose() {
+                    String[] reasonText = errordialog.getReasonText(contextCreationError);
+                    errordialog.showErrorDialog(reasonText[0], reasonText[1], ActivityBase.DialogButtons.Ok, new ActivityBase.IClose() {
                         public void onClose(ActivityBase.ClickButton clickButton) {
-                            CopyActivity.this.returnToHome();
+                            returnToHome();
                         }
                     });
                 }
@@ -492,7 +492,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
 
     class XDensityValue extends ActivityBase.NumberOptionValue {
         ImageView image;
-        TypedArray images = CopyActivity.this.getResources().obtainTypedArray(R.array.density_images);
+        TypedArray images = getResources().obtainTypedArray(R.array.density_images);
 
         public XDensityValue(ECopyOptionItem eCopyOptionItem) {
             super();
@@ -505,13 +505,13 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         private void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
             optionItem = eCopyOptionItem;
             value = eCopyOptionItem.getSelectedValue();
-            image = (ImageView) CopyActivity.this.findViewById(i);
+            image = (ImageView) findViewById(i);
             image.setImageDrawable(images.getDrawable(value + 4));
             image.setEnabled(eCopyOptionItem.isEnabled());
         }
 
         private void bindCountUp(int i) {
-            countUp = (Button) CopyActivity.this.findViewById(i);
+            countUp = (Button) findViewById(i);
             countUp.setOnClickListener(new CounterImage(1));
             if (value == optionItem.getMaximumValue()) {
                 countUp.setEnabled(false);
@@ -521,7 +521,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         }
 
         private void bindCountDown(int i) {
-            countDown = (Button) CopyActivity.this.findViewById(i);
+            countDown = (Button) findViewById(i);
             countDown.setOnClickListener(new CounterImage(-1));
             if (value == optionItem.getMinimumValue()) {
                 countDown.setEnabled(false);
@@ -536,10 +536,10 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             }
 
             private void updateImage(int i) {
-                XDensityValue.this.value += i;
-                XDensityValue.this.optionItem.selectValue (value);
+                value += i;
+                optionItem.selectValue (value);
                 if  (changedListener != null) {
-                    XDensityValue.this.changedListener.onOptionItemChanged (optionItem);
+                    changedListener.onOptionItemChanged (optionItem);
                 }
             }
 
@@ -565,23 +565,23 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
 
         protected Boolean doInBackground(Void... voidArr) {
             EPLog.i (TAG, "ProbePrinter doInBackground");
-            if  (printerLocation != 1 && CopyActivity.this.printerLocation != 3) || ActivityBase.printerId == null) {
+            if  (printerLocation != 1 && printerLocation != 3) || ActivityBase.printerId == null) {
                 return false;
             }
-            CopyActivity.this.mPrinter.doInitDriver(CopyActivity.this, 2);
-            if  (mPrinter.doProbePrinter(60, ActivityBase.printerId, ActivityBase.printerIp, CopyActivity.this.printerLocation) != 0) {
+            mPrinter.doInitDriver(CopyActivity.this, 2);
+            if  (mPrinter.doProbePrinter(60, ActivityBase.printerId, ActivityBase.printerIp, printerLocation) != 0) {
                 return false;
             }
-            int doSetPrinter = CopyActivity.this.mPrinter.doSetPrinter();
-            String access$200 = CopyActivity.this.TAG;
+            int doSetPrinter = mPrinter.doSetPrinter();
+            String access$200 = TAG;
             EPLog.i(access$200, "Set Printer result: " + doSetPrinter);
             if (doSetPrinter != 0) {
                 return false;
             }
             CopyActivity copyActivity = CopyActivity.this;
             String unused = copyActivity.ipAdress = copyActivity.mPrinter.doGetIp();
-            String access$2002 = CopyActivity.this.TAG;
-            EPLog.i(access$2002, "IPAdress : " + CopyActivity.this.ipAdress);
+            String access$2002 = TAG;
+            EPLog.i(access$2002, "IPAdress : " + ipAdress);
             CopyActivity copyActivity2 = CopyActivity.this;
             copyActivity2.bProbedPrinter = true;
             copyActivity2.systemSettings = new ECopyComponent.ICopySystemSettings() {
@@ -590,9 +590,9 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                 }
 
                 public String getPrinterIPAddress() {
-                    String access$200 = CopyActivity.this.TAG;
-                    EPLog.i(access$200, "getPrinterIPAddress : " + CopyActivity.this.ipAdress);
-                    return CopyActivity.this.ipAdress;
+                    String access$200 = TAG;
+                    EPLog.i(access$200, "getPrinterIPAddress : " + ipAdress);
+                    return ipAdress;
                 }
             };
             ECopyComponent sharedComponent = ECopyComponent.sharedComponent();
@@ -604,15 +604,15 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         protected void onCancelled() {
             EPLog.i (TAG, "ProbePrinter onCancelled");
             super.onCancelled();
-            CopyActivity.this.mPrinter.doCancelFindPrinter();
+            mPrinter.doCancelFindPrinter();
         }
 
         protected void onPostExecute(Boolean bool) {
             EPLog.i (TAG, "ProbePrinter onPostExecute");
             if (bool.booleanValue()) {
-                CopyActivity.this.mHandler.sendEmptyMessage(2);
+                mHandler.sendEmptyMessage(2);
             } else {
-                CopyActivity.this.mHandler.sendEmptyMessage(1);
+                mHandler.sendEmptyMessage(1);
             }
         }
     }

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

@@ -42,7 +42,7 @@ public class CopyProcess implements ECopyComponent.ICopyStatusListener {
     public void onStarted(ECopyComponent.ICopyStatusListener.CopyTaskType copyTaskType) {
         wheel.show(activityBase.getString(R.string.CopyTaskProgressCopying), new ActivityBase.CancelRequestCallback() {
             public void onCancelRequest() {
-                CopyProcess.this.cancelRequest.cancel();
+                cancelRequest.cancel();
             }
         });
     }

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

@@ -39,12 +39,12 @@ public class CopySettingActivity extends ActivityBase {
         }
         optionValueChangedListener = new ActivityBase.OptionItemChangedListener() {
             public void onOptionItemChanged(ECopyOptionItem eCopyOptionItem) {
-                CopySettingActivity.this.copyComponent.setCopyOptionItem(eCopyOptionItem);
+                copyComponent.setCopyOptionItem(eCopyOptionItem);
             }
         };
         optionListener = new ECopyComponent.ICopyOptionListener() {
             public void onCopyOptionChanged(ECopyOptionItem eCopyOptionItem, ArrayList<ECopyOptionItem> arrayList, ECopyComponent.ICopyOptionListener.CopyOptionChangedError copyOptionChangedError) {
-                CopySettingActivity.this.loading.dismiss();
+                loading.dismiss();
                 if (copyOptionChangedError != null) {
                     CopySettingActivity copySettingActivity = CopySettingActivity.this;
                     ActivityBase.errorDialog errordialog = new ActivityBase.errorDialog(copySettingActivity);
@@ -52,7 +52,7 @@ public class CopySettingActivity extends ActivityBase {
                     errordialog.showErrorDialog(reasonText[0], reasonText[1]);
                     return;
                 }
-                CopySettingActivity.this.finish();
+                finish();
             }
         };
         mECopyOptionContext = copyComponent.getBindedCopyOptionContext();
@@ -87,15 +87,15 @@ public class CopySettingActivity extends ActivityBase {
         }
 
         private void capabilitySetting(ECopyOptionItem eCopyOptionItem, Context context) {
-            ListView listView = (ListView) CopySettingActivity.this.findViewById(R.id.copy_setting_list);
+            ListView listView = (ListView) findViewById(R.id.copy_setting_list);
             listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                 public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
-                    CopySettingActivity.this.loading.show();
-                    OthersettingValue.this.optionItem.selectChoice((ECopyOptionItem.ECopyOptionItemChoice) OthersettingValue.this.choices.get(i));
+                    loading.show();
+                    optionItem.selectChoice((ECopyOptionItem.ECopyOptionItemChoice) choices.get(i));
                     if  (changedListener != null) {
-                        OthersettingValue.this.changedListener.onOptionItemChanged (optionItem);
+                        changedListener.onOptionItemChanged (optionItem);
                     }
-                    CopySettingActivity.this.isKeepSimpleAPConnection = true;
+                    isKeepSimpleAPConnection = true;
                 }
             });
             listView.setAdapter(getArrayAdapter(this, context));
@@ -122,7 +122,7 @@ public class CopySettingActivity extends ActivityBase {
                     view = inflater.inflate(R.layout.setting_item, (ViewGroup) null);
                 }
                 ((TextView) view.findViewById(R.id.setting_name)).setText(items[i]);
-                if (i == OthersettingValue.this.selectedItemPos) {
+                if (i == selectedItemPos) {
                     ((ImageView) view.findViewById(R.id.setting_active_icon)).setVisibility(0);
                 } else {
                     ((ImageView) view.findViewById(R.id.setting_active_icon)).setVisibility(8);

+ 23 - 23
app/src/main/java/epson/print/screen/ActivityPrinterSetting.java

@@ -95,18 +95,18 @@ public class ActivityPrinterSetting extends ActivityIACommon implements View.OnC
             public boolean handleMessage(Message message) {
                 switch (message.what) {
                     case 1:
-                        ActivityPrinterSetting.this.printerNameEdit.setText("");
+                        printerNameEdit.setText("");
                         return true;
                     case 2:
-                        ActivityPrinterSetting.this.printerEmailAddressEdit.setText("");
+                        printerEmailAddressEdit.setText("");
                         return true;
                     case 3:
-                        ActivityPrinterSetting.this.accessKeyEdit.setText("");
+                        accessKeyEdit.setText("");
                         return true;
                     case 4:
-                        ActivityPrinterSetting.this.accessKeyText.setVisibility(message.arg1);
-                        ActivityPrinterSetting.this.accessKeyLayout.setVisibility(message.arg1);
-                        ActivityPrinterSetting.this.accessKeyEdit.requestFocus();
+                        accessKeyText.setVisibility(message.arg1);
+                        accessKeyLayout.setVisibility(message.arg1);
+                        accessKeyEdit.requestFocus();
                         return true;
                     case 5:
                         new setRemotePrintTask().execute(new Void[0]);
@@ -115,13 +115,13 @@ public class ActivityPrinterSetting extends ActivityIACommon implements View.OnC
                         if (message.arg1 == 0) {
                             return true;
                         }
-                        ActivityPrinterSetting.this.showErrorMessage(message.arg1);
+                        showErrorMessage(message.arg1);
                         return true;
                     case 7:
                         Intent intent = new Intent();
-                        intent.putExtra(ActivityPrinterSetting.KEY_MYPRINTER, ActivityPrinterSetting.this.mMyPrinter);
-                        ActivityPrinterSetting.this.setResult(-1, intent);
-                        ActivityPrinterSetting.this.finish();
+                        intent.putExtra(ActivityPrinterSetting.KEY_MYPRINTER, mMyPrinter);
+                        setResult(-1, intent);
+                        finish();
                         return true;
                     default:
                         return true;
@@ -468,35 +468,35 @@ public class ActivityPrinterSetting extends ActivityIACommon implements View.OnC
         protected Boolean doInBackground(Void... voidArr) {
             WiFiDirectManager.setPriorityToSimpleAP(ActivityPrinterSetting.this, false);
             ActivityPrinterSetting activityPrinterSetting = ActivityPrinterSetting.this;
-            int registRemotePrinter = EpsonConnectAccess.registRemotePrinter(activityPrinterSetting, activityPrinterSetting.printerEmailAddress, ActivityPrinterSetting.this.printerAccessKey);
+            int registRemotePrinter = EpsonConnectAccess.registRemotePrinter(activityPrinterSetting, activityPrinterSetting.printerEmailAddress, printerAccessKey);
             if (registRemotePrinter == -1203) {
                 Message message = new Message();
                 if  (accessKeyLayout.getVisibility() != 0) {
                     Message message2 = new Message();
                     message2.what = 4;
                     message2.arg1 = 0;
-                    ActivityPrinterSetting.this.mHandler.sendMessage(message2);
+                    mHandler.sendMessage(message2);
                 } else {
                     message.what = 6;
                     message.arg1 = registRemotePrinter;
-                    ActivityPrinterSetting.this.mHandler.sendMessage(message);
+                    mHandler.sendMessage(message);
                 }
                 return false;
             } else if (registRemotePrinter != 0) {
                 Message message3 = new Message();
                 message3.what = 6;
                 message3.arg1 = registRemotePrinter;
-                ActivityPrinterSetting.this.mHandler.sendMessage(message3);
+                mHandler.sendMessage(message3);
                 return false;
             } else {
                 ActivityPrinterSetting activityPrinterSetting2 = ActivityPrinterSetting.this;
-                EpsonConnectAccess.RemotePrinterInfo printerInfo = EpsonConnectAccess.getPrinterInfo(activityPrinterSetting2, activityPrinterSetting2.printerEmailAddress, ActivityPrinterSetting.this.printerAccessKey);
+                EpsonConnectAccess.RemotePrinterInfo printerInfo = EpsonConnectAccess.getPrinterInfo(activityPrinterSetting2, activityPrinterSetting2.printerEmailAddress, printerAccessKey);
                 if (printerInfo != null) {
-                    if  (!oldPrinterEmailAddress.equals("") && !ActivityPrinterSetting.this.oldPrinterEmailAddress.equals (printerEmailAddress)) {
+                    if  (!oldPrinterEmailAddress.equals("") && oldPrinterEmailAddress.equals (printerEmailAddress)) {
                         ActivityPrinterSetting activityPrinterSetting3 = ActivityPrinterSetting.this;
                         activityPrinterSetting3.deletePrinterInfo(activityPrinterSetting3.oldPrinterEmailAddress);
                     }
-                    ActivityPrinterSetting.this.savePrinterInfo(printerInfo);
+                    savePrinterInfo(printerInfo);
                 }
                 return true;
             }
@@ -507,7 +507,7 @@ public class ActivityPrinterSetting extends ActivityIACommon implements View.OnC
                 progress.dismiss();
             }
             if (bool.booleanValue()) {
-                ActivityPrinterSetting.this.mHandler.sendEmptyMessage(7);
+                mHandler.sendEmptyMessage(7);
             }
         }
     }
@@ -569,14 +569,14 @@ public class ActivityPrinterSetting extends ActivityIACommon implements View.OnC
                     inputStatus = 1;
                     ActivityPrinterSetting activityPrinterSetting = ActivityPrinterSetting.this;
                     String unused = activityPrinterSetting.printerEmailAddress = charSequence2.substring(0, i) + charSequence2.substring(i + 1);
-                    ActivityPrinterSetting.this.printerEmailAddressEdit.setText (printerEmailAddress);
-                    ActivityPrinterSetting.this.printerEmailAddressEdit.setSelection(i);
+                    printerEmailAddressEdit.setText (printerEmailAddress);
+                    printerEmailAddressEdit.setSelection(i);
                 } else if (i4 == 0) {
                     inputStatus = 1;
                     ActivityPrinterSetting activityPrinterSetting2 = ActivityPrinterSetting.this;
-                    String unused2 = activityPrinterSetting2.printerEmailAddress = charSequence2.substring(0, i + 1) + ActivityPrinterSetting.this.getDefaultMailDomain();
-                    ActivityPrinterSetting.this.printerEmailAddressEdit.setText (printerEmailAddress);
-                    ActivityPrinterSetting.this.showMailDomainSelectDialog();
+                    String unused2 = activityPrinterSetting2.printerEmailAddress = charSequence2.substring(0, i + 1) + getDefaultMailDomain();
+                    printerEmailAddressEdit.setText (printerEmailAddress);
+                    showMailDomainSelectDialog();
                 } else {
                     inputStatus = 0;
                 }

+ 3 - 3
app/src/main/java/epson/print/screen/ConfirmMultiScr.java

@@ -16,13 +16,13 @@ public class ConfirmMultiScr extends Activity {
         ((ImageView) findViewById(R.id.layout_image)).setImageResource(getIntent().getIntExtra(EXTRA_DRAWABLE_ID, R.drawable.multi_2in1l));
         findViewById(R.id.cancel_button).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                ConfirmMultiScr.this.onBackPressed();
+                onBackPressed();
             }
         });
         findViewById(R.id.continue_button).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                ConfirmMultiScr.this.setResult(-1);
-                ConfirmMultiScr.this.finish();
+                setResult(-1);
+                finish();
             }
         });
     }

+ 19 - 19
app/src/main/java/epson/print/screen/PageRangeSetting.java

@@ -96,33 +96,33 @@ public class PageRangeSetting extends ActivityIACommon implements View.OnClickLi
         btnPrintAll.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 if  (btnPrintAll.isChecked()) {
-                    PageRangeSetting.this.startPagePlus.setVisibility(8);
-                    PageRangeSetting.this.startPageMinus.setVisibility(8);
-                    PageRangeSetting.this.endPagePlus.setVisibility(8);
-                    PageRangeSetting.this.endPageMinus.setVisibility(8);
+                    startPagePlus.setVisibility(8);
+                    startPageMinus.setVisibility(8);
+                    endPagePlus.setVisibility(8);
+                    endPageMinus.setVisibility(8);
                     PageRangeSetting pageRangeSetting = PageRangeSetting.this;
                     pageRangeSetting.start = 1;
                     pageRangeSetting.end = pageRangeSetting.sheets;
-                    PageRangeSetting.this.startPage.setText(String.valueOf(1));
-                    PageRangeSetting.this.endPage.setText (sheets));
+                    startPage.setText(String.valueOf(1));
+                    endPage.setText (sheets));
                     return;
                 }
-                PageRangeSetting.this.startPagePlus.setVisibility(0);
-                PageRangeSetting.this.startPageMinus.setVisibility(0);
+                startPagePlus.setVisibility(0);
+                startPageMinus.setVisibility(0);
                 if  (start == 1) {
-                    PageRangeSetting.this.startPageMinus.setEnabled(false);
-                    if  (start < PageRangeSetting.this.end) {
-                        PageRangeSetting.this.startPagePlus.setEnabled(true);
+                    startPageMinus.setEnabled(false);
+                    if  (start < end) {
+                        startPagePlus.setEnabled(true);
                     }
                 }
-                PageRangeSetting.this.endPagePlus.setVisibility(0);
-                PageRangeSetting.this.endPageMinus.setVisibility(0);
-                PageRangeSetting.this.startPage.setText (start));
-                PageRangeSetting.this.endPage.setText (end));
-                if  (end == PageRangeSetting.this.sheets) {
-                    PageRangeSetting.this.endPagePlus.setEnabled(false);
-                    if  (end > PageRangeSetting.this.start) {
-                        PageRangeSetting.this.endPageMinus.setEnabled(true);
+                endPagePlus.setVisibility(0);
+                endPageMinus.setVisibility(0);
+                startPage.setText (start));
+                endPage.setText (end));
+                if  (end == sheets) {
+                    endPagePlus.setEnabled(false);
+                    if  (end > start) {
+                        endPageMinus.setEnabled(true);
                     }
                 }
             }

+ 20 - 20
app/src/main/java/epson/print/screen/PrintProgress.java

@@ -775,7 +775,7 @@ public class PrintProgress extends Activity implements CommonDefine {
             mCancelButton = (Button) findViewById(R.id.cancel_button);
             mCancelButton.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
-                    PrintProgress.this.CancelPrint();
+                    CancelPrint();
                 }
             });
             bSearching = false;
@@ -974,9 +974,9 @@ public class PrintProgress extends Activity implements CommonDefine {
                             }
                             EPLog.e("Epson", "user click str_cancel button");
                             PrintProgress.curError = 0;
-                            boolean unused = PrintProgress.this.isDialogOpen = false;
-                            PrintProgress.this.removeDialog(0);
-                            PrintProgress.this.mHandler.sendEmptyMessage(5);
+                            boolean unused = isDialogOpen = false;
+                            removeDialog(0);
+                            mHandler.sendEmptyMessage(5);
                         }
                     });
                     negativeButton.setOnKeyListener(new DialogInterface.OnKeyListener() {
@@ -991,31 +991,31 @@ public class PrintProgress extends Activity implements CommonDefine {
                         try {
                             if (PrintProgress.curError == 109) {
                                 PrintProgress.isBkRetry = true;
-                                PrintProgress.this.triggerPrint();
+                                triggerPrint();
                             }
                             PrintProgress.mEpsonService.confirmContinueable(true);
                             PrintProgress.curError = 0;
-                            boolean unused = PrintProgress.this.mError = false;
+                            boolean unused = mError = false;
                         } catch (RemoteException e) {
                             e.printStackTrace();
                         }
-                        boolean unused2 = PrintProgress.this.isDialogOpen = false;
-                        PrintProgress.this.removeDialog(0);
+                        boolean unused2 = isDialogOpen = false;
+                        removeDialog(0);
                     }
                 }).setNegativeButton(getString(R.string.str_cancel), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        boolean unused = PrintProgress.this.isDialogOpen = false;
-                        PrintProgress.this.removeDialog(0);
+                        boolean unused = isDialogOpen = false;
+                        removeDialog(0);
                         try {
                             PrintProgress.mEpsonService.confirmContinueable(false);
                             PrintProgress.curError = 0;
                         } catch (RemoteException e) {
                             e.printStackTrace();
                         }
-                        boolean unused2 = PrintProgress.this.mWaitEpsonServiceForFinish = true;
-                        boolean unused3 = PrintProgress.this.mError = true;
+                        boolean unused2 = mWaitEpsonServiceForFinish = true;
+                        boolean unused3 = mError = true;
                         EPLog.d("PrintProgress", "cont/cancel dialog. cancel clicked");
-                        PrintProgress.this.mHandler.sendEmptyMessage(5);
+                        mHandler.sendEmptyMessage(5);
                     }
                 });
                 negativeButton2.setOnKeyListener(new DialogInterface.OnKeyListener() {
@@ -1030,7 +1030,7 @@ public class PrintProgress extends Activity implements CommonDefine {
                 }
                 AlertDialog.Builder negativeButton3 = new AlertDialog.Builder(this).setTitle((CharSequence) null).setCancelable(false).setMessage(getString(R.string.str_msg_scan_cancel)).setPositiveButton(getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        PrintProgress.this.mHandler.removeMessages(1);
+                        mHandler.removeMessages(1);
                         try {
                             EPLog.e("Epson", "user choice cancel print from GUI");
                             if ((PrintProgress.mEpsonService != null ? PrintProgress.mEpsonService.confirmCancel(true) : 0) == 0) {
@@ -1041,19 +1041,19 @@ public class PrintProgress extends Activity implements CommonDefine {
                         } catch (RemoteException e) {
                             e.printStackTrace();
                         }
-                        PrintProgress.this.removeDialog(1);
+                        removeDialog(1);
                         PrintProgress printProgress = PrintProgress.this;
                         printProgress.mCanceled = true;
                         printProgress.mCancelButton.setVisibility(4);
-                        PrintProgress.this.mCancelButton.setEnabled(false);
+                        mCancelButton.setEnabled(false);
                         if  (bSearching) {
-                            PrintProgress.this.mHandler.sendEmptyMessage(5);
-                            boolean unused = PrintProgress.this.bSearching = false;
+                            mHandler.sendEmptyMessage(5);
+                            boolean unused = bSearching = false;
                         }
                     }
                 }).setNegativeButton(getString(R.string.str_no), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        PrintProgress.this.removeDialog(1);
+                        removeDialog(1);
                     }
                 });
                 negativeButton3.setOnKeyListener(new DialogInterface.OnKeyListener() {
@@ -1122,7 +1122,7 @@ public class PrintProgress extends Activity implements CommonDefine {
         new CustomTitleAlertDialogBuilder(this).setCancelable(false).setTitle(str).setMessage(str2).setNegativeButton(getString(R.string.f343ok), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 dialogInterface.cancel();
-                PrintProgress.this.mHandler.sendEmptyMessage(5);
+                mHandler.sendEmptyMessage(5);
             }
         }).create().show();
     }

+ 43 - 43
app/src/main/java/epson/print/screen/PrinterFinder.java

@@ -91,7 +91,7 @@ public class PrinterFinder extends ActivityIACommon {
             bundle.putString("id", str3);
             bundle.putString("common_devicename", str5);
             obtain.setData(bundle);
-            PrinterFinder.this.mHandler.sendMessage(obtain);
+            mHandler.sendMessage(obtain);
         }
 
         public void onNotifyError(int i, int i2, boolean z) throws RemoteException {
@@ -112,18 +112,18 @@ public class PrinterFinder extends ActivityIACommon {
     private ServiceConnection mEpsonConnection = new ServiceConnection() {
         public void onServiceDisconnected(ComponentName componentName) {
             try {
-                PrinterFinder.this.mEpsonService.unregisterCallback (mCallback);
+                mEpsonService.unregisterCallback (mCallback);
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
-            IEpsonService unused = PrinterFinder.this.mEpsonService = null;
+            IEpsonService unused = mEpsonService = null;
         }
 
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
-            IEpsonService unused = PrinterFinder.this.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
+            IEpsonService unused = mEpsonService = IEpsonService.Stub.asInterface(iBinder);
             if  (mEpsonService != null) {
                 try {
-                    PrinterFinder.this.mEpsonService.registerCallback (mCallback);
+                    mEpsonService.registerCallback (mCallback);
                 } catch (RemoteException e) {
                     e.printStackTrace();
                 }
@@ -136,15 +136,15 @@ public class PrinterFinder extends ActivityIACommon {
             switch (message.what) {
                 case 1:
                     if  (mEpsonService == null) {
-                        PrinterFinder.this.mHandler.sendEmptyMessageDelayed(1, 100);
+                        mHandler.sendEmptyMessageDelayed(1, 100);
                         break;
                     } else {
                         try {
-                            boolean unused = PrinterFinder.this.isFinishSearchPrinter = false;
-                            PrinterFinder.this.searchButtonSetEnabled(false);
-                            PrinterFinder.this.mProgressBar.setVisibility(0);
-                            ((TextView) PrinterFinder.this.mLayout.findViewById (getString(R.string.searching_text));
-                            PrinterFinder.this.mEpsonService.searchPrinters((String) null, (String) null, 1);
+                            boolean unused = isFinishSearchPrinter = false;
+                            searchButtonSetEnabled(false);
+                            mProgressBar.setVisibility(0);
+                            ((TextView) mLayout.findViewById (getString(R.string.searching_text));
+                            mEpsonService.searchPrinters((String) null, (String) null, 1);
                             break;
                         } catch (RemoteException e) {
                             e.printStackTrace();
@@ -154,7 +154,7 @@ public class PrinterFinder extends ActivityIACommon {
                 case 2:
                     if  (mEpsonService != null) {
                         try {
-                            PrinterFinder.this.mEpsonService.cancelSearchPrinter();
+                            mEpsonService.cancelSearchPrinter();
                             break;
                         } catch (RemoteException e2) {
                             e2.printStackTrace();
@@ -168,17 +168,17 @@ public class PrinterFinder extends ActivityIACommon {
                     if (string == null || string.contentEquals("FINISH")) {
                         if  (!mIsClickSelect) {
                             if  (mBuilder.getData().size() <= 0) {
-                                ((TextView) PrinterFinder.this.mLayout.findViewById (getString(R.string.EPS_PRNERR_COMM_TITLE1));
+                                ((TextView) mLayout.findViewById (getString(R.string.EPS_PRNERR_COMM_TITLE1));
                             } else if (Locale.getDefault().getLanguage().equalsIgnoreCase(Locale.JAPAN.getLanguage()) || Locale.getDefault().getLanguage().equalsIgnoreCase(Locale.JAPANESE.getLanguage())) {
-                                ((TextView) PrinterFinder.this.mLayout.findViewById (getString(R.string.numberOfPrintersAvailable));
-                                ((TextView) PrinterFinder.this.mLayout.findViewById (getString(R.string.numberOfPrintersAvailable));
+                                ((TextView) mLayout.findViewById (getString(R.string.numberOfPrintersAvailable));
+                                ((TextView) mLayout.findViewById (getString(R.string.numberOfPrintersAvailable));
                             } else {
-                                ((TextView) PrinterFinder.this.mLayout.findViewById (getString(R.string.numberOfPrintersAvailable), new Object[]{Integer.valueOf (mBuilder.getData().size())}));
+                                ((TextView) mLayout.findViewById (getString(R.string.numberOfPrintersAvailable), new Object[]{Integer.valueOf (mBuilder.getData().size())}));
                             }
-                            PrinterFinder.this.mBuilder.getAdapter().notifyDataSetChanged();
-                            PrinterFinder.this.mProgressBar.setVisibility(8);
-                            PrinterFinder.this.searchButtonSetEnabled(true);
-                            boolean unused2 = PrinterFinder.this.isFinishSearchPrinter = true;
+                            mBuilder.getAdapter().notifyDataSetChanged();
+                            mProgressBar.setVisibility(8);
+                            searchButtonSetEnabled(true);
+                            boolean unused2 = isFinishSearchPrinter = true;
                             break;
                         }
                     } else {
@@ -216,8 +216,8 @@ public class PrinterFinder extends ActivityIACommon {
                                     protected void onPostExecute(MyPrinter[] myPrinterArr) {
                                         super.onPostExecute(myPrinterArr);
                                         if (myPrinterArr != null) {
-                                            ((PrinterInfoBuilder) PrinterFinder.this.mBuilder).addPrinter(myPrinterArr[0]);
-                                            PrinterFinder.this.printerList.add(data.getString("id"));
+                                            ((PrinterInfoBuilder) mBuilder).addPrinter(myPrinterArr[0]);
+                                            printerList.add(data.getString("id"));
                                         }
                                     }
                                 }.execute(new Void[0]);
@@ -232,7 +232,7 @@ public class PrinterFinder extends ActivityIACommon {
                 case 4:
                     if  (mEpsonService != null) {
                         try {
-                            PrinterFinder.this.mEpsonService.setCurPrinter(message.getData().getInt("index"));
+                            mEpsonService.setCurPrinter(message.getData().getInt("index"));
                         } catch (RemoteException e3) {
                             e3.printStackTrace();
                         }
@@ -243,15 +243,15 @@ public class PrinterFinder extends ActivityIACommon {
                     bundle.putString(Constants.PRINTER_IP, message.getData().getString(escprLib.PRINTER_IP));
                     bundle.putString(Constants.PRINTER_ID, message.getData().getString("id"));
                     intent.putExtras(bundle);
-                    PrinterFinder.this.setResult(-1, intent);
-                    PrinterFinder.this.startActivity(new Intent("android.intent.action.VIEW", Uri.parse(IPAddressUtils.buildURL(Analytics.EXTENSION_STRING_WEB, message.getData().getString(escprLib.PRINTER_IP), "/PRESENTATION/EPSONCONNECT"))));
-                    PrinterFinder.this.finish();
+                    setResult(-1, intent);
+                    startActivity(new Intent("android.intent.action.VIEW", Uri.parse(IPAddressUtils.buildURL(Analytics.EXTENSION_STRING_WEB, message.getData().getString(escprLib.PRINTER_IP), "/PRESENTATION/EPSONCONNECT"))));
+                    finish();
                     break;
                 case 5:
                     if  (!isDialogOpen) {
-                        boolean unused4 = PrinterFinder.this.isDialogOpen = true;
-                        EPLog.i("mHandler", "curError = " + PrinterFinder.this.curError);
-                        PrinterFinder.this.showDialog(0);
+                        boolean unused4 = isDialogOpen = true;
+                        EPLog.i("mHandler", "curError = " + curError);
+                        showDialog(0);
                         break;
                     }
                     break;
@@ -294,32 +294,32 @@ public class PrinterFinder extends ActivityIACommon {
         ((ListView) mLayout.findViewById(16908298)).setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
                 if  (isFocused.booleanValue()) {
-                    Boolean unused = PrinterFinder.this.isFocused = false;
+                    Boolean unused = isFocused = false;
                     PrinterFinder printerFinder = PrinterFinder.this;
                     printerFinder.mIsClickSelect = true;
                     Message obtainMessage = printerFinder.mHandler.obtainMessage();
                     obtainMessage.what = 4;
                     Bundle bundle = new Bundle();
                     bundle.putInt("index", i);
-                    bundle.putString("name", ((MyPrinter) PrinterFinder.this.mBuilder.getData().elementAt(i)).getName());
-                    bundle.putString("id", ((MyPrinter) PrinterFinder.this.mBuilder.getData().elementAt(i)).getPrinterId());
-                    bundle.putString(escprLib.PRINTER_IP, ((MyPrinter) PrinterFinder.this.mBuilder.getData().elementAt(i)).getIp());
+                    bundle.putString("name", ((MyPrinter) mBuilder.getData().elementAt(i)).getName());
+                    bundle.putString("id", ((MyPrinter) mBuilder.getData().elementAt(i)).getPrinterId());
+                    bundle.putString(escprLib.PRINTER_IP, ((MyPrinter) mBuilder.getData().elementAt(i)).getIp());
                     obtainMessage.setData(bundle);
-                    PrinterFinder.this.mHandler.sendMessageDelayed(obtainMessage, 100);
+                    mHandler.sendMessageDelayed(obtainMessage, 100);
                 }
             }
         });
         mSearchButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 synchronized (PrinterFinder.mLock) {
-                    PrinterFinder.this.printerList.clear();
-                    PrinterFinder.this.mBuilder.refresh();
+                    printerList.clear();
+                    mBuilder.refresh();
                 }
-                boolean unused = PrinterFinder.this.isFinishSearchPrinter = false;
-                PrinterFinder.this.searchButtonSetEnabled(false);
-                PrinterFinder.this.mProgressBar.setVisibility(0);
-                ((TextView) PrinterFinder.this.mLayout.findViewById (getString(R.string.searching_text));
-                PrinterFinder.this.mHandler.sendEmptyMessageDelayed(1, 100);
+                boolean unused = isFinishSearchPrinter = false;
+                searchButtonSetEnabled(false);
+                mProgressBar.setVisibility(0);
+                ((TextView) mLayout.findViewById (getString(R.string.searching_text));
+                mHandler.sendEmptyMessageDelayed(1, 100);
             }
         });
     }
@@ -385,8 +385,8 @@ public class PrinterFinder extends ActivityIACommon {
         }
         return new CustomTitleAlertDialogBuilder(this).setCancelable(false).setTitle(getString(stringId[1].intValue())).setMessage(string).setNegativeButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                PrinterFinder.this.removeDialog(0);
-                boolean unused = PrinterFinder.this.isDialogOpen = false;
+                removeDialog(0);
+                boolean unused = isDialogOpen = false;
             }
         }).create();
     }

+ 53 - 53
app/src/main/java/epson/print/screen/SearchPrinterScr.java

@@ -116,7 +116,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
 
         public void onFindPrinterResult(String str, String str2, String str3, String str4, String str5) throws RemoteException {
             EPLog.i(str);
-            int access$200 = SearchPrinterScr.this.printer_location;
+            int access$200 = printer_location;
             if (access$200 == 1) {
                 Message obtain = Message.obtain();
                 obtain.what = 3;
@@ -127,22 +127,22 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
                 bundle.putString(escprLib.PRINTER_SERIAL_NO, str4);
                 bundle.putString("common_devicename", str5);
                 obtain.setData(bundle);
-                SearchPrinterScr.this.mHandler.sendMessage(obtain);
+                mHandler.sendMessage(obtain);
             } else if (access$200 == 3) {
-                MyPrinter unused = SearchPrinterScr.this.probedPrinter = new MyPrinter(str, str2, str3, str4);
+                MyPrinter unused = probedPrinter = new MyPrinter(str, str2, str3, str4);
             }
         }
 
         public void onNotifyContinueable(int i) throws RemoteException {
-            if  (progress != null && SearchPrinterScr.this.progress.isShowing()) {
-                SearchPrinterScr.this.progress.dismiss();
+            if  (progress != null && progress.isShowing()) {
+                progress.dismiss();
             }
-            if  (selectedPrinter != null && SearchPrinterScr.this.probedPrinter != null && SearchPrinterScr.this.printer_location == 3) {
+            if  (selectedPrinter != null && probedPrinter != null && printer_location == 3) {
                 if  (selectedPrinter.getPrinterId())) {
-                    Message obtainMessage = SearchPrinterScr.this.mHandler.obtainMessage();
+                    Message obtainMessage = mHandler.obtainMessage();
                     obtainMessage.what = 4;
-                    obtainMessage.obj = SearchPrinterScr.this.selectedPrinter;
-                    SearchPrinterScr.this.mHandler.sendMessage(obtainMessage);
+                    obtainMessage.obj = selectedPrinter;
+                    mHandler.sendMessage(obtainMessage);
                     return;
                 }
                 SearchPrinterScr searchPrinterScr = SearchPrinterScr.this;
@@ -164,10 +164,10 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
                 SearchPrinterScr searchPrinterScr = SearchPrinterScr.this;
                 searchPrinterScr.curError = i2;
                 searchPrinterScr.mHandler.sendEmptyMessage(13);
-                if  (progress != null && SearchPrinterScr.this.progress.isShowing()) {
-                    SearchPrinterScr.this.progress.dismiss();
+                if  (progress != null && progress.isShowing()) {
+                    progress.dismiss();
                 }
-                Boolean unused2 = SearchPrinterScr.this.isFocused = true;
+                Boolean unused2 = isFocused = true;
             }
         }
     };
@@ -176,18 +176,18 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
     private ServiceConnection mEpsonConnection = new ServiceConnection() {
         public void onServiceDisconnected(ComponentName componentName) {
             try {
-                SearchPrinterScr.this.mEpsonService.unregisterCallback (mCallback);
+                mEpsonService.unregisterCallback (mCallback);
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
-            IEpsonService unused = SearchPrinterScr.this.mEpsonService = null;
+            IEpsonService unused = mEpsonService = null;
         }
 
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
-            IEpsonService unused = SearchPrinterScr.this.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
+            IEpsonService unused = mEpsonService = IEpsonService.Stub.asInterface(iBinder);
             if  (mEpsonService != null) {
                 try {
-                    SearchPrinterScr.this.mEpsonService.registerCallback (mCallback);
+                    mEpsonService.registerCallback (mCallback);
                 } catch (RemoteException e) {
                     e.printStackTrace();
                 }
@@ -716,7 +716,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         }
         mWiFiSettingButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                SearchPrinterScr.this.startWifiPrinterSelect();
+                startWifiPrinterSelect();
             }
         });
     }
@@ -729,7 +729,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         mAboutRemoteButton = mLayout.findViewById(R.id.AboutRemoteFrame);
         mAboutRemoteButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                SearchPrinterScr.this.startActivity(new Intent("android.intent.action.VIEW", Uri.parse("https://www.epsonconnect.com/iguide/")));
+                startActivity(new Intent("android.intent.action.VIEW", Uri.parse("https://www.epsonconnect.com/iguide/")));
             }
         });
     }
@@ -800,16 +800,16 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
                 if  (isFocused.booleanValue()) {
-                    Boolean unused = SearchPrinterScr.this.isFocused = false;
+                    Boolean unused = isFocused = false;
                     SearchPrinterScr searchPrinterScr = SearchPrinterScr.this;
                     searchPrinterScr.mIsClickSelect = true;
                     Message obtainMessage = searchPrinterScr.mHandler.obtainMessage();
-                    obtainMessage.obj = SearchPrinterScr.this.mBuilder.getData().elementAt(i);
-                    int access$200 = SearchPrinterScr.this.printer_location;
+                    obtainMessage.obj = mBuilder.getData().elementAt(i);
+                    int access$200 = printer_location;
                     if (access$200 == 1) {
                         String ip = ((MyPrinter) obtainMessage.obj).getIp();
                         if (!WiFiControl.ConnectType.NONE.equals(WiFiDirectManager.getConnectType(SearchPrinterScr.this, ip))) {
-                            SearchPrinterScr.this.interruptSearch();
+                            interruptSearch();
                             WiFiDirectManager.connect(SearchPrinterScr.this, ip, 10);
                         } else {
                             obtainMessage.what = 4;
@@ -819,7 +819,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
                     } else {
                         obtainMessage.what = 12;
                     }
-                    SearchPrinterScr.this.mHandler.sendMessageDelayed(obtainMessage, 100);
+                    mHandler.sendMessageDelayed(obtainMessage, 100);
                 }
             }
         });
@@ -828,7 +828,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
                 if  (printer_location == 1) {
                     return true;
                 }
-                int unused = SearchPrinterScr.this.mDeletePos = i;
+                int unused = mDeletePos = i;
                 SearchPrinterScr searchPrinterScr = SearchPrinterScr.this;
                 searchPrinterScr.registerForContextMenu(searchPrinterScr.mListView);
                 return false;
@@ -846,12 +846,12 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
                             return;
                         } else if  (getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).getBoolean(Constants.ENABLE_SHOW_WARNING, true)) {
                             AlertDialog.Builder cancelable = new AlertDialog.Builder (mContext).setCancelable(false);
-                            cancelable.setMessage (getString(R.string.epsonconnect_str_remote_print_warning) + "\n\n" + SearchPrinterScr.this.getString (getString(R.string.str_yes), new DialogInterface.OnClickListener() {
+                            cancelable.setMessage (getString(R.string.epsonconnect_str_remote_print_warning) + "\n\n" + getString (getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialogInterface, int i) {
                                     Message message = new Message();
                                     message.what = 8;
                                     message.obj = null;
-                                    SearchPrinterScr.this.mHandler.sendMessage(message);
+                                    mHandler.sendMessage(message);
                                 }
                             }).setNegativeButton (getString(R.string.str_no), new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialogInterface, int i) {
@@ -862,7 +862,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
                             Message message = new Message();
                             message.what = 8;
                             message.obj = null;
-                            SearchPrinterScr.this.mHandler.sendMessage(message);
+                            mHandler.sendMessage(message);
                             return;
                         }
                     case 3:
@@ -876,7 +876,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
                         Message message2 = new Message();
                         message2.what = 11;
                         message2.obj = null;
-                        SearchPrinterScr.this.mHandler.sendMessage(message2);
+                        mHandler.sendMessage(message2);
                         return;
                     default:
                         return;
@@ -886,45 +886,45 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         mSearchButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 if  (printer_location == 1) {
-                    SearchPrinterScr.this.mHandler.sendEmptyMessageDelayed(1, 100);
+                    mHandler.sendEmptyMessageDelayed(1, 100);
                 }
             }
         });
         mLocalButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 if  (printer_location != 1) {
-                    SearchPrinterScr.this.mAddButton.setVisibility(8);
-                    ((TextView) SearchPrinterScr.this.mLayout.findViewById(R.id.empty)).setVisibility(0);
-                    SearchPrinterScr.this.interruptSearch();
-                    int unused = SearchPrinterScr.this.printer_location = 1;
-                    SearchPrinterScr.this.buildElements();
-                    SearchPrinterScr.this.mHandler.sendEmptyMessageDelayed(1, 100);
+                    mAddButton.setVisibility(8);
+                    ((TextView) mLayout.findViewById(R.id.empty)).setVisibility(0);
+                    interruptSearch();
+                    int unused = printer_location = 1;
+                    buildElements();
+                    mHandler.sendEmptyMessageDelayed(1, 100);
                 }
             }
         });
         mRemoteButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 if  (printer_location != 2) {
-                    int unused = SearchPrinterScr.this.printer_location = 2;
-                    SearchPrinterScr.this.interruptSearch();
-                    ((TextView) SearchPrinterScr.this.mLayout.findViewById(R.id.empty)).setVisibility(8);
-                    SearchPrinterScr.this.mBuilder.refresh();
-                    SearchPrinterScr.this.buildElements();
-                    SearchPrinterScr.this.displaySearchResult();
-                    SearchPrinterScr.this.mSearchButton.setVisibility(8);
+                    int unused = printer_location = 2;
+                    interruptSearch();
+                    ((TextView) mLayout.findViewById(R.id.empty)).setVisibility(8);
+                    mBuilder.refresh();
+                    buildElements();
+                    displaySearchResult();
+                    mSearchButton.setVisibility(8);
                 }
             }
         });
         mIpButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 if  (printer_location != 3) {
-                    int unused = SearchPrinterScr.this.printer_location = 3;
-                    SearchPrinterScr.this.interruptSearch();
-                    ((TextView) SearchPrinterScr.this.mLayout.findViewById(R.id.empty)).setVisibility(8);
-                    SearchPrinterScr.this.mBuilder.refresh();
-                    SearchPrinterScr.this.buildElements();
-                    SearchPrinterScr.this.displaySearchResult();
-                    SearchPrinterScr.this.mSearchButton.setVisibility(8);
+                    int unused = printer_location = 3;
+                    interruptSearch();
+                    ((TextView) mLayout.findViewById(R.id.empty)).setVisibility(8);
+                    mBuilder.refresh();
+                    buildElements();
+                    displaySearchResult();
+                    mSearchButton.setVisibility(8);
                 }
             }
         });
@@ -946,9 +946,9 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
             case 1:
                 new AlertDialog.Builder(mContext).setCancelable(false).setTitle(getString(R.string.delete_file)).setIcon(getResources().getDrawable(R.drawable.delete_file)).setNegativeButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        Message obtainMessage = SearchPrinterScr.this.mHandler.obtainMessage();
+                        Message obtainMessage = mHandler.obtainMessage();
                         obtainMessage.what = 7;
-                        SearchPrinterScr.this.mHandler.sendMessageDelayed(obtainMessage, 100);
+                        mHandler.sendMessageDelayed(obtainMessage, 100);
                     }
                 }).setPositiveButton(getString(R.string.str_cancel), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
@@ -1185,8 +1185,8 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         }
         return new CustomTitleAlertDialogBuilder(this).setTitle((CharSequence) getString(stringId[1].intValue())).setMessage(string).setCancelable(false).setNegativeButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                SearchPrinterScr.this.removeDialog(0);
-                boolean unused = SearchPrinterScr.this.isDialogOpen = false;
+                removeDialog(0);
+                boolean unused = isDialogOpen = false;
             }
         }).create();
     }

+ 15 - 15
app/src/main/java/epson/print/screen/SettingScr.java

@@ -123,7 +123,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
         }
 
         public void onFindPrinterResult(String str, String str2, String str3, String str4, String str5) throws RemoteException {
-            String unused = SettingScr.this.printerIp = str2;
+            String unused = printerIp = str2;
         }
 
         public void onNotifyContinueable(int i) throws RemoteException {
@@ -157,19 +157,19 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
         public void onServiceDisconnected(ComponentName componentName) {
             EPLog.v("SettingScr", "onServiceDisconnected");
             try {
-                SettingScr.this.mEpsonService.unregisterCallback (mCallback);
+                mEpsonService.unregisterCallback (mCallback);
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
-            IEpsonService unused = SettingScr.this.mEpsonService = null;
+            IEpsonService unused = mEpsonService = null;
         }
 
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
-            IEpsonService unused = SettingScr.this.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
+            IEpsonService unused = mEpsonService = IEpsonService.Stub.asInterface(iBinder);
             EPLog.v("SettingScr", "onServiceConnected");
             if  (mEpsonService != null) {
                 try {
-                    SettingScr.this.mEpsonService.registerCallback (mCallback);
+                    mEpsonService.registerCallback (mCallback);
                 } catch (RemoteException e) {
                     e.printStackTrace();
                 }
@@ -766,28 +766,28 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
                     unbindEpsonService();
                     new AsyncTask<Void, Void, Void>() {
                         protected void onPreExecute() {
-                            SettingScr.this.findViewById(R.id.printer).setClickable(false);
+                            findViewById(R.id.printer).setClickable(false);
                         }
 
                         protected Void doInBackground(Void... voidArr) {
                             SettingScr settingScr = SettingScr.this;
                             WiFiDirectManager.disconnect(settingScr, WiFiDirectManager.DEVICE_TYPE_PRINTER, settingScr.printerIp);
                             SettingScr settingScr2 = SettingScr.this;
-                            WiFiDirectManager.disconnectSimpleAP(settingScr2, settingScr2.autoConnectSsid, SettingScr.this.printerIp);
+                            WiFiDirectManager.disconnectSimpleAP(settingScr2, settingScr2.autoConnectSsid, printerIp);
                             return null;
                         }
 
                         protected void onPostExecute(Void voidR) {
                             Intent intent = new Intent(SettingScr.this, SearchPrinterScr.class);
                             Bundle bundle = new Bundle();
-                            bundle.putString(Constants.PRINTER_ID, SettingScr.this.printerId);
-                            bundle.putString(Constants.PRINTER_IP, SettingScr.this.printerIp);
-                            bundle.putString(Constants.PRINTER_EMAIL_ADDRESS, SettingScr.this.printerEmailAddress);
-                            bundle.putInt(Constants.PRINTER_LOCATION, SettingScr.this.printerLocation);
-                            bundle.putString(SettingScr.EXTRA_SIMPLEAP, SettingScr.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(SettingScr.EXTRA_SIMPLEAP, autoConnectSsid);
                             intent.putExtras(bundle);
-                            SettingScr.this.startActivityForResult(intent, 0);
-                            SettingScr.this.findViewById(R.id.printer).setClickable(true);
+                            startActivityForResult(intent, 0);
+                            findViewById(R.id.printer).setClickable(true);
                         }
                     }.execute(new Void[0]);
                     return;
@@ -1283,7 +1283,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
     public void showErrorDialog(String str, String str2) {
         new CustomTitleAlertDialogBuilder(this).setCancelable(false).setTitle(str).setMessage(str2).setNegativeButton(getString(R.string.f343ok), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                SettingScr.this.setScreenState(true);
+                setScreenState(true);
                 dialogInterface.cancel();
             }
         }).create().show();

+ 1 - 1
app/src/main/java/epson/print/screen/StringListSelectDialog.java

@@ -34,7 +34,7 @@ public class StringListSelectDialog extends DialogFragment {
                 AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
                 builder.setItems(mStringList, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        StringListSelectDialog.this.itemSelected(i);
+                        itemSelected(i);
                     }
                 });
                 setCancelable(false);

+ 61 - 61
app/src/main/java/epson/print/service/EpsonService.java

@@ -115,29 +115,29 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             synchronized (EpsonService.mLockSearchingStatus) {
                 EpsonService.bNotifyPrinter = false;
             }
-            String unused = EpsonService.this.f406id = str;
-            String unused2 = EpsonService.this.f407ip = str2;
-            int unused3 = EpsonService.this.probeMethod = i;
+            String unused = f406id = str;
+            String unused2 = f407ip = str2;
+            int unused3 = probeMethod = i;
             if  (searchingPrinter != null) {
                 EPLog.d("EpsonService", "searchPrinters() search intterrupt()");
-                EpsonService.this.searchingPrinter.interrupt();
+                searchingPrinter.interrupt();
                 try {
-                    EpsonService.this.searchingPrinter.join();
+                    searchingPrinter.join();
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 }
             }
             EpsonService.access$504(EpsonService.this);
             if  (mSearchCount > 1) {
-                EPLog.e("EpsonService", "search count error! mSearchCount => " + EpsonService.this.mSearchCount);
+                EPLog.e("EpsonService", "search count error! mSearchCount => " + mSearchCount);
             }
             if (!EpsonService.isInitDriver) {
-                EpsonService.this.mEscprLib.release_driver();
+                mEscprLib.release_driver();
                 boolean unused4 = EpsonService.isInitDriver = true;
-                EpsonService.this.mEscprLib.init_driver (getApplicationContext(), ExternalFileUtils.getInstance (getApplicationContext()).getSupportedMediaDir());
+                mEscprLib.init_driver (getApplicationContext(), ExternalFileUtils.getInstance (getApplicationContext()).getSupportedMediaDir());
             }
-            EpsonService.this.createSearchingThread();
-            EpsonService.this.searchingPrinter.start();
+            createSearchingThread();
+            searchingPrinter.start();
             return 0;
         }
 
@@ -147,10 +147,10 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                 EPLog.e("Epson", "cancelSearchPrinter() finish1");
                 return 0;
             }
-            EpsonService.this.searchingPrinter.interrupt();
+            searchingPrinter.interrupt();
             try {
                 EPLog.d("EpsonService", "searchingPrinter.join() enter");
-                EpsonService.this.searchingPrinter.join(1000);
+                searchingPrinter.join(1000);
                 int i = 0;
                 while (true) {
                     if (!Thread.State.RUNNABLE.equals(searchingPrinter.getState())) {
@@ -162,8 +162,8 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                         break;
                     }
                     EPLog.d("EpsonService", "retry doCancelFindPrinter() " + i2);
-                    EpsonService.this.searchingPrinter.interrupt();
-                    EpsonService.this.searchingPrinter.join(1000);
+                    searchingPrinter.interrupt();
+                    searchingPrinter.join(1000);
                     i = i2;
                 }
                 EPLog.d("EpsonService", "searchingPrinter.join() leave");
@@ -176,7 +176,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
 
         public void setTimeOut(int i) throws RemoteException {
             EPLog.d("EpsonService", "timeout = " + i);
-            int unused = EpsonService.this.timeout_sec = i;
+            int unused = timeout_sec = i;
         }
 
         public int setCurPrinter(int i) throws RemoteException {
@@ -186,7 +186,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             EPLog.e("Epson", "Finish cancelSearchPrinter()");
             synchronized (EpsonService.mLock) {
                 EPLog.d("EpsonService", "Start set_printer()");
-                i2 = EpsonService.this.mEscprLib.set_printer(i);
+                i2 = mEscprLib.set_printer(i);
                 EPLog.d("EpsonService", "setCurPrinter: result = " + i2);
             }
             return i2;
@@ -198,36 +198,36 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             EPLog.i("☆☆     isRemotePrinter  " + z2);
             PrintSetting.Kind valueOf = PrintSetting.Kind.valueOf(str);
             if (z2) {
-                int unused = EpsonService.this.createECPrintingThread(valueOf, ePImageList);
+                int unused = createECPrintingThread(valueOf, ePImageList);
                 if  (printingThread != null) {
-                    EpsonService.this.printingThread.start();
+                    printingThread.start();
                 }
                 return 0;
             }
-            EpsonService.this.startLocalNonPdfPrintThread(valueOf, ePImageList, z);
+            startLocalNonPdfPrintThread(valueOf, ePImageList, z);
             return 0;
         }
 
         public int printLocalPdf(String str, String str2, String str3, boolean z, int i, int i2, boolean z2) {
-            EpsonService.this.startPdfPrintThread(str, str2, str3, z, i, i2, z2);
+            startPdfPrintThread(str, str2, str3, z, i, i2, z2);
             return 0;
         }
 
         public int printWithImagesAndLayouts(List<ImageAndLayout> list, boolean z) {
             EpsonService epsonService = EpsonService.this;
             Thread unused = epsonService.printingThread = new PrintAndLayoutThread(epsonService, list, z);
-            EpsonService.this.printingThread.start();
+            printingThread.start();
             return 0;
         }
 
         public int cancelPrint() throws RemoteException {
-            return EpsonService.this.mEscprLib.cancel_print();
+            return mEscprLib.cancel_print();
         }
 
         public int getLang() throws RemoteException {
             int i;
             synchronized (EpsonService.mLock) {
-                i = EpsonService.this.mEscprLib.get_lang();
+                i = mEscprLib.get_lang();
             }
             return i;
         }
@@ -240,7 +240,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                         if (z) {
                             i2 = EpsonConnectGetSupportedMedia(i, str, str2);
                         } else {
-                            i2 = EpsonService.this.mEscprLib.get_supported_media2();
+                            i2 = mEscprLib.get_supported_media2();
                         }
                     }
                 }
@@ -251,7 +251,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         public int[] getPaperSize() throws RemoteException {
             int[] iArr;
             synchronized (EpsonService.mLock) {
-                iArr = EpsonService.this.mEscprLib.get_paper_size();
+                iArr = mEscprLib.get_paper_size();
             }
             return iArr;
         }
@@ -259,7 +259,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         public int[] getPaperType(int i) throws RemoteException {
             int[] iArr;
             synchronized (EpsonService.mLock) {
-                iArr = EpsonService.this.mEscprLib.get_paper_type(i);
+                iArr = mEscprLib.get_paper_type(i);
             }
             return iArr;
         }
@@ -267,7 +267,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         public int[] getLayout(int i, int i2) throws RemoteException {
             int[] iArr;
             synchronized (EpsonService.mLock) {
-                iArr = EpsonService.this.mEscprLib.get_layout(i, i2);
+                iArr = mEscprLib.get_layout(i, i2);
             }
             return iArr;
         }
@@ -275,7 +275,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         public int[] getQuality(int i, int i2) throws RemoteException {
             int[] iArr;
             synchronized (EpsonService.mLock) {
-                iArr = EpsonService.this.mEscprLib.get_quality(i, i2);
+                iArr = mEscprLib.get_quality(i, i2);
             }
             return iArr;
         }
@@ -283,7 +283,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         public int[] getPaperSource(int i, int i2, int i3) throws RemoteException {
             int[] iArr;
             synchronized (EpsonService.mLock) {
-                iArr = EpsonService.this.mEscprLib.get_paper_source(i, i2);
+                iArr = mEscprLib.get_paper_source(i, i2);
             }
             return iArr;
         }
@@ -311,7 +311,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                         iArr[i5] = ((Integer) arrayList.get(i5)).intValue();
                     }
                 } else {
-                    iArr = EpsonService.this.mEscprLib.get_color(i2, i3);
+                    iArr = mEscprLib.get_color(i2, i3);
                 }
             }
             return iArr;
@@ -320,7 +320,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         public int getDuplex(int i, int i2) throws RemoteException {
             int i3;
             synchronized (EpsonService.mLock) {
-                i3 = EpsonService.this.mEscprLib.get_duplex(i, i2);
+                i3 = mEscprLib.get_duplex(i, i2);
             }
             return i3;
         }
@@ -328,7 +328,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         public boolean isPrinting() {
             boolean access$1700;
             synchronized (EpsonService.mLockPrintingStatus) {
-                access$1700 = EpsonService.this.bPrinting;
+                access$1700 = bPrinting;
             }
             return access$1700;
         }
@@ -336,7 +336,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         public boolean isSearchingPrinter() {
             boolean access$1800;
             synchronized (EpsonService.mLockSearchingStatus) {
-                access$1800 = EpsonService.this.bSearching;
+                access$1800 = bSearching;
             }
             return access$1800;
         }
@@ -351,15 +351,15 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                 boolean unused = EpsonService.bCancelPrinting = true;
                 synchronized (EpsonService.mCancelLock) {
                     if  (mEPImageCreator != null) {
-                        EpsonService.this.mEPImageCreator.requestStop();
+                        mEPImageCreator.requestStop();
                     }
                 }
                 if  (bPrinting) {
                     if  (mLocalPrintThread != null) {
-                        EpsonService.this.mLocalPrintThread.interrupt();
+                        mLocalPrintThread.interrupt();
                     }
                     EPLog.e("lam dai hiep", "confirm_cancel: " + z);
-                    EpsonService.this.mEscprLib.confirm_cancel(z);
+                    mEscprLib.confirm_cancel(z);
                 } else if (isSearchingPrinter()) {
                     try {
                         cancelSearchPrinter();
@@ -373,7 +373,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
 
         public int confirmContinueable(boolean z) {
             EPLog.e("LAM DAI HIEP", "confirmContinueable() call: " + z);
-            return EpsonService.this.mEscprLib.confirm_continue(z);
+            return mEscprLib.confirm_continue(z);
         }
 
         public int updatePrinterSettings(String str) {
@@ -828,21 +828,21 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             int i17 = i;
             EPLog.d("EpsonService", "EpsonConnectCreateJob() called.");
             mEcClientLib.resetCancel();
-            EpsonService.this.epsJobattrib.mMediaSizeIdx = i2;
-            EpsonService.this.epsJobattrib.mMediaTypeIdx = i3;
-            EpsonService.this.epsJobattrib.mPrintLayout = i4;
-            EpsonService.this.epsJobattrib.mPrintQuality = i5;
-            EpsonService.this.epsJobattrib.mPaperSource = i6;
+            epsJobattrib.mMediaSizeIdx = i2;
+            epsJobattrib.mMediaTypeIdx = i3;
+            epsJobattrib.mPrintLayout = i4;
+            epsJobattrib.mPrintQuality = i5;
+            epsJobattrib.mPaperSource = i6;
             if (i7 == 1) {
-                EpsonService.this.epsJobattrib.mColorMode = 2;
+                epsJobattrib.mColorMode = 2;
             } else {
-                EpsonService.this.epsJobattrib.mColorMode = 1;
+                epsJobattrib.mColorMode = 1;
             }
-            EpsonService.this.epsJobattrib.mBrightness = i8;
-            EpsonService.this.epsJobattrib.mContrast = i9;
-            EpsonService.this.epsJobattrib.mSaturation = i10;
-            EpsonService.this.epsJobattrib.mPrintDirection = i11;
-            EpsonService.this.epsJobattrib.mDuplex = i12;
+            epsJobattrib.mBrightness = i8;
+            epsJobattrib.mContrast = i9;
+            epsJobattrib.mSaturation = i10;
+            epsJobattrib.mPrintDirection = i11;
+            epsJobattrib.mDuplex = i12;
             int i18 = 0;
             int ensureLogin = ensureLogin(false);
             if (ensureLogin != 0) {
@@ -861,7 +861,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             try {
                 String createJobFileName = EcClientLibUtil.getCreateJobFileName(i, str);
                 try {
-                    ensureLogin = mEcClientLib.CreateJob(i, createJobFileName == null ? i17 != 2 ? "iPrint" : "iPrint Photo" : createJobFileName, i18, EpsonService.this.epsJobattrib, i16, i15);
+                    ensureLogin = mEcClientLib.CreateJob(i, createJobFileName == null ? i17 != 2 ? "iPrint" : "iPrint Photo" : createJobFileName, i18, epsJobattrib, i16, i15);
                     mRemotePrintMaxFileSize = mEcClientLib.mEccJobInfo.mMaxFileSize;
                     return ensureLogin;
                 } catch (NullPointerException e) {
@@ -940,7 +940,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                 }
             } else {
                 mEpsonConnectlogin = false;
-                int Login = mEcClientLib.Login(EcClientLibUtil.quoteForJsonString(str), EcClientLibUtil.quoteForJsonString(str2), EpsonService.this.clientId);
+                int Login = mEcClientLib.Login(EcClientLibUtil.quoteForJsonString(str), EcClientLibUtil.quoteForJsonString(str2), clientId);
                 if (Login != 0) {
                     return Login;
                 }
@@ -1005,12 +1005,12 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         }
 
         public int ensureLogin(boolean z) {
-            EpsonService.this.updateLoginInfo();
+            updateLoginInfo();
             if (z) {
                 mEpsonConnectlogin = false;
             }
             if (!mEpsonConnectlogin) {
-                int Login = mEcClientLib.Login (mailAddress), EcClientLibUtil.quoteForJsonString (accessKey), EpsonService.this.clientId);
+                int Login = mEcClientLib.Login (mailAddress), EcClientLibUtil.quoteForJsonString (accessKey), clientId);
                 if (Login != 0) {
                     return Login;
                 }
@@ -1028,7 +1028,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         }
 
         public void refreshRemotePrinterLogin() {
-            EpsonService.this.updateLoginInfo();
+            updateLoginInfo();
         }
     };
     private int mCreatetSheetIndex = 0;
@@ -1040,19 +1040,19 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             if (i != 30) {
                 switch (i) {
                     case 0:
-                        EpsonService.this.epsNotifyDataChange((String) message.obj);
+                        epsNotifyDataChange((String) message.obj);
                         return true;
                     case 1:
-                        EpsonService.this.epsNotifyContinueable(message.arg1);
+                        epsNotifyContinueable(message.arg1);
                         return true;
                     case 2:
-                        EpsonService.this.epsNotifyError(message.arg1, message.arg2, ((Boolean) message.obj).booleanValue());
+                        epsNotifyError(message.arg1, message.arg2, ((Boolean) message.obj).booleanValue());
                         return true;
                     default:
                         return true;
                 }
             } else {
-                EpsonService.this.epsNotifyPage(message.arg1);
+                epsNotifyPage(message.arg1);
                 return true;
             }
         }
@@ -1323,13 +1323,13 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         }
 
         public void interrupt() {
-            if (mExecuting_search_printer && EpsonService.this.mEscprLib.cancel_search_printer() == -1305) {
+            if (mExecuting_search_printer && mEscprLib.cancel_search_printer() == -1305) {
                 mExecuting_search_printer = false;
-                boolean unused = EpsonService.this.bEnd = true;
+                boolean unused = bEnd = true;
             }
             super.interrupt();
             synchronized (EpsonService.mLockSearchingStatus) {
-                boolean unused2 = EpsonService.this.bSearching = false;
+                boolean unused2 = bSearching = false;
             }
         }
     }

+ 1 - 1
app/src/main/java/epson/print/storage/ConfirmCancelDialog.java

@@ -31,7 +31,7 @@ public class ConfirmCancelDialog extends DialogFragment {
         setCancelable(false);
         return new AlertDialog.Builder(getActivity()).setMessage(i).setPositiveButton((CharSequence) getString(R.string.str_yes), (DialogInterface.OnClickListener) new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                ConfirmCancelDialog.this.doCancel();
+                doCancel();
             }
         }).setNegativeButton((CharSequence) getString(R.string.str_no), (DialogInterface.OnClickListener) new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {

+ 1 - 1
app/src/main/java/epson/print/storage/LocalProgressDialog.java

@@ -48,7 +48,7 @@ public class LocalProgressDialog extends DialogFragment {
         Button button = (Button) inflate.findViewById(R.id.cancelButton);
         button.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                LocalProgressDialog.this.showCancelConfirmDialog();
+                showCancelConfirmDialog();
             }
         });
         button.setText(R.string.str_cancel);

+ 1 - 1
app/src/main/java/epson/print/storage/OneButtonDialogFragment.java

@@ -43,7 +43,7 @@ public class OneButtonDialogFragment extends DialogFragment {
         super.onCreateDialog(bundle);
         return new AlertDialog.Builder(getActivity()).setMessage(mMessageId).setPositiveButton(R.string.str_ok, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                FragmentActivity activity = OneButtonDialogFragment.this.getActivity();
+                FragmentActivity activity = getActivity();
                 if (activity != null) {
                     ((DialogCallback) activity).buttonPressed(OneButtonDialogFragment.mDialogId);
                 }

+ 9 - 9
app/src/main/java/epson/print/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/epson/print/storage/StorageSecureStore.java

@@ -230,7 +230,7 @@ public class StorageSecureStore {
                 for (int i = 0; i < cursor.getCount(); i++) {
                     cursor.moveToPosition(i);
                     String string = cursor.getString(0);
-                    byte[] decodeAes = StorageSecureStore.this.decodeAes(cursor.getBlob(1), mSecretText);
+                    byte[] decodeAes = decodeAes(cursor.getBlob(1), mSecretText);
                     if (decodeAes != null) {
                         hashMap.put(string, new String(decodeAes));
                     }

+ 2 - 2
app/src/main/java/epson/print/storage/dropbox/DropboxV2SignInActivity.java

@@ -40,9 +40,9 @@ public class DropboxV2SignInActivity extends StorageSignInActivity {
 
         protected void onPostExecute(Boolean bool) {
             if (bool == null || !bool.booleanValue()) {
-                DropboxV2SignInActivity.this.showLoginErrorAndFinish();
+                showLoginErrorAndFinish();
             } else {
-                DropboxV2SignInActivity.this.finish();
+                finish();
             }
         }
 

+ 13 - 13
app/src/main/java/epson/print/storage/evernote/EvernoteClient.java

@@ -62,16 +62,16 @@ public class EvernoteClient extends StorageServiceClient {
                     StorageServiceClient.ProcessError processError2 = StorageServiceClient.ProcessError.NONE;
                     do {
                         try {
-                            StorageItem uploadFolder = C09441.this.request.getUploadFolder();
+                            StorageItem uploadFolder = request.getUploadFolder();
                             if (uploadFolder == null) {
-                                uploadFolder = C09441.this.request.newUploadFolder();
+                                uploadFolder = request.newUploadFolder();
                             }
-                            processError = C09441.this.uploader.upload(uploadFolder, str, str2);
+                            processError = uploader.upload(uploadFolder, str, str2);
                         } catch (Exception e) {
-                            processError = C09441.this.request.handleException(e);
+                            processError = request.handleException(e);
                         }
                     } while (StorageServiceClient.ProcessError.RETRY.equals(processError));
-                    C09441.this.uploaded.onUploadComplete(str, str2, processError);
+                    uploaded.onUploadComplete(str, str2, processError);
                     return null;
                 }
             }
@@ -107,12 +107,12 @@ public class EvernoteClient extends StorageServiceClient {
                     StorageServiceClient.ProcessError processError2 = StorageServiceClient.ProcessError.NONE;
                     do {
                         try {
-                            processError = C09452.this.downloader.download(storageItem.path, str);
+                            processError = downloader.download(storageItem.path, str);
                         } catch (Exception e) {
-                            processError = C09452.this.request.handleException(e);
+                            processError = request.handleException(e);
                         }
                     } while (StorageServiceClient.ProcessError.RETRY.equals(processError));
-                    C09452.this.downloaded.onDownloadComplete(storageItem, str, processError);
+                    downloaded.onDownloadComplete(storageItem, str, processError);
                     return null;
                 }
             }
@@ -136,7 +136,7 @@ public class EvernoteClient extends StorageServiceClient {
             private List<StorageItem> getPrintableItems(List<StorageItem> list) {
                 ArrayList arrayList = new ArrayList();
                 for (StorageItem next : list) {
-                    if (next.type != StorageItem.ItemType.FILE || EvernoteClient.this.isPrintableFileTypes(next)) {
+                    if (next.type != StorageItem.ItemType.FILE || isPrintableFileTypes(next)) {
                         arrayList.add(next);
                     }
                 }
@@ -156,17 +156,17 @@ public class EvernoteClient extends StorageServiceClient {
                     do {
                         try {
                             processError = StorageServiceClient.ProcessError.NONE;
-                            list = C09463.this.request.getItemList(storageItem);
+                            list = request.getItemList(storageItem);
                         } catch (Exception e) {
-                            processError = C09463.this.request.handleException(e);
+                            processError = request.handleException(e);
                         }
                     } while (StorageServiceClient.ProcessError.RETRY.equals(processError));
                     if (list != null) {
-                        list = C09463.this.getPrintableItems(list);
+                        list = getPrintableItems(list);
                     } else {
                         processError = StorageServiceClient.ProcessError.ERROR;
                     }
-                    C09463.this.enumerated.onEnumerateComplete(list, processError);
+                    enumerated.onEnumerateComplete(list, processError);
                     return null;
                 }
             }

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