liuyuqi-dellpc 3 years ago
parent
commit
f9a48d35d6
39 changed files with 231 additions and 231 deletions
  1. 1 1
      app/src/main/java/com/epson/iprint/storage/OneButtonDialogFragment.java
  2. 1 1
      app/src/main/java/com/epson/iprint/storage/dropbox/DropboxV2SignInActivity.java
  3. 2 2
      app/src/main/java/com/epson/iprint/storage/evernote/EvernoteRequest.java
  4. 3 3
      app/src/main/java/com/epson/iprint/storage/onedrive/OneDriveClient.java
  5. 1 1
      app/src/main/java/com/epson/memcardacc/ConfirmWriteMemcard.java
  6. 1 1
      app/src/main/java/com/epson/memcardacc/MemcardImageGrid.java
  7. 5 5
      app/src/main/java/com/epson/memcardacc/MemcardReadProgress.java
  8. 2 2
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ManageDefaultNetwork.java
  9. 8 8
      app/src/main/java/com/epson/mobilephone/common/wifidirect/SearchWiFiDirectPrinterTask.java
  10. 3 3
      app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiScanner.java
  11. 2 2
      app/src/main/java/epson/maintain/activity/MaintainActivity.java
  12. 10 10
      app/src/main/java/epson/print/ActivityPrintWeb.java
  13. 2 2
      app/src/main/java/epson/print/copy/Component/ecopycomponent/ECopyPreview.java
  14. 1 1
      app/src/main/java/epson/print/copy/Component/ecopycomponent/PreviewScanTask.java
  15. 1 1
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyPhotoTask.java
  16. 1 1
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopySetOptionTask.java
  17. 24 24
      app/src/main/java/epson/print/copy/CopyScaleActivity.java
  18. 3 3
      app/src/main/java/epson/print/copy/CopySettingActivity.java
  19. 6 6
      app/src/main/java/epson/print/fileBrower.java
  20. 1 1
      app/src/main/java/epson/print/pdf/pdfRender.java
  21. 2 2
      app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/RemoteCopySetOptionTask.java
  22. 23 23
      app/src/main/java/epson/print/rpcopy/CopyActivity.java
  23. 3 3
      app/src/main/java/epson/print/rpcopy/CopySettingActivity.java
  24. 5 5
      app/src/main/java/epson/print/screen/ActivityPrinterSetting.java
  25. 8 8
      app/src/main/java/epson/print/screen/PageRangeSetting.java
  26. 1 1
      app/src/main/java/epson/print/screen/PrintProgress.java
  27. 15 15
      app/src/main/java/epson/print/screen/PrinterFinder.java
  28. 23 23
      app/src/main/java/epson/print/screen/SearchPrinterScr.java
  29. 3 3
      app/src/main/java/epson/print/screen/SettingScr.java
  30. 13 13
      app/src/main/java/epson/print/service/EpsonService.java
  31. 1 1
      app/src/main/java/epson/print/storage/dropbox/DropboxV2SignInActivity.java
  32. 1 1
      app/src/main/java/epson/print/storage/onedrive/OneDriveClient.java
  33. 1 1
      app/src/main/java/epson/print/widgets/AbstractListBuilder.java
  34. 6 6
      app/src/main/java/epson/scan/activity/InputUnitSettingActivity.java
  35. 19 19
      app/src/main/java/epson/scan/activity/ScanBaseView.java
  36. 7 7
      app/src/main/java/epson/scan/activity/ScanSearchActivity.java
  37. 9 9
      app/src/main/java/epson/scan/activity/ScanSettingsActivity.java
  38. 2 2
      app/src/main/java/epson/scan/activity/ScanSettingsAdvanceDetailActivity.java
  39. 11 11
      app/src/main/java/epson/server/screens/StorageServer.java

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

@@ -41,7 +41,7 @@ public class OneButtonDialogFragment extends DialogFragment {
             public void onClick(DialogInterface dialogInterface, int i) {
                 FragmentActivity activity = OneButtonDialogFragment.this.getActivity();
                 if (activity != null) {
-                    ((DialogCallback) activity).buttonPressed(OneButtonDialogFragment.this.mDialogId);
+                    ((DialogCallback) activity).buttonPressed (mDialogId);
                 }
             }
         }).setCancelable(false).create();

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

@@ -47,7 +47,7 @@ public class DropboxV2SignInActivity extends StorageSignInActivity {
         }
 
         protected Boolean doInBackground(Void... voidArr) {
-            DropboxV2Adapter.getTokenAndInitClient(DropboxV2SignInActivity.this.getApplicationContext());
+            DropboxV2Adapter.getTokenAndInitClient (getApplicationContext());
             DbxClientV2 client = DropboxV2Adapter.getClient();
             if (client == null) {
                 return false;

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

@@ -138,7 +138,7 @@ public class EvernoteRequest {
         }
 
         private StorageServiceClient.ProcessError upload(StorageItem storageItem, String str, String str2) throws FileNotFoundException, NoSuchAlgorithmException, TException, EDAMUserException, EDAMSystemException, EDAMNotFoundException {
-            EvernoteSession evernoteSession = EvernoteClient.getEvernoteSession(EvernoteRequest.this.mContext);
+            EvernoteSession evernoteSession = EvernoteClient.getEvernoteSession (mContext);
             File file = new File(str);
             Resource resource = new Resource();
             resource.setData(EvernoteRequest.readFileAsData(file.getAbsolutePath()));
@@ -174,7 +174,7 @@ public class EvernoteRequest {
         }
 
         private StorageServiceClient.ProcessError download(String str, String str2) throws TException, EDAMUserException, EDAMSystemException, EDAMNotFoundException, IOException {
-            Resource resource = EvernoteClient.getEvernoteSession(EvernoteRequest.this.mContext).getEvernoteClientFactory().getNoteStoreClient().getResource(str, true, false, true, false);
+            Resource resource = EvernoteClient.getEvernoteSession (mContext).getEvernoteClientFactory().getNoteStoreClient().getResource(str, true, false, true, false);
             resource.getAttributes().getFileName();
             Data data = resource.getData();
             FileOutputStream fileOutputStream = new FileOutputStream(new File(str2));

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

@@ -546,7 +546,7 @@ public class OneDriveClient extends StorageServiceClient {
                         inputStream = null;
                     }
                 }
-                String access$1600 = bConvertPdf ? getConvertPdfName(OneDriveDownloader.this.mWriteFilename) : OneDriveDownloader.this.mWriteFilename;
+                String access$1600 = bConvertPdf ? getConvertPdfName (mWriteFilename) : OneDriveDownloader.this.mWriteFilename;
                 if (inputStream != null && !this.bCanceled) {
                     try {
                         File file = new File(access$1600);
@@ -576,7 +576,7 @@ public class OneDriveClient extends StorageServiceClient {
                     }
                 }
                 closeStream();
-                downloaded.onDownloadComplete(OneDriveDownloader.this.mStorageItem, access$1600, z ? StorageServiceClient.ProcessError.NONE : bCanceled ? StorageServiceClient.ProcessError.CANCELED : StorageServiceClient.ProcessError.ERROR);
+                downloaded.onDownloadComplete (mStorageItem, access$1600, z ? StorageServiceClient.ProcessError.NONE : bCanceled ? StorageServiceClient.ProcessError.CANCELED : StorageServiceClient.ProcessError.ERROR);
             }
 
             private void closeStream() {
@@ -691,7 +691,7 @@ public class OneDriveClient extends StorageServiceClient {
                     }
 
                     public void progress(long j, long j2) {
-                        if (LocalUploader.this.bCanceled) {
+                        if  (bCanceled) {
                             LocalUploader.this.uploadcancel();
                         }
                     }

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

@@ -194,7 +194,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         if (str != null && mCopyTargetFolderName != null) {
             runOnUiThread(new Runnable() {
                 public void run() {
-                    ConfirmWriteMemcard.mCopyTargetPathText.setText(String.format(ConfirmWriteMemcard.this.getResources().getString(R.string.memcard_folder_save_to_format), new Object[]{ConfirmWriteMemcard.mCopyTargetFolderName}));
+                    ConfirmWriteMemcard.mCopyTargetPathText.setText(String.format(getResources().getString(R.string.memcard_folder_save_to_format), new Object[]{ConfirmWriteMemcard.mCopyTargetFolderName}));
                 }
             });
         }

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

@@ -627,7 +627,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
                 }
                 EPLog.i(MemcardImageGrid.LOG_TAG, "doInBackground() disconnectStorage()");
                 MemcardImageGrid.mCifsAccess.disconnectStorage();
-                if (MemcardImageGrid.this.discconectOnThreadFinish) {
+                if  (discconectOnThreadFinish) {
                     EPLog.d(MemcardImageGrid.LOG_TAG, "disconnectOnThreadFinish");
                     WiFiDirectManager.disconnect(MemcardImageGrid.this, WiFiDirectManager.DEVICE_TYPE_PRINTER, MemcardUtil.getPrinterIpAddress(MemcardImageGrid.this));
                 }

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

@@ -109,23 +109,23 @@ public class MemcardReadProgress extends Activity {
             CommonLog commonLog = mCommonLog;
             commonLog.numberOfSheet = 0;
             commonLog.action = 8194;
-            commonLog.printerName = Analytics.getDefaultPrinterName(MemcardReadProgress.this.getApplicationContext());
+            commonLog.printerName = Analytics.getDefaultPrinterName (getApplicationContext());
         }
 
         protected void onCancelled() {
-            MemcardUtil.clearKeepScreenOn(MemcardReadProgress.this.getWindow());
+            MemcardUtil.clearKeepScreenOn (getWindow());
             EPLog.i(MemcardReadProgress.LOG_TAG, "canceld in AsyncTask");
             MemcardReadProgress.this.finishWithState(0, mCommonLog);
         }
 
         protected void onPostExecute(Integer num) {
-            MemcardUtil.clearKeepScreenOn(MemcardReadProgress.this.getWindow());
+            MemcardUtil.clearKeepScreenOn (getWindow());
             MemcardReadProgress.this.finishWithState(num.intValue(), mCommonLog);
         }
 
         protected void onPreExecute() {
             mCanceling = false;
-            MemcardUtil.keepScreenOn(MemcardReadProgress.this.getWindow());
+            MemcardUtil.keepScreenOn (getWindow());
             MemcardReadProgress memcardReadProgress = MemcardReadProgress.this;
             memcardReadProgress.setProgress(0, memcardReadProgress.mImageList.size());
         }
@@ -145,7 +145,7 @@ public class MemcardReadProgress extends Activity {
                 }
                 int copyFile = copyFile();
                 cifsAccess.disconnectStorage();
-                mCommonLog.setConnectionType(MemcardReadProgress.this.getApplicationContext());
+                mCommonLog.setConnectionType (getApplicationContext());
                 Integer valueOf = Integer.valueOf(copyFile);
                 cifsAccess.free();
                 return valueOf;

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

@@ -82,7 +82,7 @@ public class ManageDefaultNetwork {
                             EPLog.e(ManageDefaultNetwork.TAG, "HttpURLConnection failed");
                             ManageDefaultNetwork.this.canConnected = false;
                         }
-                        synchronized (ManageDefaultNetwork.this.lock) {
+                        synchronized  (lock) {
                             try {
                                 ManageDefaultNetwork.this.lock.notifyAll();
                             } catch (IllegalMonitorStateException e) {
@@ -211,7 +211,7 @@ public class ManageDefaultNetwork {
                         EPLog.d(ManageDefaultNetwork.TAG, "setProcessDefaultNetwork");
                     }
                 }
-            } else if (ManageDefaultNetwork.this.connectivityManager.getBoundNetworkForProcess() == null && ManageDefaultNetwork.this.connectivityManager.bindProcessToNetwork(network)) {
+            } else if  (connectivityManager.getBoundNetworkForProcess() == null && ManageDefaultNetwork.this.connectivityManager.bindProcessToNetwork(network)) {
                 EPLog.d(ManageDefaultNetwork.TAG, "bindProcessToNetwork");
             }
         }

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

@@ -56,13 +56,13 @@ public class SearchWiFiDirectPrinterTask {
     Handler searchHandler = new Handler(new Handler.Callback() {
         public boolean handleMessage(Message message) {
             if (message.what == 0) {
-                WifiP2pUtils.ConnectionInfo connectionInfo = WifiP2pUtils.getInstance(SearchWiFiDirectPrinterTask.this.context).getConnectionInfo();
+                WifiP2pUtils.ConnectionInfo connectionInfo = WifiP2pUtils.getInstance (context).getConnectionInfo();
                 if (connectionInfo != null) {
-                    if (MacAddrFilter.getInstance(SearchWiFiDirectPrinterTask.this.context).isExcludedMacAddress(WiFiControl.p2pAddr2PtrAddr(connectionInfo.p2PMacAdder, connectionInfo.printerName))) {
+                    if  (context).isExcludedMacAddress(WiFiControl.p2pAddr2PtrAddr(connectionInfo.p2PMacAdder, connectionInfo.printerName))) {
                         SearchWiFiDirectPrinterTask.this.bDisConnectP2P = true;
                     }
                 }
-                SearchWiFiDirectPrinterTask.mWiFiP2PManager.discoverPeers(SearchWiFiDirectPrinterTask.this.p2pChannnel, new WifiP2pManager.ActionListener() {
+                SearchWiFiDirectPrinterTask.mWiFiP2PManager.discoverPeers (p2pChannnel, new WifiP2pManager.ActionListener() {
                     public void onSuccess() {
                         EPLog.d(SearchWiFiDirectPrinterTask.TAG, "discoverPeers Start");
                         SearchWiFiDirectPrinterTask.this.serarchingStatus |= 2;
@@ -78,9 +78,9 @@ public class SearchWiFiDirectPrinterTask {
                                 break;
                             case 2:
                                 EPLog.w(SearchWiFiDirectPrinterTask.TAG, "P2P_Operation BUSY");
-                                if  (!bDisConnectP2P && WifiP2pUtils.getInstance(SearchWiFiDirectPrinterTask.this.context).isConnectedWiFiP2P()) {
+                                if  (!bDisConnectP2P && WifiP2pUtils.getInstance (context).isConnectedWiFiP2P()) {
                                     EPLog.w(SearchWiFiDirectPrinterTask.TAG, "Disconnect P2P and And Retry");
-                                    WifiP2pUtils.getInstance(SearchWiFiDirectPrinterTask.this.context).disconnect();
+                                    WifiP2pUtils.getInstance (context).disconnect();
                                     SearchWiFiDirectPrinterTask.this.bDisConnectP2P = true;
                                     SearchWiFiDirectPrinterTask.this.searchHandler.sendEmptyMessageDelayed(0, 1000);
                                     return;
@@ -89,8 +89,8 @@ public class SearchWiFiDirectPrinterTask {
                                 EPLog.w(SearchWiFiDirectPrinterTask.TAG, "P2P_Operation Fail");
                                 break;
                         }
-                        if (SearchWiFiDirectPrinterTask.this.serarchingStatus == 0) {
-                            SearchWiFiDirectPrinterTask.mHandler.sendEmptyMessage(SearchWiFiDirectPrinterTask.this.idResult);
+                        if  (serarchingStatus == 0) {
+                            SearchWiFiDirectPrinterTask.mHandler.sendEmptyMessage (idResult);
                         }
                     }
                 });
@@ -350,7 +350,7 @@ public class SearchWiFiDirectPrinterTask {
 
                 protected void onPostExecute(Void voidR) {
                     EPLog.i(SearchWiFiDirectPrinterTask.TAG, "Timeout ScanningObserver");
-                    SearchWiFiDirectPrinterTask.mHandler.sendEmptyMessage(SearchWiFiDirectPrinterTask.this.idResult);
+                    SearchWiFiDirectPrinterTask.mHandler.sendEmptyMessage (idResult);
                     SearchWiFiDirectPrinterTask.this.interrupt();
                 }
             }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);

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

@@ -27,10 +27,10 @@ public class WiFiScanner {
             wifiScannerHandler.postDelayed(new Runnable() {
                 public void run() {
                     WifiManager wifiManager = (WifiManager) WiFiScanner.this.refWiFiManager.get();
-                    if (WiFiScanner.this.refWiFiManager != null) {
-                        EPLog.d(WiFiScanner.this.TAG, "Started Delayed startScan()");
+                    if  (refWiFiManager != null) {
+                        EPLog.d (TAG, "Started Delayed startScan()");
                         if (!wifiManager.startScan()) {
-                            EPLog.e(WiFiScanner.this.TAG, "Failed Delayed startScan()");
+                            EPLog.e (TAG, "Failed Delayed startScan()");
                         }
                     }
                 }

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

@@ -242,8 +242,8 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                     MaintainActivity.this.handlerError(message.getData().getInt(MaintainActivity.PROBE_RESULT), true);
                     break;
                 case 8:
-                    MaintainActivity.mTvPrinterName.setText(MaintainActivity.this.printerName);
-                    switch (MaintainActivity.this.printerLocation) {
+                    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);

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

@@ -185,7 +185,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                                     }
                                     ePImage.isPaperLandScape = ActivityPrintWeb.mPreviewPaperAreaLandscape;
                                     EPImage ePImage2 = ActivityPrintWeb.this.imageList.get(i2);
-                                    if (ActivityPrintWeb.this.fromActivity == 1) {
+                                    if  (fromActivity == 1) {
                                         ePImage2.setType(4098);
                                     } else {
                                         ePImage2.setType(4097);
@@ -193,7 +193,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                                     ePImageList.add(ePImage2);
                                 }
                                 sharedPreferences.edit();
-                                if (ActivityPrintWeb.this.isRemotePrinter) {
+                                if  (isRemotePrinter) {
                                     SharedPreferences.Editor edit = ActivityPrintWeb.this.getSharedPreferences("PrintSetting", 0).edit();
                                     edit.putInt(Constants.SOURCE_TYPE, 3);
                                     edit.commit();
@@ -220,7 +220,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                                                 if (ActivityPrintWeb.mEpsonService == null) {
                                                     return null;
                                                 }
-                                                if (ActivityPrintWeb.this.isRemotePrinter) {
+                                                if  (isRemotePrinter) {
                                                     ActivityPrintWeb.mEpsonService.EpsonConnectUpdatePrinterSettings(PrintSetting.Kind.document.name());
                                                     return null;
                                                 }
@@ -239,7 +239,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                                             if (progress.isShowing()) {
                                                 progress.dismiss();
                                             }
-                                            if (ActivityPrintWeb.this.bAutoStartPrint) {
+                                            if  (bAutoStartPrint) {
                                                 ActivityPrintWeb.this.onClick(ActivityPrintWeb.mPrint);
                                                 EPLog.d(ActivityPrintWeb.TAG, "onClick(mPrint)");
                                                 ActivityPrintWeb.this.bAutoStartPrint = false;
@@ -258,19 +258,19 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                 }
             } else {
                 ArrayList unused2 = ActivityPrintWeb.this.aPaperSourceSetting = message.getData().getParcelableArrayList(PaperSourceInfo.KEY_PAPERSOURCEINFO);
-                if (ActivityPrintWeb.this.aPaperSourceSetting != null) {
-                    ActivityPrintWeb.mSizeInfo.setBackgroundColor(ActivityPrintWeb.this.getResources().getColor(R.color.epson_blue));
-                    ActivityPrintWeb.mSizeInfo.setTextColor(ActivityPrintWeb.this.getResources().getColor(R.color.all_white));
+                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 (ActivityPrintWeb.this.paperSourceInfo.checkPaperMissmatch(printSetting, ActivityPrintWeb.this.aPaperSourceSetting)) {
+                    if  (paperSourceInfo.checkPaperMissmatch(printSetting, ActivityPrintWeb.this.aPaperSourceSetting)) {
                         ActivityPrintWeb.this.paperMissmath.setVisibility(View.VISIBLE);
                     } else {
                         ActivityPrintWeb.this.paperMissmath.setVisibility(View.GONE);
                     }
                 } else {
-                    ActivityPrintWeb.mSizeInfo.setBackground(ActivityPrintWeb.this.getResources().getDrawable(R.drawable.text_view_boder));
-                    ActivityPrintWeb.mSizeInfo.setTextColor(ActivityPrintWeb.this.getResources().getColor(R.color.epson_blue));
+                    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);
                 }
             }

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

@@ -349,7 +349,7 @@ public class ECopyPreview extends View {
         LayoutStandard(int i, int i2) {
             layoutWidth = i;
             layoutHeight = i2;
-            if (ECopyPreview.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XScale).getSelectedChoice() == ECopyOptionItem.ECopyOptionItemChoice.XScale_Autofit) {
+            if  (optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XScale).getSelectedChoice() == ECopyOptionItem.ECopyOptionItemChoice.XScale_Autofit) {
                 autofitEnabled = true;
             }
             ECopyOptionItem copyOptionItemOf = ECopyPreview.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSize);
@@ -426,7 +426,7 @@ public class ECopyPreview extends View {
         }
 
         private float getScanImageScale(int i, int i2) {
-            imageScale = getAspectFitScale((float) ((ECopyPreview.this.drawSize.width - ECopyPreview.this.paperPadding.left) - ECopyPreview.this.paperPadding.right), (float) ((ECopyPreview.this.drawSize.height - ECopyPreview.this.paperPadding.top) - ECopyPreview.this.paperPadding.bottom), (float) i, (float) i2, Layout.AspectFit.Min);
+            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);
             return imageScale;
         }
 

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

@@ -150,7 +150,7 @@ class PreviewScanTask extends AsyncTask<Void, Void, Void> implements IScanContro
                         PreviewScanTask.this.previewScanBitmap.eraseColor(-1);
                         return;
                     case 4:
-                        PreviewScanTask.this.copyPreview.drawScanPreview(PreviewScanTask.this.previewScanBitmap);
+                        PreviewScanTask.this.copyPreview.drawScanPreview (previewScanBitmap);
                         return;
                     default:
                         return;

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

@@ -265,7 +265,7 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
             }
 
             public ERemoteOperation.ERemoteParam print_x_bleed() {
-                if (RemoteCopyPhotoTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XBorderless).getSelectedChoice().param == ERemoteOperation.ERemoteParam.standard) {
+                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;

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

@@ -230,7 +230,7 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
             }
 
             public ERemoteOperation.ERemoteParam layout() {
-                return ECopyOptionItem.layoutOf(RemoteCopySetOptionTask.this.optionContext.getCopyType());
+                return ECopyOptionItem.layoutOf (optionContext.getCopyType());
             }
 
             public ERemoteOperation.ERemoteParam scan_sides() {

+ 24 - 24
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(XScaleValue.this.selected);
-                    if (XScaleValue.this.changedListener != null) {
-                        XScaleValue.this.changedListener.onOptionItemChanged(XScaleValue.this.optionItem);
+                    XScaleValue.this.optionItem.selectChoice (selected);
+                    if  (changedListener != null) {
+                        XScaleValue.this.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(XScaleValue.this.selected);
-                    if (XScaleValue.this.changedListener != null) {
-                        XScaleValue.this.changedListener.onOptionItemChanged(XScaleValue.this.optionItem);
+                    XScaleValue.this.optionItem.selectChoice (selected);
+                    if  (changedListener != null) {
+                        XScaleValue.this.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(XScaleValue.this.selected);
-                    if (XScaleValue.this.changedListener != null) {
-                        XScaleValue.this.changedListener.onOptionItemChanged(XScaleValue.this.optionItem);
+                    XScaleValue.this.optionItem.selectChoice (selected);
+                    if  (changedListener != null) {
+                        XScaleValue.this.changedListener.onOptionItemChanged (optionItem);
                     }
                     isKeepSimpleAPConnection = true;
                     finish();
@@ -225,26 +225,26 @@ public class CopyScaleActivity extends ActivityBase {
                     CopyMagnificationValue.this.editText = (TextView) inflate.findViewById(R.id.SettingCopyMagnification);
                     CopyMagnificationValue copyMagnificationValue = CopyMagnificationValue.this;
                     copyMagnificationValue.value = copyMagnificationValue.optionItem.getSelectedValue();
-                    if (CopyMagnificationValue.this.value == ECopyOptionItem.CopyMagnificationAutofitValue) {
+                    if  (value == ECopyOptionItem.CopyMagnificationAutofitValue) {
                         CopyMagnificationValue.this.value = 100;
                     }
-                    CopyMagnificationValue.this.editText.setText(String.valueOf(CopyMagnificationValue.this.value));
+                    CopyMagnificationValue.this.editText.setText (value));
                     CopyMagnificationValue.this.countUp = (Button) inflate.findViewById(R.id.SettingButonCopyMagnificationCountUp);
                     CopyMagnificationValue.this.countUp.setOnClickListener(new CountCustomScale(1));
-                    if (CopyMagnificationValue.this.value == CopyMagnificationValue.this.optionItem.getMaximumValue()) {
+                    if  (value == CopyMagnificationValue.this.optionItem.getMaximumValue()) {
                         CopyMagnificationValue.this.countUp.setEnabled(false);
                     } else {
                         CopyMagnificationValue.this.countUp.setEnabled(true);
                     }
-                    LongTapRepeatAdapter.bless(CopyMagnificationValue.this.countUp);
+                    LongTapRepeatAdapter.bless (countUp);
                     CopyMagnificationValue.this.countDown = (Button) inflate.findViewById(R.id.SettingButonCopyMagnificationCountDown);
                     CopyMagnificationValue.this.countDown.setOnClickListener(new CountCustomScale(-1));
-                    if (CopyMagnificationValue.this.value == CopyMagnificationValue.this.optionItem.getMinimumValue()) {
+                    if  (value == CopyMagnificationValue.this.optionItem.getMinimumValue()) {
                         CopyMagnificationValue.this.countDown.setEnabled(false);
                     } else {
                         CopyMagnificationValue.this.countDown.setEnabled(true);
                     }
-                    LongTapRepeatAdapter.bless(CopyMagnificationValue.this.countDown);
+                    LongTapRepeatAdapter.bless (countDown);
                     AlertDialog.Builder builder = new AlertDialog.Builder(CopyScaleActivity.this);
                     builder.setTitle(R.string.XScale_Custom);
                     builder.setView(inflate);
@@ -252,12 +252,12 @@ public class CopyScaleActivity extends ActivityBase {
                         public void onClick(DialogInterface dialogInterface, int i) {
                             ActivityBase.ListOptionValue listOptionValue = (ActivityBase.ListOptionValue) optionValueMap.get(ECopyOptionItem.ECopyOptionItemKey.XScale);
                             listOptionValue.optionItem.selectChoice(ECopyOptionItem.ECopyOptionItemChoice.XScale_Custom);
-                            if (CopyMagnificationValue.this.changedListener != null) {
+                            if  (changedListener != null) {
                                 CopyMagnificationValue.this.changedListener.onOptionItemChanged(listOptionValue.optionItem);
                             }
-                            CopyMagnificationValue.this.optionItem.selectValue(Integer.parseInt(CopyMagnificationValue.this.editText.getText().toString()));
-                            if (CopyMagnificationValue.this.changedListener != null) {
-                                CopyMagnificationValue.this.changedListener.onOptionItemChanged(CopyMagnificationValue.this.optionItem);
+                            CopyMagnificationValue.this.optionItem.selectValue (editText.getText().toString()));
+                            if  (changedListener != null) {
+                                CopyMagnificationValue.this.changedListener.onOptionItemChanged (optionItem);
                             }
                             isKeepSimpleAPConnection = true;
                             CopyMagnificationValue.this.onDismissDialog();
@@ -289,17 +289,17 @@ public class CopyScaleActivity extends ActivityBase {
 
             public void onClick(View view) {
                 try {
-                    CopyMagnificationValue.this.value = Integer.valueOf(CopyMagnificationValue.this.editText.getText().toString()).intValue();
-                    CopyMagnificationValue.this.value = Math.min(Math.max(CopyMagnificationValue.this.optionItem.getMinimumValue(), CopyMagnificationValue.this.value + amount), CopyMagnificationValue.this.optionItem.getMaximumValue());
+                    CopyMagnificationValue.this.value = Integer.valueOf (editText.getText().toString()).intValue();
+                    CopyMagnificationValue.this.value = Math.min (optionItem.getMinimumValue(), CopyMagnificationValue.this.value + amount), CopyMagnificationValue.this.optionItem.getMaximumValue());
                 } catch (NumberFormatException unused) {
                 }
-                CopyMagnificationValue.this.editText.setText(String.valueOf(CopyMagnificationValue.this.value));
-                if (CopyMagnificationValue.this.value >= CopyMagnificationValue.this.optionItem.getMaximumValue()) {
+                CopyMagnificationValue.this.editText.setText (value));
+                if  (value >= CopyMagnificationValue.this.optionItem.getMaximumValue()) {
                     CopyMagnificationValue.this.countUp.setEnabled(false);
                 } else {
                     CopyMagnificationValue.this.countUp.setEnabled(true);
                 }
-                if (CopyMagnificationValue.this.value <= CopyMagnificationValue.this.optionItem.getMinimumValue()) {
+                if  (value <= CopyMagnificationValue.this.optionItem.getMinimumValue()) {
                     CopyMagnificationValue.this.countDown.setEnabled(false);
                 } else {
                     CopyMagnificationValue.this.countDown.setEnabled(true);

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

@@ -79,7 +79,7 @@ public class CopySettingActivity extends ActivityBase {
             super();
             bindOption(eCopyOptionItem);
             capabilitySetting(eCopyOptionItem, CopySettingActivity.this);
-            setOptionValueChangedListener(CopySettingActivity.this.optionValueChangedListener);
+            setOptionValueChangedListener (optionValueChangedListener);
         }
 
         private SettingAdapter getArrayAdapter(OthersettingValue othersettingValue, Context context) {
@@ -92,8 +92,8 @@ public class CopySettingActivity extends ActivityBase {
                 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));
-                    if (OthersettingValue.this.changedListener != null) {
-                        OthersettingValue.this.changedListener.onOptionItemChanged(OthersettingValue.this.optionItem);
+                    if  (changedListener != null) {
+                        OthersettingValue.this.changedListener.onOptionItemChanged (optionItem);
                     }
                     CopySettingActivity.this.isKeepSimpleAPConnection = true;
                 }

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

@@ -185,7 +185,7 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         String trim = editText.getText().toString().trim();
                         if (trim == null || trim.length() <= 0) {
-                            Toast.makeText(fileBrower.this.getApplicationContext(), R.string.str_error_Filename, 1).show();
+                            Toast.makeText (getApplicationContext(), R.string.str_error_Filename, 1).show();
                             return;
                         }
                         try {
@@ -194,18 +194,18 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
                             }
                             File file = new File(file3.getParent() + CommonDefine.SLASH + trim);
                             if (!fileBrower.isAvailableFileName(trim)) {
-                                Toast.makeText(fileBrower.this.getApplicationContext(), R.string.str_error_Filename, 1).show();
+                                Toast.makeText (getApplicationContext(), R.string.str_error_Filename, 1).show();
                             } else if (file.exists()) {
                                 if (!file3.getPath().equals(file.getPath())) {
-                                    Toast.makeText(fileBrower.this.getApplicationContext(), R.string.str_error_Filename, 1).show();
+                                    Toast.makeText (getApplicationContext(), R.string.str_error_Filename, 1).show();
                                 }
                             } else if (file3.renameTo(file)) {
                                 fileBrower.this.browseTo(file4);
                             } else {
-                                Toast.makeText(fileBrower.this.getApplicationContext(), R.string.str_error_Filename, 1).show();
+                                Toast.makeText (getApplicationContext(), R.string.str_error_Filename, 1).show();
                             }
                         } catch (Exception unused) {
-                            Toast.makeText(fileBrower.this.getApplicationContext(), R.string.error, 1).show();
+                            Toast.makeText (getApplicationContext(), R.string.error, 1).show();
                         }
                     }
                 });
@@ -255,7 +255,7 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
         C22398 r3 = new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 String obj = editText.getText().toString();
-                if (fileBrower.this.isNameFolder(obj)) {
+                if  (isNameFolder(obj)) {
                     File file = new File(absolutePath + CommonDefine.SLASH + obj);
                     Log.v("create file", absolutePath + CommonDefine.SLASH + obj);
                     if (!file.exists()) {

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

@@ -56,7 +56,7 @@ public class pdfRender implements CommonDefine {
             backgroundThread = new Thread(new Runnable() {
                 public void run() {
                     try {
-                        if (pdfRender.this.mPdfFile != null) {
+                        if  (mPdfFile != null) {
                             if (i3 == 0) {
                                 pdfRender.this.mPreviewmode = true;
                                 pdfRender.this.mUiHandler.sendEmptyMessage(4);

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

@@ -186,7 +186,7 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
                 arrayList.add(ERemoteOperation.ERemoteParam.print_media_source);
                 arrayList.add(ERemoteOperation.ERemoteParam.print_quality);
                 arrayList.add(ERemoteOperation.ERemoteParam.x_remove_background);
-                if (C22702.f396xec9cd424[RemoteCopySetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XCutLine).getSelectedChoice().ordinal()] != 1) {
+                if  (optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XCutLine).getSelectedChoice().ordinal()] != 1) {
                     arrayList.add(ERemoteOperation.ERemoteParam.x_cut_line);
                     arrayList.add(ERemoteOperation.ERemoteParam.x_cut_line_style);
                     arrayList.add(ERemoteOperation.ERemoteParam.x_cut_line_weight);
@@ -203,7 +203,7 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
                 arrayList.add(ERemoteOperation.ERemoteParam.print_media_source);
                 arrayList.add(ERemoteOperation.ERemoteParam.print_quality);
                 arrayList.add(ERemoteOperation.ERemoteParam.x_remove_background);
-                if (C22702.f396xec9cd424[RemoteCopySetOptionTask.this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XCutLine).getSelectedChoice().ordinal()] != 1) {
+                if  (optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XCutLine).getSelectedChoice().ordinal()] != 1) {
                     arrayList.add(ERemoteOperation.ERemoteParam.x_cut_line);
                     arrayList.add(ERemoteOperation.ERemoteParam.x_cut_line_style);
                     arrayList.add(ERemoteOperation.ERemoteParam.x_cut_line_weight);

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

@@ -49,33 +49,33 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
     private String ipAdress;
     Handler mHandler = new Handler(new Handler.Callback() {
         public boolean handleMessage(Message message) {
-            EPLog.i(CopyActivity.this.TAG, "HandlerCallback");
+            EPLog.i (TAG, "HandlerCallback");
             switch (message.what) {
                 case 0:
-                    EPLog.i(CopyActivity.this.TAG, "PROBE_PRINTER");
+                    EPLog.i (TAG, "PROBE_PRINTER");
                     CopyActivity copyActivity = CopyActivity.this;
                     ProbePrinter unused = copyActivity.task = new ProbePrinter();
                     CopyActivity.this.task.execute(new Void[0]);
                     return true;
                 case 1:
-                    EPLog.i(CopyActivity.this.TAG, "COMM_ERROR");
+                    EPLog.i (TAG, "COMM_ERROR");
                     CopyActivity copyActivity2 = CopyActivity.this;
                     ActivityBase.errorDialog unused2 = copyActivity2.errordialog = new ActivityBase.errorDialog(copyActivity2);
-                    CopyActivity.this.errordialog.showErrorDialog(CopyActivity.this.getString(R.string.EPS_PRNERR_COMM_TITLE), CopyActivity.this.getString(R.string.EPS_PRNERR_COMM5), ActivityBase.DialogButtons.Ok, new ActivityBase.IClose() {
+                    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() {
                         public void onClose(ActivityBase.ClickButton clickButton) {
                             CopyActivity.this.returnToHome();
                         }
                     });
                     return true;
                 case 2:
-                    EPLog.i(CopyActivity.this.TAG, "UPDATE_SETTING");
-                    if (CopyActivity.this.mECopyOptionContext == null) {
+                    EPLog.i (TAG, "UPDATE_SETTING");
+                    if  (mECopyOptionContext == null) {
                         CopyActivity.this.fetchCopyOptionContext();
                         return true;
                     }
                     CopyActivity copyActivity3 = CopyActivity.this;
                     copyActivity3.mECopyOptionContext = copyActivity3.copyComponent.getBindedCopyOptionContext();
-                    CopyActivity.this.copyComponent.bindCopyOptionContext(CopyActivity.this.mECopyOptionContext, CopyActivity.this.optionListener);
+                    CopyActivity.this.copyComponent.bindCopyOptionContext (mECopyOptionContext, CopyActivity.this.optionListener);
                     CopyActivity copyActivity4 = CopyActivity.this;
                     copyActivity4.buildCopyOptions(copyActivity4.copyComponent.getCopyOptionItems());
                     return true;
@@ -122,14 +122,14 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                     return;
                 }
                 ArrayList arrayList2 = new ArrayList();
-                if (CopyActivity.this.doClear) {
-                    if (CopyActivity.this.clearindex != CopyActivity.this.copyComponent.getCopyOptionItems().size()) {
+                if  (doClear) {
+                    if  (clearindex != CopyActivity.this.copyComponent.getCopyOptionItems().size()) {
                         CopyActivity.this.allClear();
                         return;
                     }
                     boolean unused = CopyActivity.this.doClear = false;
                     int unused2 = CopyActivity.this.clearindex = 0;
-                    arrayList2.addAll(CopyActivity.this.copyComponent.getCopyOptionItems());
+                    arrayList2.addAll (copyComponent.getCopyOptionItems());
                 }
                 arrayList2.add(eCopyOptionItem);
                 if (arrayList != null) {
@@ -389,14 +389,14 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                 CopyActivity copyActivity = CopyActivity.this;
                 copyActivity.mECopyOptionContext = eCopyOptionContext;
                 if (contextCreationError == null) {
-                    copyActivity.copyComponent.bindCopyOptionContext(CopyActivity.this.mECopyOptionContext, CopyActivity.this.optionListener);
+                    copyActivity.copyComponent.bindCopyOptionContext (mECopyOptionContext, CopyActivity.this.optionListener);
                     ArrayList<ECopyOptionItem> copyOptionItems = CopyActivity.this.copyComponent.getCopyOptionItems();
                     ECopyOptionContext bindedCopyOptionContext = CopyActivity.this.copyComponent.getBindedCopyOptionContext();
                     if (bindedCopyOptionContext != null && bindedCopyOptionContext.hasCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.XCutLine)) {
                         CopyActivity.this.setupUiPostCommunication();
                         CopyActivity.this.setClickListenerPostCommunication();
                     }
-                    if (ActivityBase.printerId.equalsIgnoreCase(CopyActivity.this.presettings.loadPrePrinter())) {
+                    if  (presettings.loadPrePrinter())) {
                         CopyActivity.this.presettings.setCopyOptions(copyOptionItems);
                     } else {
                         CopyActivity.this.buildCopyOptions(copyOptionItems);
@@ -486,7 +486,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             bindOption(R.id.SettingEditCopies, eCopyOptionItem);
             bindCountUp(R.id.SettingButonCopiesCountUp);
             bindCountDown(R.id.SettingButonCopiesCountDown);
-            setOptionValueChangedListener(CopyActivity.this.optionValueChangedListener);
+            setOptionValueChangedListener (optionValueChangedListener);
         }
     }
 
@@ -499,7 +499,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             bindOption(R.id.density_image, eCopyOptionItem);
             bindCountUp(R.id.SettingButonXDensityCountUp);
             bindCountDown(R.id.SettingButonXDensityCountDown);
-            setOptionValueChangedListener(CopyActivity.this.optionValueChangedListener);
+            setOptionValueChangedListener (optionValueChangedListener);
         }
 
         private void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
@@ -537,9 +537,9 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
 
             private void updateImage(int i) {
                 XDensityValue.this.value += i;
-                XDensityValue.this.optionItem.selectValue(XDensityValue.this.value);
-                if (XDensityValue.this.changedListener != null) {
-                    XDensityValue.this.changedListener.onOptionItemChanged(XDensityValue.this.optionItem);
+                XDensityValue.this.optionItem.selectValue (value);
+                if  (changedListener != null) {
+                    XDensityValue.this.changedListener.onOptionItemChanged (optionItem);
                 }
             }
 
@@ -564,12 +564,12 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         }
 
         protected Boolean doInBackground(Void... voidArr) {
-            EPLog.i(CopyActivity.this.TAG, "ProbePrinter doInBackground");
-            if ((CopyActivity.this.printerLocation != 1 && CopyActivity.this.printerLocation != 3) || ActivityBase.printerId == null) {
+            EPLog.i (TAG, "ProbePrinter doInBackground");
+            if  (printerLocation != 1 && CopyActivity.this.printerLocation != 3) || ActivityBase.printerId == null) {
                 return false;
             }
             CopyActivity.this.mPrinter.doInitDriver(CopyActivity.this, 2);
-            if (CopyActivity.this.mPrinter.doProbePrinter(60, ActivityBase.printerId, ActivityBase.printerIp, CopyActivity.this.printerLocation) != 0) {
+            if  (mPrinter.doProbePrinter(60, ActivityBase.printerId, ActivityBase.printerIp, CopyActivity.this.printerLocation) != 0) {
                 return false;
             }
             int doSetPrinter = CopyActivity.this.mPrinter.doSetPrinter();
@@ -596,19 +596,19 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                 }
             };
             ECopyComponent sharedComponent = ECopyComponent.sharedComponent();
-            sharedComponent.setSystemSettings(CopyActivity.this.systemSettings);
+            sharedComponent.setSystemSettings (systemSettings);
             sharedComponent.setProperty(ECopyComponent.Property.RequestConnectionTimeout, 30000);
             return true;
         }
 
         protected void onCancelled() {
-            EPLog.i(CopyActivity.this.TAG, "ProbePrinter onCancelled");
+            EPLog.i (TAG, "ProbePrinter onCancelled");
             super.onCancelled();
             CopyActivity.this.mPrinter.doCancelFindPrinter();
         }
 
         protected void onPostExecute(Boolean bool) {
-            EPLog.i(CopyActivity.this.TAG, "ProbePrinter onPostExecute");
+            EPLog.i (TAG, "ProbePrinter onPostExecute");
             if (bool.booleanValue()) {
                 CopyActivity.this.mHandler.sendEmptyMessage(2);
             } else {

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

@@ -79,7 +79,7 @@ public class CopySettingActivity extends ActivityBase {
             super();
             bindOption(eCopyOptionItem);
             capabilitySetting(eCopyOptionItem, CopySettingActivity.this);
-            setOptionValueChangedListener(CopySettingActivity.this.optionValueChangedListener);
+            setOptionValueChangedListener (optionValueChangedListener);
         }
 
         private SettingAdapter getArrayAdapter(OthersettingValue othersettingValue, Context context) {
@@ -92,8 +92,8 @@ public class CopySettingActivity extends ActivityBase {
                 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));
-                    if (OthersettingValue.this.changedListener != null) {
-                        OthersettingValue.this.changedListener.onOptionItemChanged(OthersettingValue.this.optionItem);
+                    if  (changedListener != null) {
+                        OthersettingValue.this.changedListener.onOptionItemChanged (optionItem);
                     }
                     CopySettingActivity.this.isKeepSimpleAPConnection = true;
                 }

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

@@ -461,7 +461,7 @@ public class ActivityPrinterSetting extends ActivityIACommon implements View.OnC
         }
 
         protected void onPreExecute() {
-            progress = new WorkingDialog(ActivityPrinterSetting.this.context);
+            progress = new WorkingDialog (context);
             progress.show();
         }
 
@@ -471,7 +471,7 @@ public class ActivityPrinterSetting extends ActivityIACommon implements View.OnC
             int registRemotePrinter = EpsonConnectAccess.registRemotePrinter(activityPrinterSetting, activityPrinterSetting.printerEmailAddress, ActivityPrinterSetting.this.printerAccessKey);
             if (registRemotePrinter == -1203) {
                 Message message = new Message();
-                if (ActivityPrinterSetting.this.accessKeyLayout.getVisibility() != 0) {
+                if  (accessKeyLayout.getVisibility() != 0) {
                     Message message2 = new Message();
                     message2.what = 4;
                     message2.arg1 = 0;
@@ -492,7 +492,7 @@ public class ActivityPrinterSetting extends ActivityIACommon implements View.OnC
                 ActivityPrinterSetting activityPrinterSetting2 = ActivityPrinterSetting.this;
                 EpsonConnectAccess.RemotePrinterInfo printerInfo = EpsonConnectAccess.getPrinterInfo(activityPrinterSetting2, activityPrinterSetting2.printerEmailAddress, ActivityPrinterSetting.this.printerAccessKey);
                 if (printerInfo != null) {
-                    if  (!oldPrinterEmailAddress.equals("") && !ActivityPrinterSetting.this.oldPrinterEmailAddress.equals(ActivityPrinterSetting.this.printerEmailAddress)) {
+                    if  (!oldPrinterEmailAddress.equals("") && !ActivityPrinterSetting.this.oldPrinterEmailAddress.equals (printerEmailAddress)) {
                         ActivityPrinterSetting activityPrinterSetting3 = ActivityPrinterSetting.this;
                         activityPrinterSetting3.deletePrinterInfo(activityPrinterSetting3.oldPrinterEmailAddress);
                     }
@@ -569,13 +569,13 @@ 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(ActivityPrinterSetting.this.printerEmailAddress);
+                    ActivityPrinterSetting.this.printerEmailAddressEdit.setText (printerEmailAddress);
                     ActivityPrinterSetting.this.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(ActivityPrinterSetting.this.printerEmailAddress);
+                    ActivityPrinterSetting.this.printerEmailAddressEdit.setText (printerEmailAddress);
                     ActivityPrinterSetting.this.showMailDomainSelectDialog();
                 } else {
                     inputStatus = 0;

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

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

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

@@ -1046,7 +1046,7 @@ public class PrintProgress extends Activity implements CommonDefine {
                         printProgress.mCanceled = true;
                         printProgress.mCancelButton.setVisibility(4);
                         PrintProgress.this.mCancelButton.setEnabled(false);
-                        if (PrintProgress.this.bSearching) {
+                        if  (bSearching) {
                             PrintProgress.this.mHandler.sendEmptyMessage(5);
                             boolean unused = PrintProgress.this.bSearching = false;
                         }

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

@@ -96,7 +96,7 @@ public class PrinterFinder extends ActivityIACommon {
 
         public void onNotifyError(int i, int i2, boolean z) throws RemoteException {
             synchronized (PrinterFinder.mLock) {
-                boolean unused = PrinterFinder.foundPrinter = Utils.getPrefBoolean(PrinterFinder.this.getApplicationContext(), "PrintSetting", CommonDefine.RE_SEARCH);
+                boolean unused = PrinterFinder.foundPrinter = Utils.getPrefBoolean (getApplicationContext(), "PrintSetting", CommonDefine.RE_SEARCH);
                 if ((i2 == -1300 || i2 == -1351) && !PrinterFinder.foundPrinter) {
                     i2 = -1100;
                 } else if ((i2 == -1300 || i2 == -1351 || i2 == -1100) && PrinterFinder.foundPrinter) {
@@ -112,7 +112,7 @@ public class PrinterFinder extends ActivityIACommon {
     private ServiceConnection mEpsonConnection = new ServiceConnection() {
         public void onServiceDisconnected(ComponentName componentName) {
             try {
-                PrinterFinder.this.mEpsonService.unregisterCallback(PrinterFinder.this.mCallback);
+                PrinterFinder.this.mEpsonService.unregisterCallback (mCallback);
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
@@ -121,9 +121,9 @@ public class PrinterFinder extends ActivityIACommon {
 
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
             IEpsonService unused = PrinterFinder.this.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
-            if (PrinterFinder.this.mEpsonService != null) {
+            if  (mEpsonService != null) {
                 try {
-                    PrinterFinder.this.mEpsonService.registerCallback(PrinterFinder.this.mCallback);
+                    PrinterFinder.this.mEpsonService.registerCallback (mCallback);
                 } catch (RemoteException e) {
                     e.printStackTrace();
                 }
@@ -135,7 +135,7 @@ public class PrinterFinder extends ActivityIACommon {
         public boolean handleMessage(Message message) {
             switch (message.what) {
                 case 1:
-                    if (PrinterFinder.this.mEpsonService == null) {
+                    if  (mEpsonService == null) {
                         PrinterFinder.this.mHandler.sendEmptyMessageDelayed(1, 100);
                         break;
                     } else {
@@ -143,7 +143,7 @@ public class PrinterFinder extends ActivityIACommon {
                             boolean unused = PrinterFinder.this.isFinishSearchPrinter = false;
                             PrinterFinder.this.searchButtonSetEnabled(false);
                             PrinterFinder.this.mProgressBar.setVisibility(0);
-                            ((TextView) PrinterFinder.this.mLayout.findViewById(R.id.empty)).setText(PrinterFinder.this.getString(R.string.searching_text));
+                            ((TextView) PrinterFinder.this.mLayout.findViewById (getString(R.string.searching_text));
                             PrinterFinder.this.mEpsonService.searchPrinters((String) null, (String) null, 1);
                             break;
                         } catch (RemoteException e) {
@@ -152,7 +152,7 @@ public class PrinterFinder extends ActivityIACommon {
                         }
                     }
                 case 2:
-                    if (PrinterFinder.this.mEpsonService != null) {
+                    if  (mEpsonService != null) {
                         try {
                             PrinterFinder.this.mEpsonService.cancelSearchPrinter();
                             break;
@@ -167,13 +167,13 @@ public class PrinterFinder extends ActivityIACommon {
                     String string = data.getString("name");
                     if (string == null || string.contentEquals("FINISH")) {
                         if  (!mIsClickSelect) {
-                            if (PrinterFinder.this.mBuilder.getData().size() <= 0) {
-                                ((TextView) PrinterFinder.this.mLayout.findViewById(R.id.empty)).setText(PrinterFinder.this.getString(R.string.EPS_PRNERR_COMM_TITLE1));
+                            if  (mBuilder.getData().size() <= 0) {
+                                ((TextView) PrinterFinder.this.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(R.id.empty)).setText(PrinterFinder.this.getString(R.string.numberOfPrintersAvailable));
-                                ((TextView) PrinterFinder.this.mLayout.findViewById(R.id.empty)).setText(PrinterFinder.this.getString(R.string.numberOfPrintersAvailable));
+                                ((TextView) PrinterFinder.this.mLayout.findViewById (getString(R.string.numberOfPrintersAvailable));
+                                ((TextView) PrinterFinder.this.mLayout.findViewById (getString(R.string.numberOfPrintersAvailable));
                             } else {
-                                ((TextView) PrinterFinder.this.mLayout.findViewById(R.id.empty)).setText(String.format(PrinterFinder.this.getString(R.string.numberOfPrintersAvailable), new Object[]{Integer.valueOf(PrinterFinder.this.mBuilder.getData().size())}));
+                                ((TextView) PrinterFinder.this.mLayout.findViewById (getString(R.string.numberOfPrintersAvailable), new Object[]{Integer.valueOf (mBuilder.getData().size())}));
                             }
                             PrinterFinder.this.mBuilder.getAdapter().notifyDataSetChanged();
                             PrinterFinder.this.mProgressBar.setVisibility(8);
@@ -230,7 +230,7 @@ public class PrinterFinder extends ActivityIACommon {
                     }
                     break;
                 case 4:
-                    if (PrinterFinder.this.mEpsonService != null) {
+                    if  (mEpsonService != null) {
                         try {
                             PrinterFinder.this.mEpsonService.setCurPrinter(message.getData().getInt("index"));
                         } catch (RemoteException e3) {
@@ -293,7 +293,7 @@ public class PrinterFinder extends ActivityIACommon {
         mBuilder.refresh();
         ((ListView) mLayout.findViewById(16908298)).setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
-                if (PrinterFinder.this.isFocused.booleanValue()) {
+                if  (isFocused.booleanValue()) {
                     Boolean unused = PrinterFinder.this.isFocused = false;
                     PrinterFinder printerFinder = PrinterFinder.this;
                     printerFinder.mIsClickSelect = true;
@@ -318,7 +318,7 @@ public class PrinterFinder extends ActivityIACommon {
                 boolean unused = PrinterFinder.this.isFinishSearchPrinter = false;
                 PrinterFinder.this.searchButtonSetEnabled(false);
                 PrinterFinder.this.mProgressBar.setVisibility(0);
-                ((TextView) PrinterFinder.this.mLayout.findViewById(R.id.empty)).setText(PrinterFinder.this.getString(R.string.searching_text));
+                ((TextView) PrinterFinder.this.mLayout.findViewById (getString(R.string.searching_text));
                 PrinterFinder.this.mHandler.sendEmptyMessageDelayed(1, 100);
             }
         });

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

@@ -134,11 +134,11 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         }
 
         public void onNotifyContinueable(int i) throws RemoteException {
-            if (SearchPrinterScr.this.progress != null && SearchPrinterScr.this.progress.isShowing()) {
+            if  (progress != null && SearchPrinterScr.this.progress.isShowing()) {
                 SearchPrinterScr.this.progress.dismiss();
             }
-            if (SearchPrinterScr.this.selectedPrinter != null && SearchPrinterScr.this.probedPrinter != null && SearchPrinterScr.this.printer_location == 3) {
-                if (SearchPrinterScr.this.probedPrinter.getPrinterId().equals(SearchPrinterScr.this.selectedPrinter.getPrinterId())) {
+            if  (selectedPrinter != null && SearchPrinterScr.this.probedPrinter != null && SearchPrinterScr.this.printer_location == 3) {
+                if  (selectedPrinter.getPrinterId())) {
                     Message obtainMessage = SearchPrinterScr.this.mHandler.obtainMessage();
                     obtainMessage.what = 4;
                     obtainMessage.obj = SearchPrinterScr.this.selectedPrinter;
@@ -154,7 +154,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         public void onNotifyError(int i, int i2, boolean z) throws RemoteException {
             if  (!isSearchSimpleAp) {
                 synchronized (SearchPrinterScr.mLock) {
-                    boolean unused = SearchPrinterScr.foundPrinter = Utils.getPrefBoolean(SearchPrinterScr.this.getApplicationContext(), "PrintSetting", CommonDefine.RE_SEARCH);
+                    boolean unused = SearchPrinterScr.foundPrinter = Utils.getPrefBoolean (getApplicationContext(), "PrintSetting", CommonDefine.RE_SEARCH);
                     if ((i2 == -1300 || i2 == -1351) && !SearchPrinterScr.foundPrinter) {
                         i2 = -1100;
                     } else if ((i2 == -1300 || i2 == -1351 || i2 == -1100) && SearchPrinterScr.foundPrinter) {
@@ -164,7 +164,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
                 SearchPrinterScr searchPrinterScr = SearchPrinterScr.this;
                 searchPrinterScr.curError = i2;
                 searchPrinterScr.mHandler.sendEmptyMessage(13);
-                if (SearchPrinterScr.this.progress != null && SearchPrinterScr.this.progress.isShowing()) {
+                if  (progress != null && SearchPrinterScr.this.progress.isShowing()) {
                     SearchPrinterScr.this.progress.dismiss();
                 }
                 Boolean unused2 = SearchPrinterScr.this.isFocused = true;
@@ -176,7 +176,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
     private ServiceConnection mEpsonConnection = new ServiceConnection() {
         public void onServiceDisconnected(ComponentName componentName) {
             try {
-                SearchPrinterScr.this.mEpsonService.unregisterCallback(SearchPrinterScr.this.mCallback);
+                SearchPrinterScr.this.mEpsonService.unregisterCallback (mCallback);
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
@@ -185,9 +185,9 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
 
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
             IEpsonService unused = SearchPrinterScr.this.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
-            if (SearchPrinterScr.this.mEpsonService != null) {
+            if  (mEpsonService != null) {
                 try {
-                    SearchPrinterScr.this.mEpsonService.registerCallback(SearchPrinterScr.this.mCallback);
+                    SearchPrinterScr.this.mEpsonService.registerCallback (mCallback);
                 } catch (RemoteException e) {
                     e.printStackTrace();
                 }
@@ -799,7 +799,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         }
         mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
-                if (SearchPrinterScr.this.isFocused.booleanValue()) {
+                if  (isFocused.booleanValue()) {
                     Boolean unused = SearchPrinterScr.this.isFocused = false;
                     SearchPrinterScr searchPrinterScr = SearchPrinterScr.this;
                     searchPrinterScr.mIsClickSelect = true;
@@ -825,7 +825,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         });
         mListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
             public boolean onItemLongClick(AdapterView<?> adapterView, View view, int i, long j) {
-                if (SearchPrinterScr.this.printer_location == 1) {
+                if  (printer_location == 1) {
                     return true;
                 }
                 int unused = SearchPrinterScr.this.mDeletePos = i;
@@ -836,24 +836,24 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         });
         mAddButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                switch (SearchPrinterScr.this.printer_location) {
+                switch  (printer_location) {
                     case 2:
-                        if (SearchPrinterScr.this.mBuilder.getData().size() >= 32) {
-                            new AlertDialog.Builder(SearchPrinterScr.this.mContext).setCancelable(false).setTitle(SearchPrinterScr.this.getString(R.string.epsonconnect_err_regist_remote_printer_max_size_title)).setMessage(SearchPrinterScr.this.getString(R.string.epsonconnect_err_regist_remote_printer_max_size)).setPositiveButton(SearchPrinterScr.this.getString(R.string.str_yes), new DialogInterface.OnClickListener() {
+                        if  (mBuilder.getData().size() >= 32) {
+                            new AlertDialog.Builder (getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialogInterface, int i) {
                                 }
                             }).show();
                             return;
-                        } else if (SearchPrinterScr.this.getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).getBoolean(Constants.ENABLE_SHOW_WARNING, true)) {
-                            AlertDialog.Builder cancelable = new AlertDialog.Builder(SearchPrinterScr.this.mContext).setCancelable(false);
-                            cancelable.setMessage(SearchPrinterScr.this.getString(R.string.epsonconnect_str_remote_print_warning) + "\n\n" + SearchPrinterScr.this.getString(R.string.epsonconnect_str_remote_print_warning2)).setPositiveButton(SearchPrinterScr.this.getString(R.string.str_yes), new DialogInterface.OnClickListener() {
+                        } 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() {
                                 public void onClick(DialogInterface dialogInterface, int i) {
                                     Message message = new Message();
                                     message.what = 8;
                                     message.obj = null;
                                     SearchPrinterScr.this.mHandler.sendMessage(message);
                                 }
-                            }).setNegativeButton(SearchPrinterScr.this.getString(R.string.str_no), new DialogInterface.OnClickListener() {
+                            }).setNegativeButton (getString(R.string.str_no), new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialogInterface, int i) {
                                 }
                             }).show();
@@ -866,8 +866,8 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
                             return;
                         }
                     case 3:
-                        if (SearchPrinterScr.this.mBuilder.getData().size() >= 32) {
-                            new AlertDialog.Builder(SearchPrinterScr.this.mContext).setCancelable(false).setTitle(SearchPrinterScr.this.getString(R.string.epsonconnect_err_regist_remote_printer_max_size_title)).setMessage(SearchPrinterScr.this.getString(R.string.epsonconnect_err_regist_remote_printer_max_size)).setPositiveButton(SearchPrinterScr.this.getString(R.string.str_yes), new DialogInterface.OnClickListener() {
+                        if  (mBuilder.getData().size() >= 32) {
+                            new AlertDialog.Builder (getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialogInterface, int i) {
                                 }
                             }).show();
@@ -885,14 +885,14 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         });
         mSearchButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                if (SearchPrinterScr.this.printer_location == 1) {
+                if  (printer_location == 1) {
                     SearchPrinterScr.this.mHandler.sendEmptyMessageDelayed(1, 100);
                 }
             }
         });
         mLocalButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                if (SearchPrinterScr.this.printer_location != 1) {
+                if  (printer_location != 1) {
                     SearchPrinterScr.this.mAddButton.setVisibility(8);
                     ((TextView) SearchPrinterScr.this.mLayout.findViewById(R.id.empty)).setVisibility(0);
                     SearchPrinterScr.this.interruptSearch();
@@ -904,7 +904,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         });
         mRemoteButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                if (SearchPrinterScr.this.printer_location != 2) {
+                if  (printer_location != 2) {
                     int unused = SearchPrinterScr.this.printer_location = 2;
                     SearchPrinterScr.this.interruptSearch();
                     ((TextView) SearchPrinterScr.this.mLayout.findViewById(R.id.empty)).setVisibility(8);
@@ -917,7 +917,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         });
         mIpButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                if (SearchPrinterScr.this.printer_location != 3) {
+                if  (printer_location != 3) {
                     int unused = SearchPrinterScr.this.printer_location = 3;
                     SearchPrinterScr.this.interruptSearch();
                     ((TextView) SearchPrinterScr.this.mLayout.findViewById(R.id.empty)).setVisibility(8);

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

@@ -157,7 +157,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
         public void onServiceDisconnected(ComponentName componentName) {
             EPLog.v("SettingScr", "onServiceDisconnected");
             try {
-                SettingScr.this.mEpsonService.unregisterCallback(SettingScr.this.mCallback);
+                SettingScr.this.mEpsonService.unregisterCallback (mCallback);
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
@@ -167,9 +167,9 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
             IEpsonService unused = SettingScr.this.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
             EPLog.v("SettingScr", "onServiceConnected");
-            if (SettingScr.this.mEpsonService != null) {
+            if  (mEpsonService != null) {
                 try {
-                    SettingScr.this.mEpsonService.registerCallback(SettingScr.this.mCallback);
+                    SettingScr.this.mEpsonService.registerCallback (mCallback);
                 } catch (RemoteException e) {
                     e.printStackTrace();
                 }

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

@@ -118,7 +118,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             String unused = EpsonService.this.f406id = str;
             String unused2 = EpsonService.this.f407ip = str2;
             int unused3 = EpsonService.this.probeMethod = i;
-            if (EpsonService.this.searchingPrinter != null) {
+            if  (searchingPrinter != null) {
                 EPLog.d("EpsonService", "searchPrinters() search intterrupt()");
                 EpsonService.this.searchingPrinter.interrupt();
                 try {
@@ -128,13 +128,13 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                 }
             }
             EpsonService.access$504(EpsonService.this);
-            if (EpsonService.this.mSearchCount > 1) {
+            if  (mSearchCount > 1) {
                 EPLog.e("EpsonService", "search count error! mSearchCount => " + EpsonService.this.mSearchCount);
             }
             if (!EpsonService.isInitDriver) {
                 EpsonService.this.mEscprLib.release_driver();
                 boolean unused4 = EpsonService.isInitDriver = true;
-                EpsonService.this.mEscprLib.init_driver(EpsonService.this.getApplicationContext(), ExternalFileUtils.getInstance(EpsonService.this.getApplicationContext()).getSupportedMediaDir());
+                EpsonService.this.mEscprLib.init_driver (getApplicationContext(), ExternalFileUtils.getInstance (getApplicationContext()).getSupportedMediaDir());
             }
             EpsonService.this.createSearchingThread();
             EpsonService.this.searchingPrinter.start();
@@ -143,7 +143,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
 
         public synchronized int cancelSearchPrinter() throws RemoteException {
             EPLog.e("Epson", "cancelSearchPrinter() call");
-            if (EpsonService.this.searchingPrinter == null) {
+            if  (searchingPrinter == null) {
                 EPLog.e("Epson", "cancelSearchPrinter() finish1");
                 return 0;
             }
@@ -199,7 +199,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             PrintSetting.Kind valueOf = PrintSetting.Kind.valueOf(str);
             if (z2) {
                 int unused = EpsonService.this.createECPrintingThread(valueOf, ePImageList);
-                if (EpsonService.this.printingThread != null) {
+                if  (printingThread != null) {
                     EpsonService.this.printingThread.start();
                 }
                 return 0;
@@ -350,12 +350,12 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             synchronized (EpsonService.mLockPrintingStatus) {
                 boolean unused = EpsonService.bCancelPrinting = true;
                 synchronized (EpsonService.mCancelLock) {
-                    if (EpsonService.this.mEPImageCreator != null) {
+                    if  (mEPImageCreator != null) {
                         EpsonService.this.mEPImageCreator.requestStop();
                     }
                 }
-                if (EpsonService.this.bPrinting) {
-                    if (EpsonService.this.mLocalPrintThread != null) {
+                if  (bPrinting) {
+                    if  (mLocalPrintThread != null) {
                         EpsonService.this.mLocalPrintThread.interrupt();
                     }
                     EPLog.e("lam dai hiep", "confirm_cancel: " + z);
@@ -803,7 +803,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                     instance.saveSettings();
                     return 0;
                 }
-                ExternalFileUtils instance2 = ExternalFileUtils.getInstance(EpsonService.this.getApplicationContext());
+                ExternalFileUtils instance2 = ExternalFileUtils.getInstance (getApplicationContext());
                 instance2.getSupportedMedia().delete();
                 instance2.getSavedSupportedMedia().delete();
                 instance.paperSizeValue = instance.getDefaultPaperSize();
@@ -876,7 +876,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
 
         public int EpsonConnectChangePrintSetting() {
             EPLog.d("EpsonService", "EpsonConnectChangePrintSetting() called.");
-            return mEcClientLib.ChangePrintSetting(EpsonService.this.epsJobattrib, EcClientLibUtil.quoteForJsonString(EpsonService.this.mailAddress), EcClientLibUtil.quoteForJsonString(EpsonService.this.accessKey), false);
+            return mEcClientLib.ChangePrintSetting (epsJobattrib, EcClientLibUtil.quoteForJsonString (mailAddress), EcClientLibUtil.quoteForJsonString (accessKey), false);
         }
 
         public int EpsonConnectUploadFile(String str, int i) {
@@ -931,7 +931,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         public int EpsonConnectGetSupportedMedia(int i, String str, String str2) {
             EpsSupportedMedia epsSupportedMedia;
             int i2 = i;
-            String path = ExternalFileUtils.getInstance(EpsonService.this.getApplicationContext()).getSupportedMedia().getPath();
+            String path = ExternalFileUtils.getInstance (getApplicationContext()).getSupportedMedia().getPath();
             WiFiDirectManager.setPriorityToSimpleAP(EpsonService.this, false);
             if (str == null || str.length() <= 0) {
                 int ensureLogin = ensureLogin(false);
@@ -995,7 +995,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                 wrap.clear();
                 dataOutputStream.close();
                 EPLog.i("EpsonService", "finishu output SUPPORTED_MEDIA for EC. filename = " + path + " sourceType = " + i2 + " filesize = " + file.length());
-                Utils.copyFile(file, new File(ExternalFileUtils.getInstance(EpsonService.this.getApplicationContext()).getSavedSupportedMedia().getPath()));
+                Utils.copyFile(file, new File (getApplicationContext()).getSavedSupportedMedia().getPath()));
                 return 0;
             } catch (IOException e) {
                 EPLog.e("EpsonService", "get_epsonconnect_supported_media(): IOExceptin.");
@@ -1010,7 +1010,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                 mEpsonConnectlogin = false;
             }
             if (!mEpsonConnectlogin) {
-                int Login = mEcClientLib.Login(EcClientLibUtil.quoteForJsonString(EpsonService.this.mailAddress), EcClientLibUtil.quoteForJsonString(EpsonService.this.accessKey), EpsonService.this.clientId);
+                int Login = mEcClientLib.Login (mailAddress), EcClientLibUtil.quoteForJsonString (accessKey), EpsonService.this.clientId);
                 if (Login != 0) {
                     return Login;
                 }

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

@@ -47,7 +47,7 @@ public class DropboxV2SignInActivity extends StorageSignInActivity {
         }
 
         protected Boolean doInBackground(Void... voidArr) {
-            DropboxV2Adapter.getTokenAndInitClient(DropboxV2SignInActivity.this.getApplicationContext());
+            DropboxV2Adapter.getTokenAndInitClient (getApplicationContext());
             DbxClientV2 client = DropboxV2Adapter.getClient();
             if (client == null) {
                 return false;

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

@@ -693,7 +693,7 @@ public class OneDriveClient extends StorageServiceClient {
                     }
 
                     public void progress(long j, long j2) {
-                        if (LocalUploader.this.bCanceled) {
+                        if  (bCanceled) {
                             LocalUploader.this.uploadcancel();
                         }
                     }

+ 1 - 1
app/src/main/java/epson/print/widgets/AbstractListBuilder.java

@@ -119,7 +119,7 @@ public abstract class AbstractListBuilder extends AbstractBuilder {
         }
 
         protected Void doInBackground(Void... voidArr) {
-            synchronized (AbstractListBuilder.this.mData) {
+            synchronized  (mData) {
                 AbstractListBuilder.this.buildData();
             }
             return null;

+ 6 - 6
app/src/main/java/epson/scan/activity/InputUnitSettingActivity.java

@@ -28,9 +28,9 @@ public class InputUnitSettingActivity extends ActivityIACommon {
     private final AdapterView.OnItemClickListener mListOptionClick = new AdapterView.OnItemClickListener() {
         public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
             int unused = InputUnitSettingActivity.this.lastValue = ((ScanSettingsDetailAdapter.DetailSettingHolder) view.getTag()).value;
-            InputUnitSettingActivity.this.ssdAdapter.setSelected(InputUnitSettingActivity.this.lastValue);
+            InputUnitSettingActivity.this.ssdAdapter.setSelected (lastValue);
             InputUnitSettingActivity.this.ssdAdapter.notifyDataSetChanged();
-            if (InputUnitSettingActivity.this.lastValue == 1) {
+            if  (lastValue == 1) {
                 InputUnitSettingActivity.this.listSelect2.setVisibility(View.VISIBLE);
             } else {
                 InputUnitSettingActivity.this.listSelect2.setVisibility(View.GONE);
@@ -42,12 +42,12 @@ public class InputUnitSettingActivity extends ActivityIACommon {
             int unused = InputUnitSettingActivity.this.lastAdfGuide = i;
             switch (i) {
                 case 0:
-                    InputUnitSettingActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText(InputUnitSettingActivity.this.getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_left_adst)).suffixImage(Integer.valueOf(R.drawable.selected)));
-                    InputUnitSettingActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText(InputUnitSettingActivity.this.getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_center_adst)));
+                    InputUnitSettingActivity.mlAdapter.setList(0, CustomListRowImpl.create (getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_left_adst)).suffixImage(Integer.valueOf(R.drawable.selected)));
+                    InputUnitSettingActivity.mlAdapter.setList(1, CustomListRowImpl.create (getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_center_adst)));
                     break;
                 case 1:
-                    InputUnitSettingActivity.mlAdapter.setList(0, CustomListRowImpl.create().addText(InputUnitSettingActivity.this.getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_left_adst)));
-                    InputUnitSettingActivity.mlAdapter.setList(1, CustomListRowImpl.create().addText(InputUnitSettingActivity.this.getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_center_adst)).suffixImage(Integer.valueOf(R.drawable.selected)));
+                    InputUnitSettingActivity.mlAdapter.setList(0, CustomListRowImpl.create (getString(R.string.str_settings_right_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_left_adst)));
+                    InputUnitSettingActivity.mlAdapter.setList(1, CustomListRowImpl.create (getString(R.string.str_settings_center_aligned)).prefixImage(Integer.valueOf(R.drawable.adf_center_adst)).suffixImage(Integer.valueOf(R.drawable.selected)));
                     break;
             }
             InputUnitSettingActivity.mlAdapter.notifyDataSetChanged();

+ 19 - 19
app/src/main/java/epson/scan/activity/ScanBaseView.java

@@ -438,10 +438,10 @@ public class ScanBaseView extends ActivityIACommon {
 
         protected void onDraw(Canvas canvas) {
             super.onDraw(canvas);
-            if (ScanBaseView.this.bLongTouch && ScanBaseView.mWhere != 2) {
+            if  (bLongTouch && ScanBaseView.mWhere != 2) {
                 invalidate();
                 ScanBaseView.this.phase += 2;
-                if (ScanBaseView.this.phase > 1000) {
+                if  (phase > 1000) {
                     ScanBaseView.this.phase = 0;
                 }
             }
@@ -464,11 +464,11 @@ public class ScanBaseView extends ActivityIACommon {
                     ScanBaseView.this.setBm(createScaledBitmap);
                     canvas.drawBitmap(createScaledBitmap, ScanBaseView.this.getBmRectF().left, ScanBaseView.this.getBmRectF().top, (Paint) null);
                 } else {
-                    canvas.drawBitmap(ScanBaseView.this.getBm(), (Rect) null, ScanBaseView.this.getBmRectF(), ScanBaseView.this.getmPaint());
+                    canvas.drawBitmap (getBm(), (Rect) null, ScanBaseView.this.getBmRectF(), ScanBaseView.this.getmPaint());
                 }
             }
-            if (ScanBaseView.this.isDoctable) {
-                if (ScanBaseView.this.isSetSize) {
+            if  (isDoctable) {
+                if  (isSetSize) {
                     drawNormalCorner(canvas);
                     _pBaseCenter = ScanBaseView.this.getmCenter();
                 }
@@ -487,20 +487,20 @@ public class ScanBaseView extends ActivityIACommon {
                     paint.setStyle(Paint.Style.STROKE);
                     canvas.drawPath(path, paint);
                 }
-                if (ScanBaseView.this.bLongTouch) {
+                if  (bLongTouch) {
                     drawTheCornerImage(canvas, ScanBaseView.this.getmPaint());
                 } else {
                     drawNormalCorner(canvas);
                 }
             }
-            if (ScanBaseView.this.isSetSize) {
+            if  (isSetSize) {
                 ScanBaseView.this.setupScanArea();
                 ScanBaseView.this.setSetSize(false);
             }
         }
 
         private void drawTheCornerImage(Canvas canvas, Paint paint) {
-            switch (ScanBaseView.this.screenStatus) {
+            switch  (screenStatus) {
                 case 1:
                     int i = ScanBaseView.mWhere;
                     if (i != -1) {
@@ -570,20 +570,20 @@ public class ScanBaseView extends ActivityIACommon {
                         break;
                     }
             }
-            if (ScanBaseView.this.bLongTouch) {
+            if  (bLongTouch) {
                 String localClassName = ScanBaseView.this.getLocalClassName();
                 EPLog.i(localClassName, "mWhere = " + ScanBaseView.mWhere);
                 if (ScanBaseView.mWhere == 0 && ScanBaseView.this.bmCenter == null) {
                     ScanBaseView.this.bmCenter = BitmapFactory.decodeResource(getResources(), R.drawable.area_center, ScanBaseView.this._bmOption);
                 }
-                if (ScanBaseView.this.bmCenter != null) {
+                if  (bmCenter != null) {
                     if (_pBaseCenter == null) {
                         _pBaseCenter = ScanBaseView.this.getmCenter();
                     }
-                    if (ScanBaseView.this.inSampleSize != 0) {
-                        canvas.drawBitmap(ScanBaseView.this.bmCenter, (float) (_pBaseCenter.x - ((ScanBaseView.this.bmCenter.getWidth() / 2) * ScanBaseView.this.getInSampleSize())), (float) (_pBaseCenter.y - ((ScanBaseView.this.bmCenter.getHeight() / 2) * ScanBaseView.this.getInSampleSize())), (Paint) null);
+                    if  (inSampleSize != 0) {
+                        canvas.drawBitmap (bmCenter, (float) (_pBaseCenter.x -  (bmCenter.getWidth() / 2) * ScanBaseView.this.getInSampleSize())), (float) (_pBaseCenter.y -  (bmCenter.getHeight() / 2) * ScanBaseView.this.getInSampleSize())), (Paint) null);
                     } else {
-                        canvas.drawBitmap(ScanBaseView.this.bmCenter, (float) (_pBaseCenter.x - (ScanBaseView.this.bmCenter.getWidth() / 2)), (float) (_pBaseCenter.y - (ScanBaseView.this.bmCenter.getHeight() / 2)), (Paint) null);
+                        canvas.drawBitmap (bmCenter, (float) (_pBaseCenter.x -  (bmCenter.getWidth() / 2)), (float) (_pBaseCenter.y -  (bmCenter.getHeight() / 2)), (Paint) null);
                     }
                 }
             }
@@ -612,7 +612,7 @@ public class ScanBaseView extends ActivityIACommon {
                     ScanBaseView.this.bLongTouch = false;
                     break;
                 case 2:
-                    if (ScanBaseView.this.bLongTouch) {
+                    if  (bLongTouch) {
                         moveTheTouchPoint();
                         break;
                     }
@@ -625,7 +625,7 @@ public class ScanBaseView extends ActivityIACommon {
         }
 
         public void moveTheTouchPoint() {
-            switch (ScanBaseView.this.getmWhere()) {
+            switch  (getmWhere()) {
                 case -1:
                     _pBaseTopLeft = ScanBaseView.this.getmTouch();
                     _pBaseCenter = ScanBaseView.this.calculateTheCenterPoint(_pBaseTopLeft, _pBaseBottomRight);
@@ -663,7 +663,7 @@ public class ScanBaseView extends ActivityIACommon {
         }
 
         private void drawNormalCorner(Canvas canvas) {
-            switch (ScanBaseView.this.screenStatus) {
+            switch  (screenStatus) {
                 case 2:
                     drawCornerBotLeft(canvas, ScanBaseView.mTop);
                     drawCornerTopRight(canvas, ScanBaseView.mBot);
@@ -830,8 +830,8 @@ public class ScanBaseView extends ActivityIACommon {
 
         private void drawTextInCanvas(Canvas canvas) {
             String str = new String();
-            float f = ((float) (ScanBaseView.this.getmBaseBot().x - ScanBaseView.this.getmBaseTop().x)) * 0.9f;
-            float f2 = (float) (ScanBaseView.this.getmBaseBot().y - ScanBaseView.this.getmBaseTop().y);
+            float f = ((float)  (getmBaseBot().x - ScanBaseView.this.getmBaseTop().x)) * 0.9f;
+            float f2 = (float)  (getmBaseBot().y - ScanBaseView.this.getmBaseTop().y);
             Rect rect = new Rect();
             int length = text.length();
             String str2 = str;
@@ -845,7 +845,7 @@ public class ScanBaseView extends ActivityIACommon {
                 str2 = (str2 + substring) + Constants.BREAK_LINE;
                 i = breakText;
             }
-            int i3 = (((float) ScanBaseView.this.getmBaseTop().x) + (((float) (ScanBaseView.this.getmBaseBot().x - ScanBaseView.this.getmBaseTop().x)) * 0.05f));
+            int i3 = (((float) ScanBaseView.this.getmBaseTop().x) + (((float)  (getmBaseBot().x - ScanBaseView.this.getmBaseTop().x)) * 0.05f));
             int i4 = ((((float) ScanBaseView.this.getmBaseTop().y) + (f2 / 2.0f)) - ((float) (i2 / 2)));
             String[] split = str2.split(Constants.BREAK_LINE);
             int i5 = 0;

+ 7 - 7
app/src/main/java/epson/scan/activity/ScanSearchActivity.java

@@ -253,7 +253,7 @@ public class ScanSearchActivity extends ActivityIACommon implements CustomTitleD
                         WiFiDirectManager.connect(ScanSearchActivity.this, ip, 7);
                         return;
                     }
-                    myPrinter.setLocation(ScanSearchActivity.this.scanner_location);
+                    myPrinter.setLocation (scanner_location);
                     ScanSearchActivity scanSearchActivity = ScanSearchActivity.this;
                     String unused3 = scanSearchActivity.mSimpleApSsid = scanSearchActivity.getSimpleApSsid(myPrinter);
                     ScanSearchActivity.this.startGetCapabilityAndFinishTask(myPrinter);
@@ -262,7 +262,7 @@ public class ScanSearchActivity extends ActivityIACommon implements CustomTitleD
         });
         mListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
             public boolean onItemLongClick(AdapterView<?> adapterView, View view, int i, long j) {
-                if (ScanSearchActivity.this.scanner_location == 1) {
+                if  (scanner_location == 1) {
                     return true;
                 }
                 ScanSearchActivity scanSearchActivity = ScanSearchActivity.this;
@@ -273,9 +273,9 @@ public class ScanSearchActivity extends ActivityIACommon implements CustomTitleD
         });
         mAddButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                if (ScanSearchActivity.this.scanner_location == 3) {
+                if  (scanner_location == 3) {
                     if (ScanSearchActivity.mBuilder.getData().size() >= 32) {
-                        new AlertDialog.Builder(ScanSearchActivity.mContext).setCancelable(false).setTitle(ScanSearchActivity.this.getString(R.string.epsonconnect_err_regist_remote_printer_max_size_title)).setMessage(ScanSearchActivity.this.getString(R.string.epsonconnect_err_regist_remote_printer_max_size)).setPositiveButton(ScanSearchActivity.this.getString(R.string.str_yes), new DialogInterface.OnClickListener() {
+                        new AlertDialog.Builder (getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialogInterface, int i) {
                             }
                         }).show();
@@ -295,7 +295,7 @@ public class ScanSearchActivity extends ActivityIACommon implements CustomTitleD
         });
         mLocalButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                if (ScanSearchActivity.this.scanner_location != 1) {
+                if  (scanner_location != 1) {
                     int unused = ScanSearchActivity.this.scanner_location = 1;
                     ScanSearchActivity.this.buildElements();
                     ScanSearchActivity.mHandler.sendEmptyMessageDelayed(1, 100);
@@ -304,7 +304,7 @@ public class ScanSearchActivity extends ActivityIACommon implements CustomTitleD
         });
         mIpButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                if (ScanSearchActivity.this.scanner_location != 3) {
+                if  (scanner_location != 3) {
                     ScanSearchActivity.this.interruptSearch();
                     int unused = ScanSearchActivity.this.scanner_location = 3;
                     ScanSearchActivity.this.buildElements();
@@ -731,7 +731,7 @@ public class ScanSearchActivity extends ActivityIACommon implements CustomTitleD
             try {
                 ScanSearchActivity.sEscanLibSemaphore.acquire();
                 mCancelableFind.setEscanLib(ScanSearchActivity.mEscanLib);
-                mCancelableFind.findScanner(ScanSearchActivity.this.getApplicationContext(), ScanSearchActivity.mHandler);
+                mCancelableFind.findScanner (getApplicationContext(), ScanSearchActivity.mHandler);
             } catch (InterruptedException unused) {
             } catch (Throwable th) {
                 ScanSearchActivity.sEscanLibSemaphore.release();

+ 9 - 9
app/src/main/java/epson/scan/activity/ScanSettingsActivity.java

@@ -65,13 +65,13 @@ public class ScanSettingsActivity extends ActivityIACommon {
                 }
 
                 protected Void doInBackground(Void... voidArr) {
-                    WiFiDirectManager.disconnect(ScanSettingsActivity.this.getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_SCANNER, ScanSettingsActivity.this.scanInfo.getIp());
-                    WiFiDirectManager.disconnectSimpleAP(ScanSettingsActivity.this.getApplicationContext(), ScanSettingsActivity.this.autoConnectSsid, ScanSettingsActivity.this.scanInfo.getIp());
+                    WiFiDirectManager.disconnect (getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_SCANNER, ScanSettingsActivity.this.scanInfo.getIp());
+                    WiFiDirectManager.disconnectSimpleAP (getApplicationContext(), ScanSettingsActivity.this.autoConnectSsid, ScanSettingsActivity.this.scanInfo.getIp());
                     return null;
                 }
 
                 protected void onPostExecute(Void voidR) {
-                    ScanSettingsActivity.this.startActivityForResult(ScanSearchActivity.getStartIntent(ScanSettingsActivity.this.getApplicationContext(), ScanSettingsActivity.this.scanInfo.getScannerId(), ScanSettingsActivity.this.scanInfo.getLocation(), ScanSettingsActivity.this.autoConnectSsid), 1);
+                    ScanSettingsActivity.this.startActivityForResult (getApplicationContext(), ScanSettingsActivity.this.scanInfo.getScannerId(), ScanSettingsActivity.this.scanInfo.getLocation(), ScanSettingsActivity.this.autoConnectSsid), 1);
                     ScanSettingsActivity.this.llScanName.setClickable(true);
                 }
             }.execute(new Void[0]);
@@ -85,10 +85,10 @@ public class ScanSettingsActivity extends ActivityIACommon {
     };
     private View.OnClickListener mLLScanSettingsColor = new View.OnClickListener() {
         public void onClick(View view) {
-            if (ScanSettingsActivity.this.scanInfo.getIp().equals("")) {
+            if  (scanInfo.getIp().equals("")) {
                 return;
             }
-            if (ScanSettingsActivity.this.progressGetOption == null || !ScanSettingsActivity.this.progressGetOption.isShown()) {
+            if  (progressGetOption == null || !ScanSettingsActivity.this.progressGetOption.isShown()) {
                 ScanSettingsActivity scanSettingsActivity = ScanSettingsActivity.this;
                 scanSettingsActivity.startDetailSettingScreenForResult(Constants.SCAN_SETTINGS_DETAIL_TITLE, R.string.str_settings_color_title, scanSettingsActivity.scanInfo.getColorValue(), 5);
             }
@@ -107,10 +107,10 @@ public class ScanSettingsActivity extends ActivityIACommon {
     };
     private View.OnClickListener mLLScanSettingsResolution = new View.OnClickListener() {
         public void onClick(View view) {
-            if (ScanSettingsActivity.this.scanInfo.getIp().equals("")) {
+            if  (scanInfo.getIp().equals("")) {
                 return;
             }
-            if (ScanSettingsActivity.this.progressGetOption == null || !ScanSettingsActivity.this.progressGetOption.isShown()) {
+            if  (progressGetOption == null || !ScanSettingsActivity.this.progressGetOption.isShown()) {
                 ScanSettingsActivity scanSettingsActivity = ScanSettingsActivity.this;
                 scanSettingsActivity.startDetailSettingScreenForResult(Constants.SCAN_SETTINGS_DETAIL_TITLE, R.string.str_settings_resolution_title, scanSettingsActivity.scanInfo.getResolutionValue(), 6);
             }
@@ -124,10 +124,10 @@ public class ScanSettingsActivity extends ActivityIACommon {
     };
     private View.OnClickListener mLLScanSettingsSource = new View.OnClickListener() {
         public void onClick(View view) {
-            if (ScanSettingsActivity.this.scanInfo.getIp().equals("")) {
+            if  (scanInfo.getIp().equals("")) {
                 return;
             }
-            if (ScanSettingsActivity.this.progressGetOption == null || !ScanSettingsActivity.this.progressGetOption.isShown()) {
+            if  (progressGetOption == null || !ScanSettingsActivity.this.progressGetOption.isShown()) {
                 ScanSettingsActivity.this.startInputUnitSettingActivity();
             }
         }

+ 2 - 2
app/src/main/java/epson/scan/activity/ScanSettingsAdvanceDetailActivity.java

@@ -35,9 +35,9 @@ public class ScanSettingsAdvanceDetailActivity extends ActivityIACommon {
                 if (access$000 == R.string.str_settings_2sided_title) {
                     int unused = ScanSettingsAdvanceDetailActivity.this.lastValue = detailSettingHolder.value;
                     String unused2 = ScanSettingsAdvanceDetailActivity.this.strSelText = detailSettingHolder.text.getText().toString();
-                    ScanSettingsAdvanceDetailActivity.this.ssdAdapter.setSelected(ScanSettingsAdvanceDetailActivity.this.lastValue);
+                    ScanSettingsAdvanceDetailActivity.this.ssdAdapter.setSelected (lastValue);
                     ScanSettingsAdvanceDetailActivity.this.ssdAdapter.notifyDataSetChanged();
-                    if (ScanSettingsAdvanceDetailActivity.this.lastValue == 1) {
+                    if  (lastValue == 1) {
                         ScanSettingsAdvanceDetailActivity.this.listSelect2.setVisibility(View.VISIBLE);
                     } else {
                         ScanSettingsAdvanceDetailActivity.this.listSelect2.setVisibility(View.GONE);

+ 11 - 11
app/src/main/java/epson/server/screens/StorageServer.java

@@ -109,10 +109,10 @@ public class StorageServer extends ActivityIACommon implements CommonDefine {
                 boolean z = StorageServer.mScanSaveAction;
                 switch (intExtra) {
                     case 1:
-                        StorageServer.this.startActivity(StorageProcessDownloadActivity.getStartIntent(StorageServer.this.getApplicationContext(), StorageServiceClient.STORAGE_EVERNOTE));
+                        StorageServer.this.startActivity (getApplicationContext(), StorageServiceClient.STORAGE_EVERNOTE));
                         return;
                     case 2:
-                        Intent processIntent = StorageProcessActivity.getProcessIntent(StorageServer.this.getBaseContext(), StorageServiceClient.STORAGE_EVERNOTE, StorageProcessActivity.ProcessType.UPLOAD);
+                        Intent processIntent = StorageProcessActivity.getProcessIntent (getBaseContext(), StorageServiceClient.STORAGE_EVERNOTE, StorageProcessActivity.ProcessType.UPLOAD);
                         processIntent.putStringArrayListExtra(StorageProcessActivity.EXTRA_UPLOADFILE_LIST, StorageServer.mScanedFilePath);
                         StorageServer.this.startActivity(processIntent);
                         return;
@@ -125,10 +125,10 @@ public class StorageServer extends ActivityIACommon implements CommonDefine {
             public void onClick(View view) {
                 switch (intExtra) {
                     case 1:
-                        StorageServer.this.startActivity(new Intent(StorageServer.this.getApplicationContext(), ListAndDownloadActivity.class));
+                        StorageServer.this.startActivity(new Intent (getApplicationContext(), ListAndDownloadActivity.class));
                         return;
                     case 2:
-                        Intent processIntent = StorageProcessActivity.getProcessIntent(StorageServer.this.getBaseContext(), StorageServiceClient.STORAGE_GOOGLEDRIVE, StorageProcessActivity.ProcessType.UPLOAD);
+                        Intent processIntent = StorageProcessActivity.getProcessIntent (getBaseContext(), StorageServiceClient.STORAGE_GOOGLEDRIVE, StorageProcessActivity.ProcessType.UPLOAD);
                         processIntent.putStringArrayListExtra(StorageProcessActivity.EXTRA_UPLOADFILE_LIST, StorageServer.mScanedFilePath);
                         StorageServer.this.startActivity(processIntent);
                         return;
@@ -142,10 +142,10 @@ public class StorageServer extends ActivityIACommon implements CommonDefine {
                 boolean z = StorageServer.mScanSaveAction;
                 switch (intExtra) {
                     case 1:
-                        StorageServer.this.startActivity(StorageProcessDownloadActivity.getStartIntent(StorageServer.this.getApplicationContext(), StorageServiceClient.STORAGE_DROPBOX));
+                        StorageServer.this.startActivity (getApplicationContext(), StorageServiceClient.STORAGE_DROPBOX));
                         return;
                     case 2:
-                        Intent processIntent = StorageProcessActivity.getProcessIntent(StorageServer.this.getBaseContext(), StorageServiceClient.STORAGE_DROPBOX, StorageProcessActivity.ProcessType.UPLOAD);
+                        Intent processIntent = StorageProcessActivity.getProcessIntent (getBaseContext(), StorageServiceClient.STORAGE_DROPBOX, StorageProcessActivity.ProcessType.UPLOAD);
                         processIntent.putStringArrayListExtra(StorageProcessActivity.EXTRA_UPLOADFILE_LIST, StorageServer.mScanedFilePath);
                         StorageServer.this.startActivity(processIntent);
                         return;
@@ -162,10 +162,10 @@ public class StorageServer extends ActivityIACommon implements CommonDefine {
                 }
                 switch (intExtra) {
                     case 1:
-                        StorageServer.this.startActivity(StorageProcessDownloadActivity.getStartIntent(StorageServer.this.getApplicationContext(), StorageServiceClient.STORAGE_BOX));
+                        StorageServer.this.startActivity (getApplicationContext(), StorageServiceClient.STORAGE_BOX));
                         return;
                     case 2:
-                        Intent processIntent = StorageProcessActivity.getProcessIntent(StorageServer.this.getBaseContext(), StorageServiceClient.STORAGE_BOX, StorageProcessActivity.ProcessType.UPLOAD);
+                        Intent processIntent = StorageProcessActivity.getProcessIntent (getBaseContext(), StorageServiceClient.STORAGE_BOX, StorageProcessActivity.ProcessType.UPLOAD);
                         processIntent.putStringArrayListExtra(StorageProcessActivity.EXTRA_UPLOADFILE_LIST, StorageServer.mScanedFilePath);
                         StorageServer.this.startActivity(processIntent);
                         return;
@@ -178,10 +178,10 @@ public class StorageServer extends ActivityIACommon implements CommonDefine {
             public void onClick(View view) {
                 switch (intExtra) {
                     case 1:
-                        StorageServer.this.startActivity(StorageProcessDownloadActivity.getStartIntent(StorageServer.this.getApplicationContext(), StorageServiceClient.STORAGE_ONEDRIVE));
+                        StorageServer.this.startActivity (getApplicationContext(), StorageServiceClient.STORAGE_ONEDRIVE));
                         return;
                     case 2:
-                        Intent processIntent = OneDriveStorageProcessUploadActivity.getProcessIntent(StorageServer.this.getBaseContext(), StorageServiceClient.STORAGE_ONEDRIVE, StorageProcessActivity.ProcessType.UPLOAD);
+                        Intent processIntent = OneDriveStorageProcessUploadActivity.getProcessIntent (getBaseContext(), StorageServiceClient.STORAGE_ONEDRIVE, StorageProcessActivity.ProcessType.UPLOAD);
                         processIntent.putStringArrayListExtra(StorageProcessActivity.EXTRA_UPLOADFILE_LIST, StorageServer.mScanedFilePath);
                         StorageServer.this.startActivity(processIntent);
                         return;
@@ -212,7 +212,7 @@ public class StorageServer extends ActivityIACommon implements CommonDefine {
                 Intent intent = new Intent();
                 intent.putStringArrayListExtra(Define.SAVING_FILE_PATH, StorageServer.mScanedFilePath);
                 intent.putExtra("for", 6);
-                intent.setClass(StorageServer.this.getBaseContext(), UploadScreen.class);
+                intent.setClass (getBaseContext(), UploadScreen.class);
                 StorageServer.this.startActivity(intent);
             }
         });