liuyuqi-dellpc 3 years ago
parent
commit
0cdb84893e
40 changed files with 145 additions and 145 deletions
  1. 24 24
      app/src/main/java/com/epson/iprint/storage/onedrive/OneDriveClient.java
  2. 3 3
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectStart.java
  3. 2 2
      app/src/main/java/epson/maintain/activity/MaintainActivity.java
  4. 1 1
      app/src/main/java/epson/maintain/activity/MaintainPrinterSearchActivity.java
  5. 3 3
      app/src/main/java/epson/print/ActivityNfcPrinter.java
  6. 1 1
      app/src/main/java/epson/print/copy/Component/ecopycomponent/ECopyPreview.java
  7. 2 2
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyPhotoTask.java
  8. 1 1
      app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyTask.java
  9. 2 2
      app/src/main/java/epson/print/copy/CopyScaleActivity.java
  10. 2 2
      app/src/main/java/epson/print/copy/CopySettingActivity.java
  11. 2 2
      app/src/main/java/epson/print/fileBrower.java
  12. 1 1
      app/src/main/java/epson/print/imgsel/ImageViewMultiSelectFragment.java
  13. 1 1
      app/src/main/java/epson/print/inkrpln/JumpUrlFragment.java
  14. 2 2
      app/src/main/java/epson/print/pdf/pdfRender.java
  15. 1 1
      app/src/main/java/epson/print/phlayout/BorderedLayoutPosition.java
  16. 1 1
      app/src/main/java/epson/print/phlayout/BorderlessLayoutPosition.java
  17. 1 1
      app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/RemoteCopyTask.java
  18. 3 3
      app/src/main/java/epson/print/rpcopy/CopyActivity.java
  19. 2 2
      app/src/main/java/epson/print/rpcopy/CopySettingActivity.java
  20. 1 1
      app/src/main/java/epson/print/screen/ActivityIpPrinterSetting.java
  21. 1 1
      app/src/main/java/epson/print/screen/ActivityPrinterSetting.java
  22. 3 3
      app/src/main/java/epson/print/screen/PrintProgress.java
  23. 1 1
      app/src/main/java/epson/print/screen/PrintProgressParams.java
  24. 1 1
      app/src/main/java/epson/print/screen/PrintSetting.java
  25. 1 1
      app/src/main/java/epson/print/screen/PrinterFinder.java
  26. 44 44
      app/src/main/java/epson/print/screen/PrinterInfoDetail.java
  27. 2 2
      app/src/main/java/epson/print/screen/SearchPrinterScr.java
  28. 1 1
      app/src/main/java/epson/print/screen/SettingScr.java
  29. 1 1
      app/src/main/java/epson/print/service/CreatePrintImageThread.java
  30. 1 1
      app/src/main/java/epson/print/service/EpsonService.java
  31. 1 1
      app/src/main/java/epson/print/service/PdfRenderThread.java
  32. 1 1
      app/src/main/java/epson/print/service/PdfRenderingController.java
  33. 2 2
      app/src/main/java/epson/print/storage/StorageProcessUploadActivity.java
  34. 17 17
      app/src/main/java/epson/print/storage/onedrive/OneDriveClient.java
  35. 4 4
      app/src/main/java/epson/scan/activity/ScanActivity.java
  36. 1 1
      app/src/main/java/epson/scan/activity/ScanBaseView.java
  37. 2 2
      app/src/main/java/epson/scan/activity/ScanSearchActivity.java
  38. 3 3
      app/src/main/java/epson/scan/activity/ScanSettingsActivity.java
  39. 1 1
      app/src/main/java/epson/scan/activity/ScanSettingsAdvanceDensityActivity.java
  40. 1 1
      app/src/main/java/epson/scan/lib/CancelableFind.java

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

@@ -90,17 +90,17 @@ public class OneDriveClient extends StorageServiceClient {
 
             public void enumerate(StorageItem storageItem, final StorageServiceClient.EnumerateCompletion enumerateCompletion, final StorageServiceClient.SigninCompletion signinCompletion) {
                 if (storageItem.path.isEmpty()) {
-                    OneDriveClient.this.getClient((Activity) context, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
+                    getClient((Activity) context, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
                         public void onNotifyOneDriveClient(IOneDriveClient iOneDriveClient) {
                             if (iOneDriveClient != null) {
                                 StorageServiceClient.SigninCompletion signinCompletion = signinCompletion;
                                 if (signinCompletion != null) {
                                     signinCompletion.onSigninCompletion();
                                 }
-                                OneDriveClient.this.getRootFolder(iOneDriveClient, enumerateCompletion);
+                                getRootFolder(iOneDriveClient, enumerateCompletion);
                                 return;
                             }
-                            enumerateCompletion.onEnumerateComplete(OneDriveClient.this.mStorageItemList, StorageServiceClient.ProcessError.ERROR);
+                            enumerateCompletion.onEnumerateComplete(mStorageItemList, StorageServiceClient.ProcessError.ERROR);
                         }
                     });
                     return;
@@ -124,12 +124,12 @@ public class OneDriveClient extends StorageServiceClient {
         }
         logOut(iOneDriveClient, new ICallback<Void>() {
             public void success(Void voidR) {
-                IOneDriveClient unused = OneDriveClient.this.oneDriveClient = null;
+                IOneDriveClient unused = oneDriveClient = null;
             }
 
             public void failure(ClientException clientException) {
                 clientException.printStackTrace();
-                IOneDriveClient unused = OneDriveClient.this.oneDriveClient = null;
+                IOneDriveClient unused = oneDriveClient = null;
             }
         });
         return false;
@@ -148,7 +148,7 @@ public class OneDriveClient extends StorageServiceClient {
         return getCallbackCollectionPage(new OnOneDriveClientListener() {
             public void onNotifyOneDriveClientCollectionPage(List<StorageItem> list) {
                 if (list != null) {
-                    list = OneDriveClient.this.getPrintableItems(list);
+                    list = getPrintableItems(list);
                 }
                 enumerateCompletion.onEnumerateComplete(list, list != null ? StorageServiceClient.ProcessError.NONE : StorageServiceClient.ProcessError.ERROR);
             }
@@ -178,9 +178,9 @@ public class OneDriveClient extends StorageServiceClient {
                     List currentPage = iItemCollectionPage.getCurrentPage();
                     if (currentPage != null) {
                         for (int i = 0; i < currentPage.size(); i++) {
-                            StorageItem access$600 = OneDriveClient.this.getStorageItem((Item) currentPage.get(i));
+                            StorageItem access$600 = getStorageItem((Item) currentPage.get(i));
                             if (access$600 != null) {
-                                OneDriveClient.this.mStorageItemList.add(access$600);
+                                mStorageItemList.add(access$600);
                             }
                         }
                         if (iItemCollectionPage.getNextPage() != null) {
@@ -188,7 +188,7 @@ public class OneDriveClient extends StorageServiceClient {
                             oneDriveClient.getNextPage(iItemCollectionPage, oneDriveClient.getCallbackCollectionPage(onOneDriveClientListener));
                             return;
                         }
-                        result(OneDriveClient.this.mStorageItemList);
+                        result(mStorageItemList);
                         return;
                     }
                     result((List<StorageItem>) null);
@@ -301,10 +301,10 @@ public class OneDriveClient extends StorageServiceClient {
     private void getOneDriveClient(Activity activity, final OneDriveAuthenticator.OnOneDriveAuthenticatorListener onOneDriveAuthenticatorListener) {
         OneDriveAuthenticator.getOneDriveClient(activity, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
             public void onNotifyOneDriveClient(IOneDriveClient iOneDriveClient) {
-                IOneDriveClient unused = OneDriveClient.this.oneDriveClient = iOneDriveClient;
+                IOneDriveClient unused = oneDriveClient = iOneDriveClient;
                 OneDriveAuthenticator.OnOneDriveAuthenticatorListener onOneDriveAuthenticatorListener = onOneDriveAuthenticatorListener;
                 if (onOneDriveAuthenticatorListener != null) {
-                    onOneDriveAuthenticatorListener.onNotifyOneDriveClient(OneDriveClient.this.oneDriveClient);
+                    onOneDriveAuthenticatorListener.onNotifyOneDriveClient(oneDriveClient);
                 }
             }
         });
@@ -314,9 +314,9 @@ public class OneDriveClient extends StorageServiceClient {
         getClient(activity, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
             public void onNotifyOneDriveClient(IOneDriveClient iOneDriveClient) {
                 if (iOneDriveClient != null) {
-                    OneDriveClient.this.getRootFolder(iOneDriveClient, enumerateCompletion);
+                    getRootFolder(iOneDriveClient, enumerateCompletion);
                 } else {
-                    enumerateCompletion.onEnumerateComplete(OneDriveClient.this.mStorageItemList, StorageServiceClient.ProcessError.ERROR);
+                    enumerateCompletion.onEnumerateComplete(mStorageItemList, StorageServiceClient.ProcessError.ERROR);
                 }
             }
         });
@@ -326,15 +326,15 @@ public class OneDriveClient extends StorageServiceClient {
         getRoot(iOneDriveClient, new ICallback<Item>() {
             public void success(Item item) {
                 if (item != null) {
-                    OneDriveClient.this.getItems(iOneDriveClient, item.f323id, enumerateCompletion);
+                    getItems(iOneDriveClient, item.f323id, enumerateCompletion);
                 } else {
-                    enumerateCompletion.onEnumerateComplete(OneDriveClient.this.mStorageItemList, StorageServiceClient.ProcessError.ERROR);
+                    enumerateCompletion.onEnumerateComplete(mStorageItemList, StorageServiceClient.ProcessError.ERROR);
                 }
             }
 
             public void failure(ClientException clientException) {
                 clientException.printStackTrace();
-                enumerateCompletion.onEnumerateComplete(OneDriveClient.this.mStorageItemList, StorageServiceClient.ProcessError.ERROR);
+                enumerateCompletion.onEnumerateComplete(mStorageItemList, StorageServiceClient.ProcessError.ERROR);
             }
         });
     }
@@ -525,10 +525,10 @@ public class OneDriveClient extends StorageServiceClient {
                 inputStream = null;
                 boolean z = false;
                 bCanceled = false;
-                bConvertPdf = OneDriveClient.this.isConvertPdfExtension((Item) OneDriveDownloader.this.mStorageItem.userInfo) || OneDriveClient.this.isConvertPdfMimeType((Item) OneDriveDownloader.this.mStorageItem.userInfo);
+                bConvertPdf = isConvertPdfExtension((Item) OneDriveDownloader.this.mStorageItem.userInfo) || isConvertPdfMimeType((Item) OneDriveDownloader.this.mStorageItem.userInfo);
                 if (bConvertPdf && !this.bCanceled) {
                     try {
-                        inputStream = OneDriveClient.this.getDownloadInputStreamPdf(OneDriveClient.this.oneDriveClient, OneDriveDownloader.this.mItemid);
+                        inputStream = getDownloadInputStreamPdf(oneDriveClient, OneDriveDownloader.this.mItemid);
                     } catch (ClientException e) {
                         e.printStackTrace();
                         if (e.isError(OneDriveErrorCodes.NotSupported)) {
@@ -540,13 +540,13 @@ public class OneDriveClient extends StorageServiceClient {
                 }
                 if (bConvertPdf && !this.bCanceled) {
                     try {
-                        inputStream = OneDriveClient.this.getDownloadInputStream(OneDriveClient.this.oneDriveClient, OneDriveDownloader.this.mItemid);
+                        inputStream = getDownloadInputStream(oneDriveClient, OneDriveDownloader.this.mItemid);
                     } catch (ClientException e2) {
                         e2.printStackTrace();
                         inputStream = null;
                     }
                 }
-                String access$1600 = bConvertPdf ? OneDriveClient.this.getConvertPdfName(OneDriveDownloader.this.mWriteFilename) : OneDriveDownloader.this.mWriteFilename;
+                String access$1600 = bConvertPdf ? getConvertPdfName(OneDriveDownloader.this.mWriteFilename) : OneDriveDownloader.this.mWriteFilename;
                 if (inputStream != null && !this.bCanceled) {
                     try {
                         File file = new File(access$1600);
@@ -614,14 +614,14 @@ public class OneDriveClient extends StorageServiceClient {
         }
 
         public void start(StorageServiceClient.UploadCompletion uploadCompletion) {
-            StorageServiceClient.ProcessError unused = OneDriveClient.this.mUploadProcessError = StorageServiceClient.ProcessError.NONE;
+            StorageServiceClient.ProcessError unused = mUploadProcessError = StorageServiceClient.ProcessError.NONE;
             OneDriveClient oneDriveClient = OneDriveClient.this;
             if (!oneDriveClient.isExpired(oneDriveClient.oneDriveClient)) {
                 mLocalUploader = new LocalUploader(mActivity, mOrgFilePath, mUploadPath, uploadCompletion);
                 AsyncTask.THREAD_POOL_EXECUTOR.execute(mLocalUploader);
                 return;
             }
-            StorageServiceClient.ProcessError unused2 = OneDriveClient.this.mUploadProcessError = StorageServiceClient.ProcessError.RETRY;
+            StorageServiceClient.ProcessError unused2 = mUploadProcessError = StorageServiceClient.ProcessError.RETRY;
             uploadCompletion.onUploadComplete("", "", StorageServiceClient.ProcessError.RETRY);
         }
 
@@ -675,13 +675,13 @@ public class OneDriveClient extends StorageServiceClient {
         private void upload(int i) {
             uploadSession = null;
             try {
-                uploadSession = OneDriveClient.this.getUploadSession(OneDriveClient.this.oneDriveClient, "/Epson iPrint/" + mUploadFilename);
+                uploadSession = getUploadSession(oneDriveClient, "/Epson iPrint/" + mUploadFilename);
             } catch (ClientException e) {
                 e.printStackTrace();
             }
             UploadSession uploadSession2 = uploadSession;
             if (uploadSession2 != null) {
-                OneDriveClient.this.uploadLargeFile(uploadSession2, fileInputStream, i, new IProgressCallback<Item>() {
+                uploadLargeFile(uploadSession2, fileInputStream, i, new IProgressCallback<Item>() {
                     public void success(Item item) {
                         boolean unused = LocalUploader.this.result = true;
                     }

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

@@ -19,17 +19,17 @@ public class ActivityWiFiDirectStart extends ActivityWiFiDirectBase {
             public void onClick(View view) {
                 Intent intent = new Intent(ActivityWiFiDirectStart.this, ActivityControlWiFi.class);
                 intent.putExtra(ActivityControlWiFi.SHOWPROGRESS, true);
-                ActivityWiFiDirectStart.this.startActivityForResult(intent, 1);
+                startActivityForResult(intent, 1);
             }
         });
         findViewById(R.id.width_lcd).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                ActivityWiFiDirectStart.this.startWifiManualSetup(false);
+                startWifiManualSetup(false);
             }
         });
         findViewById(R.id.no_lcd).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                ActivityWiFiDirectStart.this.startWifiManualSetup(true);
+                startWifiManualSetup(true);
             }
         });
     }

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

@@ -1012,7 +1012,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 edit2.commit();
                 return;
             case R.id.togglePreview /*2131231563*/:
-                if (!this.btnTogglePreview.isChecked()) {
+                if (!btnTogglePreview.isChecked()) {
                     SharedPreferences.Editor edit3 = getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).edit();
                     edit3.putBoolean(Constants.ENABLE_SHOW_PREVIEW, false);
                     edit3.commit();
@@ -1504,7 +1504,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         interrupMaintainThread();
         endBackGroundThread();
         mUiHandler.removeMessages(16);
-        if (!this.isKeepSimpleAPConnection) {
+        if (!isKeepSimpleAPConnection) {
             WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, printerIp);
         }
         super.onPause();

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

@@ -191,7 +191,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
     }
 
     private void requestLocationPermission() {
-        if (!this.bRejectLocationPermission && !ActivityRequestLocationPermission.canAccessWiFiInfo(this, 20)) {
+        if (!bRejectLocationPermission && !ActivityRequestLocationPermission.canAccessWiFiInfo(this, 20)) {
             if (BleWork.isStartBleProcess(this, false)) {
                 ActivityRequestLocationPermission.requestLocationPermission((Activity) this, 14);
             } else if (Build.VERSION.SDK_INT > 28 && !WiFiNetworkManager.getInsetance(this).isWiFiValidated()) {

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

@@ -476,9 +476,9 @@ public class ActivityNfcPrinter extends Activity {
         strIpAddressV4 = connectInfo.ipAddressV4;
         strIpAddressV4SimpleAP = connectInfo.ipAddressV4SimpleAP;
         printerStatus = connectInfo.printerStatus;
-        if (!this.connectInfo.hasOwnAAR(this)) {
+        if (!connectInfo.hasOwnAAR(this)) {
             showErrorMessage(R.string.nfc_connect_error_aar_title, R.string.nfc_connect_error_aar);
-        } else if (!this.connectInfo.isTagWithInterface() || (printerStatus & 1) != 0) {
+        } else if (!connectInfo.isTagWithInterface() || (printerStatus & 1) != 0) {
             nChangeMode = getIntent().getIntExtra(CHANGEMODE, 0);
             if (!WiFiDirectManager.isWifiEnabled(this)) {
                 status = NfcStatus.ENABLING_WIFI;
@@ -528,7 +528,7 @@ public class ActivityNfcPrinter extends Activity {
                             retrystatus = NfcSimpleApRetryStatus.RETRY_CONNECTION;
                             mHandler.sendEmptyMessage(10);
                             return;
-                        } else if (!this.connectInfo.isTagWithInterface() || (printerStatus & 256) == 0) {
+                        } else if (!connectInfo.isTagWithInterface() || (printerStatus & 256) == 0) {
                             showErrorMessage(R.string.nfc_connect_error_title, R.string.nfc_connect_erorr_wifi);
                             return;
                         } else {

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

@@ -259,7 +259,7 @@ public class ECopyPreview extends View {
         }
         canvas.drawBitmap(layout.getBitmap(), (float) offset.x, (float) offset.y, paint);
         RectF copyFrame = layout.getCopyFrame();
-        if (!this.paperFrame.isEmpty() && copyFrame != null) {
+        if (!paperFrame.isEmpty() && copyFrame != null) {
             copyFrame.offset((float) offset.x, (float) offset.y);
             Path path = new Path();
             path.addRect(copyFrame, Path.Direction.CW);

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

@@ -291,7 +291,7 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
 
     protected Result doInBackground(Void... voidArr) {
         operation.setHostIP(systemSettings.getPrinterIPAddress());
-        if (!this.photoSetting.parse()) {
+        if (!photoSetting.parse()) {
             return new Result(ERemoteOperation.ERemoteParam.x_invalid_photo_setting);
         }
         ERemoteOperation.ERemoteReasonResult startCopy = startCopy();
@@ -303,7 +303,7 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
         boolean z2 = false;
         while (!z) {
             if (cancelRequested && !z2) {
-                if (!this.operation.cancel(cancelParameter).success()) {
+                if (!operation.cancel(cancelParameter).success()) {
                     return new Result(ERemoteOperation.ERemoteParam.canceled);
                 }
                 z2 = true;

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

@@ -424,7 +424,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
         boolean z2 = false;
         while (!z) {
             if (cancelRequested && !z2) {
-                if (!this.operation.cancel(cancelParameter).success()) {
+                if (!operation.cancel(cancelParameter).success()) {
                     return new Result(ERemoteOperation.ERemoteParam.canceled);
                 }
                 z2 = true;

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

@@ -317,7 +317,7 @@ public class CopyScaleActivity extends ActivityBase {
         super.onResume();
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
             isTryConnectSimpleAp = false;
-        } else if (!this.isTryConnectSimpleAp) {
+        } else if (!isTryConnectSimpleAp) {
             isTryConnectSimpleAp = true;
             if (WiFiDirectManager.reconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
                 isKeepSimpleAPConnection = true;
@@ -327,7 +327,7 @@ public class CopyScaleActivity extends ActivityBase {
 
     protected void onPause() {
         super.onPause();
-        if (!this.isKeepSimpleAPConnection) {
+        if (!isKeepSimpleAPConnection) {
             WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, ActivityBase.printerIp);
         }
     }

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

@@ -141,7 +141,7 @@ public class CopySettingActivity extends ActivityBase {
         super.onResume();
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
             isTryConnectSimpleAp = false;
-        } else if (!this.isTryConnectSimpleAp) {
+        } else if (!isTryConnectSimpleAp) {
             isTryConnectSimpleAp = true;
             if (WiFiDirectManager.reconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
                 isKeepSimpleAPConnection = true;
@@ -151,7 +151,7 @@ public class CopySettingActivity extends ActivityBase {
 
     protected void onPause() {
         super.onPause();
-        if (!this.isKeepSimpleAPConnection) {
+        if (!isKeepSimpleAPConnection) {
             WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, ActivityBase.printerIp);
         }
     }

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

@@ -430,7 +430,7 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
                     if (isFilePdf(file.getAbsolutePath())) {
                         getFileShow(file.getAbsolutePath());
                     }
-                    if (!file.getAbsolutePath().equals("/mnt/secure") && !file.getAbsolutePath().equals("/mnt/asec") && !file.getAbsolutePath().equals("/mnt/.lfs") && !file.getAbsolutePath().equals("/mnt/obb") && ((!this.currentDirectory.getAbsolutePath().equals(CommonDefine.MNT) || !file.isDirectory() || file.listFiles() != null) && getFileShow(file.getAbsolutePath()))) {
+                    if (!file.getAbsolutePath().equals("/mnt/secure") && !file.getAbsolutePath().equals("/mnt/asec") && !file.getAbsolutePath().equals("/mnt/.lfs") && !file.getAbsolutePath().equals("/mnt/obb") && ((!currentDirectory.getAbsolutePath().equals(CommonDefine.MNT) || !file.isDirectory() || file.listFiles() != null) && getFileShow(file.getAbsolutePath()))) {
                         directoryEntries.add(file.getAbsolutePath().substring(length));
                         directotyEntries_new_v2.add(createIcon(file.getAbsolutePath()));
                     }
@@ -441,7 +441,7 @@ public class fileBrower extends ActivityIACommon implements CommonDefine {
         }
         setTitle(currentDirectory.getAbsolutePath());
         Log.v("getparent", currentDirectory.getParent());
-        if (!this.currentDirectory.getParent().equals(RootPath)) {
+        if (!currentDirectory.getParent().equals(RootPath)) {
             Log.v("compare", "not equals");
             Log.v("getparent currentDirectory", currentDirectory.getParent());
             directoryEntries.add(0, "..");

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

@@ -79,7 +79,7 @@ public class ImageViewMultiSelectFragment extends ImageViewBaseFragment {
         }
 
         private void toggleCheckStatus() {
-            setMyChecked(!this.mToggleImage.isSelected());
+            setMyChecked(!mToggleImage.isSelected());
         }
 
         public void forceSetChecked(boolean z) {

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

@@ -108,7 +108,7 @@ public class JumpUrlFragment extends Fragment {
     }
 
     private void requestShowErrorDialogAndFinishActivity() {
-        if (!this.mFragmentForeground) {
+        if (!mFragmentForeground) {
             mFragmentStatus = FragmentStatus.WAITE_DIALOG_SHOW;
         } else if (((LocalAlertDialogFragment) getFragmentManager().findFragmentByTag(DIALOG_TAG)) == null) {
             LocalAlertDialogFragment.newInstance(getString(R.string.EC_ERR_COMM_ERROR), R.string.fw_error_connect_server, 0).show(getFragmentManager(), DIALOG_TAG);

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

@@ -169,7 +169,7 @@ public class pdfRender implements CommonDefine {
     }
 
     public boolean rotate() {
-        while (!this.mRotateCheck) {
+        while (!mRotateCheck) {
             try {
                 Thread.sleep(10);
             } catch (Exception e) {
@@ -204,7 +204,7 @@ public class pdfRender implements CommonDefine {
                     i4 = !this.mRotate ? 0 : EPImage.EPS_ROTATE_270;
                 }
                 int i5 = (GetPageSizeX > GetPageSizeY ? 1 : (GetPageSizeX == GetPageSizeY ? 0 : -1));
-                float f2 = (float) (!this.mPreviewmode ? 4209 : 702);
+                float f2 = (float) (!mPreviewmode ? 4209 : 702);
                 float f3 = f2 / GetPageSizeX;
                 float f4 = f2 / GetPageSizeY;
                 if (f3 <= f4) {

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

@@ -100,7 +100,7 @@ public class BorderedLayoutPosition implements ILayoutPosition {
     public void calculateLayoutSizeBordered(int i, int i2, Point point) {
         int i3;
         int i4;
-        if ((!this.mIsPaperLandScape || m3mmWidth > m3mmHeight) && (mIsPaperLandScape || m3mmWidth <= m3mmHeight)) {
+        if ((!mIsPaperLandScape || m3mmWidth > m3mmHeight) && (mIsPaperLandScape || m3mmWidth <= m3mmHeight)) {
             i3 = (int) (((double) i2) * 0.800000011920929d);
             int i5 = m3mmWidth;
             int i6 = m3mmHeight;

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

@@ -119,7 +119,7 @@ class BorderlessLayoutPosition implements ILayoutPosition {
         int i9 = i2;
         Point point2 = point;
         int[] iArr = new int[4];
-        if ((!this.mIsPaperLandScape || mPaperWidth > mPaperHeight) && (mIsPaperLandScape || mPaperWidth <= mPaperHeight)) {
+        if ((!mIsPaperLandScape || mPaperWidth > mPaperHeight) && (mIsPaperLandScape || mPaperWidth <= mPaperHeight)) {
             int i10 = (int) (((double) i9) * 0.800000011920929d);
             int i11 = mPaperWidth;
             int i12 = mPaperHeight;

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

@@ -457,7 +457,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
         boolean z2 = false;
         while (!z) {
             if (cancelRequested && !z2) {
-                if (!this.operation.cancel(cancelParameter).success()) {
+                if (!operation.cancel(cancelParameter).success()) {
                     return new Result(ERemoteOperation.ERemoteParam.canceled);
                 }
                 z2 = true;

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

@@ -149,7 +149,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         if (copyProcess2 == null || !copyProcess2.isProccessing()) {
             if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
                 isTryConnectSimpleAp = false;
-            } else if (!this.isTryConnectSimpleAp) {
+            } else if (!isTryConnectSimpleAp) {
                 isTryConnectSimpleAp = true;
                 if (WiFiDirectManager.reconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
                     isKeepSimpleAPConnection = true;
@@ -158,7 +158,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                 }
             }
             loading.show();
-            if (!this.bProbedPrinter) {
+            if (!bProbedPrinter) {
                 mHandler.sendEmptyMessage(0);
             } else {
                 mHandler.sendEmptyMessage(2);
@@ -180,7 +180,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             CopyProcess copyProcess2 = copyProcess;
             if (copyProcess2 != null && copyProcess2.isProccessing()) {
                 copyProcess.setDisconnectWifi(true);
-            } else if (!this.isKeepSimpleAPConnection) {
+            } else if (!isKeepSimpleAPConnection) {
                 WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, ActivityBase.printerIp);
             }
         }

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

@@ -141,7 +141,7 @@ public class CopySettingActivity extends ActivityBase {
         super.onResume();
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
             isTryConnectSimpleAp = false;
-        } else if (!this.isTryConnectSimpleAp) {
+        } else if (!isTryConnectSimpleAp) {
             isTryConnectSimpleAp = true;
             if (WiFiDirectManager.reconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
                 isKeepSimpleAPConnection = true;
@@ -151,7 +151,7 @@ public class CopySettingActivity extends ActivityBase {
 
     protected void onPause() {
         super.onPause();
-        if (!this.isKeepSimpleAPConnection) {
+        if (!isKeepSimpleAPConnection) {
             WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, ActivityBase.printerIp);
         }
     }

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

@@ -196,7 +196,7 @@ public class ActivityIpPrinterSetting extends ActivityIACommon {
                         }
                         ActivityIpPrinterSetting activityIpPrinterSetting = ActivityIpPrinterSetting.this;
                         Utils.makeMessageBox(activityIpPrinterSetting, activityIpPrinterSetting.getString(numArr[1].intValue()), ActivityIpPrinterSetting.this.getString(numArr[0].intValue()), ActivityIpPrinterSetting.this.getString(R.string.str_ok)).show();
-                    } else if (!this.bAddNewPrinter || ActivityIpPrinterSetting.this.manager.loadIpPrinterInfo(ActivityIpPrinterSetting.this.printerInfo.printerID) == null) {
+                    } else if (!bAddNewPrinter || ActivityIpPrinterSetting.this.manager.loadIpPrinterInfo(ActivityIpPrinterSetting.this.printerInfo.printerID) == null) {
                         if (ActivityIpPrinterSetting.this.oldItemKey != null && ActivityIpPrinterSetting.this.oldItemKey.length() > 0) {
                             ActivityIpPrinterSetting.this.manager.deleteIpPrinterInfo(ActivityIpPrinterSetting.this.oldItemKey);
                         }

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

@@ -184,7 +184,7 @@ public class ActivityPrinterSetting extends ActivityIACommon implements View.OnC
                         printerNameText.setVisibility(0);
                         printerNameLayout.setVisibility(0);
                         printerAccessKey = loadRemotePrinterInfo.printerAccessKey;
-                        if (!this.printerAccessKey.equals("")) {
+                        if (!printerAccessKey.equals("")) {
                             accessKeyEdit.setText(printerAccessKey);
                             accessKeyText.setVisibility(0);
                             accessKeyLayout.setVisibility(0);

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

@@ -787,7 +787,7 @@ public class PrintProgress extends Activity implements CommonDefine {
             TextView textView3 = mPercent;
             textView3.setText(percentString + "         0%");
             mProgressPercent.setProgress(0);
-            if (!this.mProgressParams.getEpsonColorMode()) {
+            if (!mProgressParams.getEpsonColorMode()) {
                 i = 8;
             }
             findViewById(R.id.epsonColorImageView).setVisibility(i);
@@ -908,7 +908,7 @@ public class PrintProgress extends Activity implements CommonDefine {
     }
 
     private void updatePrintProgress(int i) {
-        if (!this.mPrintProgressDisplay) {
+        if (!mPrintProgressDisplay) {
             changePrintProgress();
             mPrintProgressDisplay = true;
         }
@@ -939,7 +939,7 @@ public class PrintProgress extends Activity implements CommonDefine {
     }
 
     private void updateApfProgress(int i) {
-        if (!this.mApfProgressDisplay) {
+        if (!mApfProgressDisplay) {
             changeApfProgress();
             mApfProgressDisplay = true;
         }

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

@@ -53,7 +53,7 @@ class PrintProgressParams implements PrintProgress.ProgressParams {
 
     public boolean getApfMode() {
         EPImageList ePImageList;
-        if (!this.isDocument && (ePImageList = mImageList) != null && ePImageList.apfModeInPrinting == 1) {
+        if (!isDocument && (ePImageList = mImageList) != null && ePImageList.apfModeInPrinting == 1) {
             return true;
         }
         return false;

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

@@ -495,7 +495,7 @@ public class PrintSetting {
         if (sharedPreferences != null) {
             return sharedPreferences.getAll().containsKey(str) ? settings.getString(str, str2) : str2;
         }
-        if (!this.allValueFromContentProvider.containsKey(str) || allValueFromContentProvider.get(str) == null) {
+        if (!allValueFromContentProvider.containsKey(str) || allValueFromContentProvider.get(str) == null) {
             return str2;
         }
         return (String) allValueFromContentProvider.get(str);

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

@@ -327,7 +327,7 @@ public class PrinterFinder extends ActivityIACommon {
     protected void onDestroy() {
         super.onDestroy();
         if (mEpsonService != null) {
-            if (!this.isFinishSearchPrinter) {
+            if (!isFinishSearchPrinter) {
                 mHandler.sendEmptyMessageDelayed(2, 200);
             }
             try {

+ 44 - 44
app/src/main/java/epson/print/screen/PrinterInfoDetail.java

@@ -50,9 +50,9 @@ public class PrinterInfoDetail extends ActivityIACommon {
             if (i != 18) {
                 switch (i) {
                     case 1:
-                        if (PrinterInfoDetail.this.paper_size_info == null) {
-                            int[] unused = PrinterInfoDetail.this.info = new int[1];
-                            PrinterInfoDetail.this.info[0] = printSetting.paperSizeValue;
+                        if (paper_size_info == null) {
+                            int[] unused = info = new int[1];
+                            info[0] = printSetting.paperSizeValue;
                             break;
                         } else {
                             PrinterInfoDetail printerInfoDetail2 = PrinterInfoDetail.this;
@@ -62,9 +62,9 @@ public class PrinterInfoDetail extends ActivityIACommon {
                             break;
                         }
                     case 2:
-                        if (PrinterInfoDetail.this.paper_type_info == null) {
-                            int[] unused4 = PrinterInfoDetail.this.info = new int[1];
-                            PrinterInfoDetail.this.info[0] = printSetting.paperTypeValue;
+                        if (paper_type_info == null) {
+                            int[] unused4 = info = new int[1];
+                            info[0] = printSetting.paperTypeValue;
                             break;
                         } else {
                             PrinterInfoDetail printerInfoDetail4 = PrinterInfoDetail.this;
@@ -74,9 +74,9 @@ public class PrinterInfoDetail extends ActivityIACommon {
                             break;
                         }
                     case 3:
-                        if (PrinterInfoDetail.this.layout_info == null) {
-                            int[] unused7 = PrinterInfoDetail.this.info = new int[1];
-                            PrinterInfoDetail.this.info[0] = printSetting.layoutValue;
+                        if (layout_info == null) {
+                            int[] unused7 = info = new int[1];
+                            info[0] = printSetting.layoutValue;
                             break;
                         } else {
                             PrinterInfoDetail printerInfoDetail6 = PrinterInfoDetail.this;
@@ -85,18 +85,18 @@ public class PrinterInfoDetail extends ActivityIACommon {
                             int[] unused9 = printerInfoDetail7.info = printerInfoDetail7.layout_info;
                             int i2 = 0;
                             while (true) {
-                                if (i2 >= PrinterInfoDetail.this.info.length) {
+                                if (i2 >= info.length) {
                                     break;
-                                } else if (PrinterInfoDetail.this.info[i2] == 8) {
-                                    if (PrinterInfoDetail.this.info.length != 1) {
-                                        int[] iArr = new int[(PrinterInfoDetail.this.info.length - 1)];
-                                        System.arraycopy(PrinterInfoDetail.this.info, 0, iArr, 0, i2);
-                                        System.arraycopy(PrinterInfoDetail.this.info, i2 + 1, iArr, i2, (PrinterInfoDetail.this.info.length - 1) - i2);
-                                        int[] unused10 = PrinterInfoDetail.this.info = null;
-                                        int[] unused11 = PrinterInfoDetail.this.info = iArr;
+                                } else if (info[i2] == 8) {
+                                    if (info.length != 1) {
+                                        int[] iArr = new int[(info.length - 1)];
+                                        System.arraycopy(info, 0, iArr, 0, i2);
+                                        System.arraycopy(info, i2 + 1, iArr, i2, (info.length - 1) - i2);
+                                        int[] unused10 = info = null;
+                                        int[] unused11 = info = iArr;
                                         break;
                                     } else {
-                                        int[] unused12 = PrinterInfoDetail.this.info = null;
+                                        int[] unused12 = info = null;
                                         break;
                                     }
                                 } else {
@@ -106,9 +106,9 @@ public class PrinterInfoDetail extends ActivityIACommon {
                         }
                     case 4:
                         EPLog.e("CMV", "Get Quality");
-                        if (PrinterInfoDetail.this.quality_info == null) {
-                            int[] unused13 = PrinterInfoDetail.this.info = new int[1];
-                            PrinterInfoDetail.this.info[0] = printSetting.qualityValue;
+                        if (quality_info == null) {
+                            int[] unused13 = info = new int[1];
+                            info[0] = printSetting.qualityValue;
                             break;
                         } else {
                             PrinterInfoDetail printerInfoDetail8 = PrinterInfoDetail.this;
@@ -118,9 +118,9 @@ public class PrinterInfoDetail extends ActivityIACommon {
                             break;
                         }
                     case 5:
-                        if (PrinterInfoDetail.this.paper_source_info == null) {
-                            int[] unused16 = PrinterInfoDetail.this.info = new int[1];
-                            PrinterInfoDetail.this.info[0] = printSetting.paperSourceValue;
+                        if (paper_source_info == null) {
+                            int[] unused16 = info = new int[1];
+                            info[0] = printSetting.paperSourceValue;
                             break;
                         } else {
                             PrinterInfoDetail printerInfoDetail10 = PrinterInfoDetail.this;
@@ -130,9 +130,9 @@ public class PrinterInfoDetail extends ActivityIACommon {
                             break;
                         }
                     case 6:
-                        if (PrinterInfoDetail.this.color_info == null) {
-                            int[] unused19 = PrinterInfoDetail.this.info = new int[1];
-                            PrinterInfoDetail.this.info[0] = printSetting.colorValue;
+                        if (color_info == null) {
+                            int[] unused19 = info = new int[1];
+                            info[0] = printSetting.colorValue;
                             break;
                         } else {
                             PrinterInfoDetail printerInfoDetail12 = PrinterInfoDetail.this;
@@ -142,9 +142,9 @@ public class PrinterInfoDetail extends ActivityIACommon {
                             break;
                         }
                     case 7:
-                        if (PrinterInfoDetail.this.duplex_info == null) {
-                            int[] unused22 = PrinterInfoDetail.this.info = new int[1];
-                            PrinterInfoDetail.this.info[0] = printSetting.duplexValue;
+                        if (duplex_info == null) {
+                            int[] unused22 = info = new int[1];
+                            info[0] = printSetting.duplexValue;
                             break;
                         } else {
                             PrinterInfoDetail printerInfoDetail14 = PrinterInfoDetail.this;
@@ -154,20 +154,20 @@ public class PrinterInfoDetail extends ActivityIACommon {
                             break;
                         }
                     case 8:
-                        int[] unused25 = PrinterInfoDetail.this.info = new int[2];
-                        PrinterInfoDetail.this.info[0] = 0;
-                        PrinterInfoDetail.this.info[1] = 1;
+                        int[] unused25 = info = new int[2];
+                        info[0] = 0;
+                        info[1] = 1;
                         break;
                 }
             } else {
-                int[] unused26 = PrinterInfoDetail.this.info = new int[4];
-                PrinterInfoDetail.this.info[0] = 0;
-                PrinterInfoDetail.this.info[1] = 1;
-                PrinterInfoDetail.this.info[2] = 2;
-                PrinterInfoDetail.this.info[3] = 3;
+                int[] unused26 = info = new int[4];
+                info[0] = 0;
+                info[1] = 1;
+                info[2] = 2;
+                info[3] = 3;
             }
-            if (PrinterInfoDetail.this.info != null) {
-                ((PrinterInfoDetailBuilder) PrinterInfoDetail.this.mBuilder).addPrinterInfo(PrinterInfoDetail.this.info, PrinterInfoDetail.this.mLookupTable);
+            if (info != null) {
+                ((PrinterInfoDetailBuilder) mBuilder).addPrinterInfo(info, mLookupTable);
             }
             return true;
         }
@@ -290,12 +290,12 @@ public class PrinterInfoDetail extends ActivityIACommon {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
                 Intent intent = new Intent();
                 Bundle bundle = new Bundle();
-                bundle.putInt("ID", PrinterInfoDetail.this.f405id);
-                bundle.putInt("curValue", ((CommonDataKinds.PrinterInfo) PrinterInfoDetail.this.mBuilder.getData().elementAt(i)).getValue());
+                bundle.putInt("ID", f405id);
+                bundle.putInt("curValue", ((CommonDataKinds.PrinterInfo) mBuilder.getData().elementAt(i)).getValue());
                 bundle.putInt("INDEX", i);
                 intent.putExtras(bundle);
-                PrinterInfoDetail.this.setResult(-1, intent);
-                PrinterInfoDetail.this.finish();
+                setResult(-1, intent);
+                finish();
             }
         });
     }

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

@@ -1121,7 +1121,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
     }
 
     public void displaySearchResult() {
-        if (!this.mIsClickSelect) {
+        if (!mIsClickSelect) {
             if (mBuilder.getData().size() <= 0) {
                 ((TextView) mLayout.findViewById(R.id.empty)).setText(getString(R.string.EPS_PRNERR_COMM_TITLE1));
             } else if (Locale.getDefault().getLanguage().equalsIgnoreCase(Locale.JAPAN.getLanguage()) || Locale.getDefault().getLanguage().equalsIgnoreCase(Locale.JAPANESE.getLanguage())) {
@@ -1226,7 +1226,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
 
     private void unbindEpsonService() {
         if (mEpsonService != null) {
-            if (!this.isFinishSearchPrinter) {
+            if (!isFinishSearchPrinter) {
                 mHandler.sendEmptyMessageDelayed(2, 200);
             }
             try {

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

@@ -2740,7 +2740,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
             if (printerLocation != 2) {
                 setVisibilityPageRange(true);
                 setClickablePageRange(true);
-            } else if (!this.enableShowPreview) {
+            } else if (!enableShowPreview) {
                 setVisibilityPageRange(false);
             } else if (disablePrintArea) {
                 setVisibilityPageRange(true);

+ 1 - 1
app/src/main/java/epson/print/service/CreatePrintImageThread.java

@@ -51,7 +51,7 @@ public class CreatePrintImageThread extends Thread {
                 if (mPrintService.getCancelPrinting()) {
                     throw new LocalInterrupt();
                 } else if (localCreateImage(mImageList, i) != null) {
-                    if (!this.mPrintService.getCancelPrinting()) {
+                    if (!mPrintService.getCancelPrinting()) {
                         putSheet(i);
                         i++;
                         i2 = i3;

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

@@ -1009,7 +1009,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             if (z) {
                 mEpsonConnectlogin = false;
             }
-            if (!this.mEpsonConnectlogin) {
+            if (!mEpsonConnectlogin) {
                 int Login = mEcClientLib.Login(EcClientLibUtil.quoteForJsonString(EpsonService.this.mailAddress), EcClientLibUtil.quoteForJsonString(EpsonService.this.accessKey), EpsonService.this.clientId);
                 if (Login != 0) {
                     return Login;

+ 1 - 1
app/src/main/java/epson/print/service/PdfRenderThread.java

@@ -109,7 +109,7 @@ class PdfRenderThread extends Thread {
                 boolean isPageLandscape2 = mPdfRenderer.isPageLandscape(intValue);
                 int[] portraitOrLandscapeSize = AreaPdfRenderer.getPortraitOrLandscapeSize(limitAreaSize, isPageLandscape2 != z);
                 EPImage ePImage = mEpImageList.get(i);
-                if (!this.mPdfRenderer.convertPageForPrint(ePImage.loadImageFileName, intValue, portraitOrLandscapeSize)) {
+                if (!mPdfRenderer.convertPageForPrint(ePImage.loadImageFileName, intValue, portraitOrLandscapeSize)) {
                     return false;
                 }
                 if (isPageLandscape != isPageLandscape2) {

+ 1 - 1
app/src/main/java/epson/print/service/PdfRenderingController.java

@@ -52,7 +52,7 @@ public class PdfRenderingController implements RenderingController {
 
     public void waitPage(int i, int i2) throws InterruptedException, LocalInterrupt {
         while (i < i2) {
-            if (!this.mEpsonService.getCancelPrinting()) {
+            if (!mEpsonService.getCancelPrinting()) {
                 int intValue = mDeque.takeFirst().intValue();
                 if (i == intValue) {
                     i++;

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

@@ -164,10 +164,10 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
                             reentrantLock.unlock();
                         }
                     });
-                    while (!this.uploaded) {
+                    while (!uploaded) {
                         newCondition.await();
                     }
-                    if (!this.canceled && taskError == StorageServiceClient.ProcessError.NONE) {
+                    if (!canceled && taskError == StorageServiceClient.ProcessError.NONE) {
                         reentrantLock.unlock();
                         i++;
                     }

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

@@ -92,14 +92,14 @@ public class OneDriveClient extends StorageServiceClient {
 
             public void enumerate(StorageItem storageItem, final StorageServiceClient.EnumerateCompletion enumerateCompletion, final StorageServiceClient.SigninCompletion signinCompletion) {
                 if (storageItem.path.isEmpty()) {
-                    OneDriveClient.this.getClient((Activity) context, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
+                    getClient((Activity) context, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
                         public void onNotifyOneDriveClient(IOneDriveClient iOneDriveClient) {
                             if (iOneDriveClient != null) {
                                 StorageServiceClient.SigninCompletion signinCompletion = signinCompletion;
                                 if (signinCompletion != null) {
                                     signinCompletion.onSigninCompletion();
                                 }
-                                OneDriveClient.this.getRootFolder(iOneDriveClient, enumerateCompletion);
+                                getRootFolder(iOneDriveClient, enumerateCompletion);
                                 return;
                             }
                             enumerateCompletion.onEnumerateComplete(OneDriveClient.mStorageItemList, StorageServiceClient.ProcessError.ERROR);
@@ -126,12 +126,12 @@ public class OneDriveClient extends StorageServiceClient {
         }
         logOut(iOneDriveClient, new ICallback<Void>() {
             public void success(Void voidR) {
-                IOneDriveClient unused = OneDriveClient.this.oneDriveClient = null;
+                IOneDriveClient unused = oneDriveClient = null;
             }
 
             public void failure(ClientException clientException) {
                 clientException.printStackTrace();
-                IOneDriveClient unused = OneDriveClient.this.oneDriveClient = null;
+                IOneDriveClient unused = oneDriveClient = null;
             }
         });
         return false;
@@ -150,7 +150,7 @@ public class OneDriveClient extends StorageServiceClient {
         return getCallbackCollectionPage(new OnOneDriveClientListener() {
             public void onNotifyOneDriveClientCollectionPage(List<StorageItem> list) {
                 if (list != null) {
-                    list = OneDriveClient.this.getPrintableItems(list);
+                    list = getPrintableItems(list);
                 }
                 enumerateCompletion.onEnumerateComplete(list, list != null ? StorageServiceClient.ProcessError.NONE : StorageServiceClient.ProcessError.ERROR);
             }
@@ -180,7 +180,7 @@ public class OneDriveClient extends StorageServiceClient {
                     List currentPage = iItemCollectionPage.getCurrentPage();
                     if (currentPage != null) {
                         for (int i = 0; i < currentPage.size(); i++) {
-                            StorageItem access$600 = OneDriveClient.this.getStorageItem((Item) currentPage.get(i));
+                            StorageItem access$600 = getStorageItem((Item) currentPage.get(i));
                             if (access$600 != null) {
                                 OneDriveClient.mStorageItemList.add(access$600);
                             }
@@ -303,10 +303,10 @@ public class OneDriveClient extends StorageServiceClient {
     public void getOneDriveClient(Activity activity, final OneDriveAuthenticator.OnOneDriveAuthenticatorListener onOneDriveAuthenticatorListener) {
         OneDriveAuthenticator.getOneDriveClient(activity, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
             public void onNotifyOneDriveClient(IOneDriveClient iOneDriveClient) {
-                IOneDriveClient unused = OneDriveClient.this.oneDriveClient = iOneDriveClient;
+                IOneDriveClient unused = oneDriveClient = iOneDriveClient;
                 OneDriveAuthenticator.OnOneDriveAuthenticatorListener onOneDriveAuthenticatorListener = onOneDriveAuthenticatorListener;
                 if (onOneDriveAuthenticatorListener != null) {
-                    onOneDriveAuthenticatorListener.onNotifyOneDriveClient(OneDriveClient.this.oneDriveClient);
+                    onOneDriveAuthenticatorListener.onNotifyOneDriveClient(oneDriveClient);
                 }
             }
         });
@@ -316,7 +316,7 @@ public class OneDriveClient extends StorageServiceClient {
         getClient(activity, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
             public void onNotifyOneDriveClient(IOneDriveClient iOneDriveClient) {
                 if (iOneDriveClient != null) {
-                    OneDriveClient.this.getRootFolder(iOneDriveClient, enumerateCompletion);
+                    getRootFolder(iOneDriveClient, enumerateCompletion);
                 } else {
                     enumerateCompletion.onEnumerateComplete(OneDriveClient.mStorageItemList, StorageServiceClient.ProcessError.ERROR);
                 }
@@ -328,7 +328,7 @@ public class OneDriveClient extends StorageServiceClient {
         getRoot(iOneDriveClient, new ICallback<Item>() {
             public void success(Item item) {
                 if (item != null) {
-                    OneDriveClient.this.getItems(iOneDriveClient, item.f323id, enumerateCompletion);
+                    getItems(iOneDriveClient, item.f323id, enumerateCompletion);
                 } else {
                     enumerateCompletion.onEnumerateComplete(OneDriveClient.mStorageItemList, StorageServiceClient.ProcessError.ERROR);
                 }
@@ -527,10 +527,10 @@ public class OneDriveClient extends StorageServiceClient {
                 inputStream = null;
                 boolean z = false;
                 bCanceled = false;
-                bConvertPdf = OneDriveClient.this.isConvertPdfExtension((Item) OneDriveDownloader.mStorageItem.userInfo) || OneDriveClient.this.isConvertPdfMimeType((Item) OneDriveDownloader.mStorageItem.userInfo);
+                bConvertPdf = isConvertPdfExtension((Item) OneDriveDownloader.mStorageItem.userInfo) || isConvertPdfMimeType((Item) OneDriveDownloader.mStorageItem.userInfo);
                 if (bConvertPdf && !this.bCanceled) {
                     try {
-                        inputStream = OneDriveClient.this.getDownloadInputStreamPdf(OneDriveClient.this.oneDriveClient, OneDriveDownloader.mItemid);
+                        inputStream = getDownloadInputStreamPdf(oneDriveClient, OneDriveDownloader.mItemid);
                     } catch (ClientException e) {
                         e.printStackTrace();
                         if (e.isError(OneDriveErrorCodes.NotSupported)) {
@@ -540,15 +540,15 @@ public class OneDriveClient extends StorageServiceClient {
                         }
                     }
                 }
-                if (!this.bConvertPdf && !this.bCanceled) {
+                if (!bConvertPdf && !this.bCanceled) {
                     try {
-                        inputStream = OneDriveClient.this.getDownloadInputStream(OneDriveClient.this.oneDriveClient, OneDriveDownloader.mItemid);
+                        inputStream = getDownloadInputStream(oneDriveClient, OneDriveDownloader.mItemid);
                     } catch (ClientException e2) {
                         e2.printStackTrace();
                         inputStream = null;
                     }
                 }
-                String access$1600 = bConvertPdf ? OneDriveClient.this.getConvertPdfName(OneDriveDownloader.mWriteFilename) : OneDriveDownloader.mWriteFilename;
+                String access$1600 = bConvertPdf ? getConvertPdfName(OneDriveDownloader.mWriteFilename) : OneDriveDownloader.mWriteFilename;
                 if (inputStream != null && !this.bCanceled) {
                     try {
                         File file = new File(access$1600);
@@ -677,13 +677,13 @@ public class OneDriveClient extends StorageServiceClient {
         private void upload(int i) {
             uploadSession = null;
             try {
-                uploadSession = OneDriveClient.this.getUploadSession(OneDriveClient.this.oneDriveClient, "/Epson iPrint/" + mUploadFilename);
+                uploadSession = getUploadSession(oneDriveClient, "/Epson iPrint/" + mUploadFilename);
             } catch (ClientException e) {
                 e.printStackTrace();
             }
             UploadSession uploadSession2 = uploadSession;
             if (uploadSession2 != null) {
-                OneDriveClient.this.uploadLargeFile(uploadSession2, fileInputStream, i, new IProgressCallback<Item>() {
+                uploadLargeFile(uploadSession2, fileInputStream, i, new IProgressCallback<Item>() {
                     public void success(Item item) {
                         boolean unused = LocalUploader.this.result = true;
                     }

+ 4 - 4
app/src/main/java/epson/scan/activity/ScanActivity.java

@@ -1369,7 +1369,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
         StatFs statFs = new StatFs(CommonDefine.DEFAULT_DIR);
         double availableBlocksLong = (statFs.getAvailableBlocksLong()) * (statFs.getBlockSizeLong());
         double maxwidth = (getMaxwidth() * getMaxheight() * 3);
-        if (availableBlocksLong > (!this.isDoctable ? maxwidth * ((ScanContinueParam.getAvailableScanPageCount() + 1)) : maxwidth * 2.0d)) {
+        if (availableBlocksLong > (!isDoctable ? maxwidth * ((ScanContinueParam.getAvailableScanPageCount() + 1)) : maxwidth * 2.0d)) {
             return true;
         }
         return false;
@@ -1500,7 +1500,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
     private void getSelectedScannerInfo() {
         if (isNeedGetScanSize) {
             String prefString = Utils.getPrefString(getApplicationContext(), epson.common.Constants.SCAN_REFS_USED_SCANNER_PATH, epson.common.Constants.SCAN_REFS_SCANNER_ID);
-            if (!this.isNeedUpdateScanningArea) {
+            if (!isNeedUpdateScanningArea) {
                 if (prefString.equals(usingScannerId)) {
                     isNeedUpdateScanningArea = false;
                 } else {
@@ -1665,7 +1665,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
     }
 
     private void confirmationDialog(String str) {
-        if (!this.isConfirmCancel) {
+        if (!isConfirmCancel) {
             confirmAlertDialog = new AlertDialog.Builder(context).create();
             confirmAlertDialog.setIcon(R.drawable.ic_action_warning);
             confirmAlertDialog.setCancelable(false);
@@ -1887,7 +1887,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
     }
 
     private void displayPreview(Bitmap bitmap) {
-        if (!this.escan.isJobDone()) {
+        if (!escan.isJobDone()) {
             EPLog.i(EpsoniPrintSharedActivity.ACTIVITY_SCAN, "update UI");
             setBm(bitmap);
             setBmRectF(area);

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

@@ -880,7 +880,7 @@ public class ScanBaseView extends ActivityIACommon {
 
         private void drawTheDefaultBackground(Canvas canvas) {
             canvas.drawRect((float) ScanBaseView.this.getmBaseTop().x, (float) ScanBaseView.this.getmBaseTop().y, (float) ScanBaseView.this.getmBaseBot().x, (float) ScanBaseView.this.getmBaseBot().y, _paint);
-            if (!this.hideText) {
+            if (!hideText) {
                 drawTextInCanvas(canvas);
             }
         }

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

@@ -560,7 +560,7 @@ public class ScanSearchActivity extends ActivityIACommon implements CustomTitleD
         mActivityForegroundLifetime = true;
         dismissPrinterNotFoundDialog();
         if (scanner_location != 3) {
-            if (!this.isSelected) {
+            if (!isSelected) {
                 mHandler.removeMessages(1);
                 mHandler.sendEmptyMessageDelayed(1, 100);
             }
@@ -573,7 +573,7 @@ public class ScanSearchActivity extends ActivityIACommon implements CustomTitleD
         super.onPause();
         mActivityForegroundLifetime = false;
         interruptSearch();
-        if (!this.isSelected) {
+        if (!isSelected) {
             removeAllDialog();
         }
         GetScannerCapabilityAndFinishTask getScannerCapabilityAndFinishTask = mGetScannerCapabilityAndFinishTask;

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

@@ -350,7 +350,7 @@ public class ScanSettingsActivity extends ActivityIACommon {
         intent.putExtra(SCAN_SETTINGS_LAST_VALUE, i2);
         intent.putExtra(epson.common.Constants.SCAN_REFS_OPTIONS_SUPPORTED_ADF_DUPLEX, scanInfo.getSupportedAdfDuplex());
         int i4 = 1;
-        if (!this.scanInfo.isAdfDuplexRotaitonYes()) {
+        if (!scanInfo.isAdfDuplexRotaitonYes()) {
             i4 = 0;
         }
         intent.putExtra(epson.common.Constants.SCAN_REFS_SETTINGS_ROTATE, i4);
@@ -483,7 +483,7 @@ public class ScanSettingsActivity extends ActivityIACommon {
         ScanSettingHelper.updateNewSelectedScannerSupportedOptions(scanInfo);
         ScanSettingHelper.setDefaultSettings3(ScanCommonParams.load(this), scanInfo);
         showNewSelectedScannerInfo();
-        if (!this.scanInfo.getIp().equals("")) {
+        if (!scanInfo.getIp().equals("")) {
             setResolutionClickable();
             setColorModeClickable();
             llScanSettingsDensity.setClickable(true);
@@ -561,7 +561,7 @@ public class ScanSettingsActivity extends ActivityIACommon {
 
     private void onSettingDone() {
         if (progressGetOption.getVisibility() == 8) {
-            if (!this.scanInfo.isReSearch() && !this.scanInfo.getIp().equals("")) {
+            if (!scanInfo.isReSearch() && !this.scanInfo.getIp().equals("")) {
                 scanInfo.setReSearch(true);
             }
             if (isNeedSaveSupportedOptions) {

+ 1 - 1
app/src/main/java/epson/scan/activity/ScanSettingsAdvanceDensityActivity.java

@@ -66,7 +66,7 @@ public class ScanSettingsAdvanceDensityActivity extends ActivityIACommon {
         toggleDensity = (Switch) findViewById(R.id.toggleDensity);
         toggleDensity.setChecked(densityStatus);
         toggleDensity.setOnClickListener(mToogleDensityListener);
-        if (!this.toggleDensity.isChecked()) {
+        if (!toggleDensity.isChecked()) {
             seekDensity.setEnabled(false);
         } else {
             seekDensity.setEnabled(true);

+ 1 - 1
app/src/main/java/epson/scan/lib/CancelableFind.java

@@ -36,7 +36,7 @@ public class CancelableFind {
     }
 
     public void cancel() {
-        if (!this.isFinishSearchScanner) {
+        if (!isFinishSearchScanner) {
             isFinishSearchScanner = true;
             mCanceled = true;
             escanLib escanlib = mEscanLib;