liuyuqi-dellpc 3 years ago
parent
commit
8243351c67
65 changed files with 340 additions and 340 deletions
  1. 4 4
      app/src/main/java/com/epson/cameracopy/ui/CameraPreviewFragment.java
  2. 7 7
      app/src/main/java/com/epson/cameracopy/ui/CameraPrintProgress.java
  3. 56 56
      app/src/main/java/com/epson/cameracopy/ui/CameraPrintSettingActivity.java
  4. 1 1
      app/src/main/java/com/epson/cameracopy/ui/FolderSelectActivity.java
  5. 8 8
      app/src/main/java/com/epson/cameracopy/ui/PrintPreviewActivity.java
  6. 5 5
      app/src/main/java/com/epson/iprint/apf/ApfAdapter.java
  7. 2 2
      app/src/main/java/com/epson/iprint/apf/ApfPreviewView.java
  8. 4 4
      app/src/main/java/com/epson/iprint/shared/SharedParamPhoto.java
  9. 1 1
      app/src/main/java/com/epson/iprint/shared/SharedParamScan.java
  10. 1 1
      app/src/main/java/com/epson/iprint/shared/SharedParamStatus.java
  11. 1 1
      app/src/main/java/com/epson/iprint/storage/LocalProgressDialog.java
  12. 1 1
      app/src/main/java/com/epson/iprint/storage/OneButtonDialogFragment.java
  13. 5 5
      app/src/main/java/com/epson/iprint/storage/StorageProcessActivity.java
  14. 14 14
      app/src/main/java/com/epson/iprint/storage/StorageProcessDownloadActivity.java
  15. 7 7
      app/src/main/java/com/epson/iprint/storage/StorageProcessUploadActivity.java
  16. 3 3
      app/src/main/java/com/epson/iprint/storage/StorageSecureStore.java
  17. 1 1
      app/src/main/java/com/epson/iprint/storage/StorageSignInActivity.java
  18. 2 2
      app/src/main/java/com/epson/iprint/storage/StorageWaitingActivity.java
  19. 13 13
      app/src/main/java/com/epson/iprint/storage/box/BoxNetClient.java
  20. 3 3
      app/src/main/java/com/epson/iprint/storage/box/BoxNetSignInActivity.java
  21. 1 1
      app/src/main/java/com/epson/iprint/storage/dropbox/DropboxV2Client.java
  22. 4 4
      app/src/main/java/com/epson/iprint/storage/evernote/EvernoteRequest.java
  23. 4 4
      app/src/main/java/com/epson/iprint/storage/gdrivev3/DownloadTask.java
  24. 1 1
      app/src/main/java/com/epson/iprint/storage/gdrivev3/DriveListTask.java
  25. 4 4
      app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleDownloadPresenter.java
  26. 1 1
      app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleDownloader.java
  27. 1 1
      app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleDriveFile.java
  28. 2 2
      app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleV3UploadClient.java
  29. 3 3
      app/src/main/java/com/epson/iprint/storage/gdrivev3/GoogleV3UploadSignInActivity.java
  30. 6 6
      app/src/main/java/com/epson/iprint/storage/gdrivev3/ListAndDownloadActivity.java
  31. 10 10
      app/src/main/java/com/epson/iprint/storage/onedrive/OneDriveClient.java
  32. 1 1
      app/src/main/java/com/epson/iprint/storage/onedrive/OneDriveStorageProcessUploadActivity.java
  33. 1 1
      app/src/main/java/com/epson/memcardacc/AltViewImageAdapter.java
  34. 1 1
      app/src/main/java/com/epson/memcardacc/ConfirmReadMemcard.java
  35. 1 1
      app/src/main/java/com/epson/memcardacc/ConfirmWriteMemcard.java
  36. 1 1
      app/src/main/java/com/epson/memcardacc/MemcardImageGrid.java
  37. 3 3
      app/src/main/java/com/epson/memcardacc/MemcardReadProgress.java
  38. 3 3
      app/src/main/java/com/epson/mobilephone/common/ReviewInvitationDialog.java
  39. 1 1
      app/src/main/java/com/epson/mobilephone/common/ble/BleScanWork.java
  40. 33 33
      app/src/main/java/com/epson/mobilephone/common/ble/BleWork.java
  41. 1 1
      app/src/main/java/com/epson/mobilephone/common/escpr/EscprLib.java
  42. 2 2
      app/src/main/java/com/epson/mobilephone/common/escpr/Info_paper.java
  43. 4 4
      app/src/main/java/com/epson/mobilephone/common/escpr/MediaInfo.java
  44. 1 1
      app/src/main/java/com/epson/mobilephone/common/keyenc/SecureKeyFactory.java
  45. 3 3
      app/src/main/java/com/epson/mobilephone/common/maintain2/BatteryInfo.java
  46. 11 11
      app/src/main/java/com/epson/mobilephone/common/maintain2/BatteryInfoEx.java
  47. 1 1
      app/src/main/java/com/epson/mobilephone/common/usb/UsbPrintDriver.java
  48. 15 15
      app/src/main/java/com/epson/mobilephone/common/usb/UsbPrinter.java
  49. 1 1
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectBase.java
  50. 10 10
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectP2P.java
  51. 8 8
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityControlWiFi.java
  52. 1 1
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityRequestLocationPermission.java
  53. 2 2
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectBase.java
  54. 4 4
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityiPrintConnectStart.java
  55. 1 1
      app/src/main/java/com/epson/mobilephone/common/wifidirect/EventWrapperWiFiDirect.java
  56. 2 2
      app/src/main/java/com/epson/mobilephone/common/wifidirect/FindPrinterTask.java
  57. 1 1
      app/src/main/java/com/epson/mobilephone/common/wifidirect/MacAddrFilter.java
  58. 6 6
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ManageDefaultNetwork.java
  59. 7 7
      app/src/main/java/com/epson/mobilephone/common/wifidirect/NfcTagParser.java
  60. 9 9
      app/src/main/java/com/epson/mobilephone/common/wifidirect/NfcTagUtils.java
  61. 13 13
      app/src/main/java/com/epson/mobilephone/common/wifidirect/SearchWiFiDirectPrinterTask.java
  62. 4 4
      app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiDirectPrinterListUtils.java
  63. 1 1
      app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiScanner.java
  64. 6 6
      app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiUtils.java
  65. 5 5
      app/src/main/java/com/epson/mobilephone/common/wifidirect/WifiP2pUtils.java

+ 4 - 4
app/src/main/java/com/epson/cameracopy/ui/CameraPreviewFragment.java

@@ -324,7 +324,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
     }
 
     private boolean checkAutoPictureAngle() {
-        return mSensorEventListener.isTerminalAngleInRange(this.AUTO_PICTURE_RANGE_VALUE);
+        return mSensorEventListener.isTerminalAngleInRange(AUTO_PICTURE_RANGE_VALUE);
     }
 
     private boolean checkAccelerrationTime() {
@@ -340,9 +340,9 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
     }
 
     private void sensorAndCamera() {
-        if (this.isFragmentVisible) {
+        if (isFragmentVisible) {
             long currentTimeMillis = System.currentTimeMillis();
-            if (mAutoPhotoMode && mSensorEventListener.isTerminalAngleInRange(this.PAPER_DETECT_VALUE)) {
+            if (mAutoPhotoMode && mSensorEventListener.isTerminalAngleInRange(PAPER_DETECT_VALUE)) {
                 boolean checkAutoPictureAngle = checkAutoPictureAngle();
                 int detectAndDrawRectangle2 = RectangleDetector.detectAndDrawRectangle2(mRgba.getNativeObjAddr(), 0, mFunctionBarView.getHeight(), checkAutoPictureAngle);
                 if (checkAutoPictureAngle && detectAndDrawRectangle2 == 1 && checkAccelerrationTime()) {
@@ -373,7 +373,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         }
         sensorAndCamera();
         if (mCameraPreviewControl.getGuideMode()) {
-            drawSensorPos(mRgba, mSensorEventListener.isTerminalAngleInRange(this.PAPER_DETECT_VALUE));
+            drawSensorPos(mRgba, mSensorEventListener.isTerminalAngleInRange(PAPER_DETECT_VALUE));
         }
         return mRgba;
     }

+ 7 - 7
app/src/main/java/com/epson/cameracopy/ui/CameraPrintProgress.java

@@ -829,10 +829,10 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         mCopies = (TextView) findViewById(R.id.copies);
         mPage = (TextView) findViewById(R.id.page);
         mProgressPage = (ProgressBar) findViewById(R.id.progress_page);
-        if (this.sheets > 1) {
+        if (sheets > 1) {
             TextView textView = mPage;
             textView.setText(getString(R.string.page) + ": " + curSheet + CommonDefine.SLASH + sheets);
-            mProgressPage.setProgress((this.curSheet * 100) / sheets);
+            mProgressPage.setProgress((curSheet * 100) / sheets);
         } else {
             mProgressPage.setVisibility(4);
             mPage.setVisibility(4);
@@ -844,7 +844,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         } else {
             TextView textView2 = mCopies;
             textView2.setText(getString(R.string.copies) + ": " + curCopy + CommonDefine.SLASH + copies);
-            mProgressCopies.setProgress((this.curCopy * 100) / copies);
+            mProgressCopies.setProgress((curCopy * 100) / copies);
         }
         mCancelButton = (Button) findViewById(R.id.cancel_button);
         mCancelButton.setOnClickListener(new View.OnClickListener() {
@@ -853,16 +853,16 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
             }
         });
         bSearching = false;
-        if (this.isRemotePrinter) {
+        if (isRemotePrinter) {
             percentString = getString(R.string.epsonconnect_str_remote_print_file_uploading);
         } else {
             percentString = getString(R.string.printing);
         }
         TextView textView3 = mPercent;
-        textView3.setText(this.percentString + "         0%");
+        textView3.setText(percentString + "         0%");
         mProgressPercent.setProgress(0);
         findViewById(R.id.epsonColorImageView).setVisibility(View.GONE);
-        if (this.isRemotePrinter) {
+        if (isRemotePrinter) {
             mHandler.sendEmptyMessage(2);
         } else {
             mHandler.sendEmptyMessage(6);
@@ -976,7 +976,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 });
                 return negativeButton2.create();
             case 1:
-                if (this.isDialogOpen) {
+                if (isDialogOpen) {
                     return null;
                 }
                 AlertDialog.Builder negativeButton3 = new AlertDialog.Builder(this).setTitle((CharSequence) null).setCancelable(false).setMessage(getString(R.string.str_msg_scan_cancel)).setPositiveButton(getString(R.string.str_yes), new DialogInterface.OnClickListener() {

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

@@ -264,7 +264,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         mContext = this;
         mRemoteSrcType = 2;
         isDocumentSetting = getIntent().getBooleanExtra(PrintProgress.PARAM_DOCUMENT_MODE, false);
-        if (this.isDocumentSetting) {
+        if (isDocumentSetting) {
             sheets = getIntent().getIntExtra("SHEETS", 1);
             disablePrintArea = getIntent().getBooleanExtra("PRINTAREA", false);
             mRemoteSrcType = 1;
@@ -280,8 +280,8 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         copies = (TextView) findViewById(R.id.copies);
         copiesMinus = (Button) findViewById(R.id.copies_minus_button);
         copiesPlus = (Button) findViewById(R.id.copies_plus_button);
-        LongTapRepeatAdapter.bless(this.copiesMinus);
-        LongTapRepeatAdapter.bless(this.copiesPlus);
+        LongTapRepeatAdapter.bless(copiesMinus);
+        LongTapRepeatAdapter.bless(copiesPlus);
         colorInfo = (TextView) findViewById(R.id.color_info);
         duplexInfo = (TextView) findViewById(R.id.duplex_info);
         feedDirectionInfo = (TextView) findViewById(R.id.feed_direction_info);
@@ -300,7 +300,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         loadConfig();
         setClickListener();
         updatePrinterIcon();
-        if (this.printerId != null) {
+        if (printerId != null) {
             undoFlag = false;
             if (loadSupportedMediaFile()) {
                 mHandler.sendEmptyMessage(1);
@@ -313,12 +313,12 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     }
 
     private void updatePrinterIcon() {
-        if (this.printerName.getText().equals(getString(R.string.str_lbl_title_scan))) {
+        if (printerName.getText().equals(getString(R.string.str_lbl_title_scan))) {
             ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setVisibility(View.GONE);
             return;
         }
         ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setVisibility(View.VISIBLE);
-        switch (this.printerLocation) {
+        switch (printerLocation) {
             case 1:
                 ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.drawable.print_local);
                 return;
@@ -342,7 +342,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         contrastPlus.setOnClickListener(this);
         saturationMinus.setOnClickListener(this);
         saturationPlus.setOnClickListener(this);
-        if (this.isDocumentSetting) {
+        if (isDocumentSetting) {
             findViewById(R.id.page_range_setting).setOnClickListener(this);
         }
         findViewById(R.id.printer).setOnClickListener(this);
@@ -371,7 +371,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         printerEmailAddress = curPrinter.getEmailAddress();
         printerLocation = curPrinter.getLocation();
         boolean z = true;
-        if (this.printerLocation == 0) {
+        if (printerLocation == 0) {
             printerLocation = 1;
         }
         autoConnectSsid = WiFiDirectManager.getConnectInfo(this, WiFiDirectManager.DEVICE_TYPE_PRINTER);
@@ -379,35 +379,35 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         printSetting.loadSettings();
         mLookupTable = new MediaInfo.PaperSize();
         paperSize = printSetting.paperSizeValue;
-        paperSizeInfo.setText(getString(mLookupTable.getStringId(this.paperSize)));
+        paperSizeInfo.setText(getString(mLookupTable.getStringId(paperSize)));
         mLookupTable.destructor();
         mLookupTable = new MediaInfo.PaperType();
         paperType = printSetting.paperTypeValue;
-        paperTypeInfo.setText(getString(mLookupTable.getStringId(this.paperType)));
+        paperTypeInfo.setText(getString(mLookupTable.getStringId(paperType)));
         mLookupTable.destructor();
         mPaperSizeType = printSetting.loadPaperSizeTypePear();
-        mPaperSizeType.putID(this.paperSize, paperType);
+        mPaperSizeType.putID(paperSize, paperType);
         mLookupTable = new MediaInfo.Layout();
         layout = printSetting.layoutValue;
-        layoutInfo.setText(getString(mLookupTable.getStringId(this.layout)));
+        layoutInfo.setText(getString(mLookupTable.getStringId(layout)));
         mLookupTable.destructor();
         mLookupTable = new MediaInfo.Quality();
         quality = printSetting.qualityValue;
-        qualityInfo.setText(getString(mLookupTable.getStringId(this.quality)));
+        qualityInfo.setText(getString(mLookupTable.getStringId(quality)));
         mLookupTable.destructor();
         mLookupTable = new MediaInfo.PaperSource();
         paperSource = printSetting.paperSourceValue;
-        paperSourceInfo.setText(getString(mLookupTable.getStringId(this.paperSource)));
+        paperSourceInfo.setText(getString(mLookupTable.getStringId(paperSource)));
         mLookupTable.destructor();
         mLookupTable = new MediaInfo.Color();
         color = printSetting.colorValue;
-        colorInfo.setText(getString(mLookupTable.getStringId(this.color)));
+        colorInfo.setText(getString(mLookupTable.getStringId(color)));
         mLookupTable.destructor();
         copiesValue = printSetting.copiesValue;
-        copies.setText(String.valueOf(this.copiesValue));
-        copiesMinus.setEnabled(this.copiesValue != 1);
+        copies.setText(String.valueOf(copiesValue));
+        copiesMinus.setEnabled(copiesValue != 1);
         Button button = copiesPlus;
-        if (this.copiesValue == 30) {
+        if (copiesValue == 30) {
             z = false;
         }
         button.setEnabled(z);
@@ -416,23 +416,23 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         saturationValue = printSetting.saturationValue;
         mLookupTable = new MediaInfo.Duplex();
         duplex = printSetting.duplexValue;
-        duplexInfo.setText(getString(mLookupTable.getStringId(this.duplex)));
+        duplexInfo.setText(getString(mLookupTable.getStringId(duplex)));
         mLookupTable.destructor();
         mLookupTable = new MediaInfo.FeedDirection();
         feedDirection = printSetting.feedDirectionValue;
-        feedDirectionInfo.setText(getString(mLookupTable.getStringId(this.feedDirection)));
+        feedDirectionInfo.setText(getString(mLookupTable.getStringId(feedDirection)));
         mLookupTable.destructor();
         lang = curPrinter.getLang();
-        if (this.isDocumentSetting) {
+        if (isDocumentSetting) {
             printAll = printSetting.printAll;
             startValue = printSetting.startValue;
             endValue = printSetting.endValue;
-            ((TextView) findViewById(R.id.page_range_value)).setText(this.startValue + ".." + endValue);
+            ((TextView) findViewById(R.id.page_range_value)).setText(startValue + ".." + endValue);
             return;
         }
         mLookupTable = new MediaInfo.PrintDate();
         printdate = printSetting.printdate;
-        printDateInfo.setText(getString(mLookupTable.getStringId(this.printdate)));
+        printDateInfo.setText(getString(mLookupTable.getStringId(printdate)));
         mLookupTable.destructor();
     }
 
@@ -556,8 +556,8 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         SharedPreferences.Editor edit = getSharedPreferences("PrintSetting", 0).edit();
         edit.putInt(Constants.PREFS_INFO_PRINT_SAVE, 1);
         edit.commit();
-        MyPrinter myPrinter = new MyPrinter(this.printerDeviceId, printerIp, printerId, printerSerialNo, printerEmailAddress, printerLocation);
-        myPrinter.setLang(this.lang);
+        MyPrinter myPrinter = new MyPrinter(printerDeviceId, printerIp, printerId, printerSerialNo, printerEmailAddress, printerLocation);
+        myPrinter.setLang(lang);
         myPrinter.setCurPrinter(this);
         PrintSetting printSetting = new PrintSetting(this, PrintSetting.Kind.cameracopy);
         printSetting.paperSizeValue = paperSize;
@@ -572,7 +572,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         printSetting.brightnessValue = brightnessValue;
         printSetting.contrastValue = contrastValue;
         printSetting.saturationValue = saturationValue;
-        if (this.isDocumentSetting) {
+        if (isDocumentSetting) {
             printSetting.printAll = printAll;
             printSetting.startValue = startValue;
             printSetting.endValue = endValue;
@@ -625,7 +625,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     }
 
     public void onClick(View view) {
-        if (this.progressGetOption.getVisibility() == 8) {
+        if (progressGetOption.getVisibility() == 8) {
             IEpsonService iEpsonService = mEpsonService;
             if (iEpsonService != null) {
                 try {
@@ -637,81 +637,81 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
             switch (view.getId()) {
                 case R.id.brightness_minus_button /*2131230848*/:
                     brightnessValue--;
-                    if (this.brightnessValue <= -50) {
+                    if (brightnessValue <= -50) {
                         brightnessValue = -50;
                         brightnessMinus.setEnabled(false);
                     } else {
                         brightnessMinus.setEnabled(true);
                     }
                     brightnessPlus.setEnabled(true);
-                    brightness.setText(String.valueOf(this.brightnessValue));
+                    brightness.setText(String.valueOf(brightnessValue));
                     return;
                 case R.id.brightness_plus_button /*2131230850*/:
                     brightnessValue++;
-                    if (this.brightnessValue >= 50) {
+                    if (brightnessValue >= 50) {
                         brightnessValue = 50;
                         brightnessPlus.setEnabled(false);
                     } else {
                         brightnessPlus.setEnabled(true);
                     }
                     brightnessMinus.setEnabled(true);
-                    brightness.setText(String.valueOf(this.brightnessValue));
+                    brightness.setText(String.valueOf(brightnessValue));
                     return;
                 case R.id.color /*2131230930*/:
-                    launchDetailScreen(this.color, R.id.color);
+                    launchDetailScreen(color, R.id.color);
                     return;
                 case R.id.contrast_minus_button /*2131230942*/:
                     contrastValue--;
-                    if (this.contrastValue <= -50) {
+                    if (contrastValue <= -50) {
                         contrastValue = -50;
                         contrastMinus.setEnabled(false);
                     } else {
                         contrastMinus.setEnabled(true);
                     }
                     contrastPlus.setEnabled(true);
-                    contrast.setText(String.valueOf(this.contrastValue));
+                    contrast.setText(String.valueOf(contrastValue));
                     return;
                 case R.id.contrast_plus_button /*2131230943*/:
                     contrastValue++;
-                    if (this.contrastValue >= 50) {
+                    if (contrastValue >= 50) {
                         contrastValue = 50;
                         contrastPlus.setEnabled(false);
                     } else {
                         contrastPlus.setEnabled(true);
                     }
                     contrastMinus.setEnabled(true);
-                    contrast.setText(String.valueOf(this.contrastValue));
+                    contrast.setText(String.valueOf(contrastValue));
                     return;
                 case R.id.copies_minus_button /*2131230945*/:
                     copiesValue--;
-                    if (this.copiesValue <= 1) {
+                    if (copiesValue <= 1) {
                         copiesValue = 1;
                         copiesMinus.setEnabled(false);
                     } else {
                         copiesMinus.setEnabled(true);
                     }
                     copiesPlus.setEnabled(true);
-                    copies.setText(String.valueOf(this.copiesValue));
+                    copies.setText(String.valueOf(copiesValue));
                     return;
                 case R.id.copies_plus_button /*2131230946*/:
                     copiesValue++;
-                    if (this.copiesValue >= 30) {
+                    if (copiesValue >= 30) {
                         copiesValue = 30;
                         copiesPlus.setEnabled(false);
                     } else {
                         copiesPlus.setEnabled(true);
                     }
                     copiesMinus.setEnabled(true);
-                    copies.setText(String.valueOf(this.copiesValue));
+                    copies.setText(String.valueOf(copiesValue));
                     return;
                 case R.id.duplex /*2131231005*/:
-                    launchDetailScreen(this.duplex, R.id.duplex);
+                    launchDetailScreen(duplex, R.id.duplex);
                     return;
                 case R.id.feed_direction /*2131231037*/:
-                    launchDetailScreen(this.feedDirection, R.id.feed_direction);
+                    launchDetailScreen(feedDirection, R.id.feed_direction);
                     return;
                 case R.id.layout /*2131231158*/:
-                    launchDetailScreen(this.layout, R.id.layout);
+                    launchDetailScreen(layout, R.id.layout);
                     return;
                 case R.id.page_range_setting /*2131231300*/:
                     Intent intent = new Intent(this, PageRangeSetting.class);
@@ -722,7 +722,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     startActivityForResult(intent, 2);
                     return;
                 case R.id.paper_size /*2131231306*/:
-                    launchDetailScreen(this.paperSize, R.id.paper_size);
+                    launchDetailScreen(paperSize, R.id.paper_size);
                     return;
                 case R.id.paper_source /*2131231311*/:
                     int i = paperSource;
@@ -733,10 +733,10 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     launchDetailScreen(i, R.id.paper_source);
                     return;
                 case R.id.paper_type /*2131231314*/:
-                    launchDetailScreen(this.paperType, R.id.paper_type);
+                    launchDetailScreen(paperType, R.id.paper_type);
                     return;
                 case R.id.printdate /*2131231355*/:
-                    launchDetailScreen(this.printdate, R.id.printdate);
+                    launchDetailScreen(printdate, R.id.printdate);
                     return;
                 case R.id.printer /*2131231358*/:
                     unbindEpsonService();
@@ -768,29 +768,29 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     }.execute(new Void[0]);
                     return;
                 case R.id.quality /*2131231392*/:
-                    launchDetailScreen(this.quality, R.id.quality);
+                    launchDetailScreen(quality, R.id.quality);
                     return;
                 case R.id.saturation_minus_button /*2131231425*/:
                     saturationValue--;
-                    if (this.saturationValue <= -50) {
+                    if (saturationValue <= -50) {
                         saturationValue = -50;
                         saturationMinus.setEnabled(false);
                     } else {
                         saturationMinus.setEnabled(true);
                     }
                     saturationPlus.setEnabled(true);
-                    saturation.setText(String.valueOf(this.saturationValue));
+                    saturation.setText(String.valueOf(saturationValue));
                     return;
                 case R.id.saturation_plus_button /*2131231426*/:
                     saturationValue++;
-                    if (this.saturationValue >= 50) {
+                    if (saturationValue >= 50) {
                         saturationValue = 50;
                         saturationPlus.setEnabled(false);
                     } else {
                         saturationPlus.setEnabled(true);
                     }
                     saturationMinus.setEnabled(true);
-                    saturation.setText(String.valueOf(this.saturationValue));
+                    saturation.setText(String.valueOf(saturationValue));
                     return;
                 default:
                     return;
@@ -876,7 +876,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                                 paperSizeInfo.setText(getString(mLookupTable.getStringId(i3)));
                                 mLookupTable.destructor();
                                 paperSize = i3;
-                                paperType = mPaperSizeType.getID(this.paperSize);
+                                paperType = mPaperSizeType.getID(paperSize);
                                 undoFlag = false;
                                 mHandler.sendEmptyMessage(2);
                                 break;
@@ -897,7 +897,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                                 paperTypeInfo.setText(getString(mLookupTable.getStringId(i3)));
                                 mLookupTable.destructor();
                                 paperType = i3;
-                                mPaperSizeType.putID(this.paperSize, paperType);
+                                mPaperSizeType.putID(paperSize, paperType);
                                 undoFlag = false;
                                 mHandler.sendEmptyMessage(3);
                                 break;
@@ -1091,7 +1091,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         int[] iArr2 = duplex_info;
         findViewById(R.id.duplex_view).setVisibility(View.GONE);
         ((LinearLayout) findViewById(R.id.duplex)).setVisibility(View.GONE);
-        switch (this.lang) {
+        switch (lang) {
             case 2:
             case 3:
                 findViewById(R.id.feed_direction_view).setVisibility(View.VISIBLE);
@@ -1111,7 +1111,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     private int getPrinterLang() {
         int i;
         IEpsonService iEpsonService;
-        if (!(this.printerLocation == 2 || (iEpsonService = mEpsonService) == null)) {
+        if (!(printerLocation == 2 || (iEpsonService = mEpsonService) == null)) {
             try {
                 i = iEpsonService.getLang();
             } catch (RemoteException e) {
@@ -1215,7 +1215,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     protected void onResume() {
         super.onResume();
         EPLog.e("SettingScr", "onResume()");
-        if (this.printerId != null && printerLocation == 1 && isRetryAfterConnectSimpleAp) {
+        if (printerId != null && printerLocation == 1 && isRetryAfterConnectSimpleAp) {
             undoFlag = false;
             if (loadSupportedMediaFile()) {
                 mHandler.sendEmptyMessage(1);

+ 1 - 1
app/src/main/java/com/epson/cameracopy/ui/FolderSelectActivity.java

@@ -125,7 +125,7 @@ public class FolderSelectActivity extends ActivityIACommon implements View.OnCli
         }
         mListView = new ListView(this);
         mListView.setAdapter(mItemDataAdapter);
-        mListView.setOnItemClickListener(this.listViewListener);
+        mListView.setOnItemClickListener(listViewListener);
         mFolderSelectBase.addView(mListView);
     }
 

+ 8 - 8
app/src/main/java/com/epson/cameracopy/ui/PrintPreviewActivity.java

@@ -310,7 +310,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     }
 
     private void updateParaSizeText() {
-        String string = getString(new MediaInfo.PaperSize().getStringId(this.currentPaperSize));
+        String string = getString(new MediaInfo.PaperSize().getStringId(currentPaperSize));
         TextView textView = papersizeTextView;
         textView.setText(getString(R.string.paper_size) + ": " + string);
     }
@@ -363,7 +363,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                 currentPaperSize = printSetting.paperSizeValue;
                 PreviewView previewView2 = mPreviewView;
                 if (previewView2 != null) {
-                    previewView2.setPaperSize(this.currentPaperSize);
+                    previewView2.setPaperSize(currentPaperSize);
                 }
                 z3 = true;
                 z2 = true;
@@ -371,7 +371,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             if (z || currentLayout != printSetting.layoutValue) {
                 currentLayout = printSetting.layoutValue;
                 if (mPreviewView != null) {
-                    if (this.currentLayout == 1) {
+                    if (currentLayout == 1) {
                         z4 = true;
                     }
                     mPreviewView.setBorderless(z4);
@@ -383,7 +383,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                 currentColor = printSetting.colorValue;
                 PreviewView previewView3 = mPreviewView;
                 if (previewView3 != null) {
-                    previewView3.setColor(this.currentColor);
+                    previewView3.setColor(currentColor);
                 }
             } else {
                 z5 = z2;
@@ -564,13 +564,13 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
 
     private void updatePaperDisplay(Message message) {
         aPaperSourceSetting = message.getData().getParcelableArrayList(PaperSourceInfo.KEY_PAPERSOURCEINFO);
-        if (this.aPaperSourceSetting != null) {
+        if (aPaperSourceSetting != null) {
             papersizeTextView.setTextColor(getResources().getColor(R.color.epson_blue));
             mPrintTargetSizeText.setTextColor(getResources().getColor(R.color.epson_blue));
             mScaleText.setTextColor(getResources().getColor(R.color.epson_blue));
             PrintSetting printSetting = new PrintSetting(this, PrintSetting.Kind.cameracopy);
             printSetting.loadSettings();
-            if (this.paperSourceInfo.checkPaperMissmatch(printSetting, aPaperSourceSetting)) {
+            if (paperSourceInfo.checkPaperMissmatch(printSetting, aPaperSourceSetting)) {
                 paperMissmath.setVisibility(View.VISIBLE);
             } else {
                 paperMissmath.setVisibility(4);
@@ -609,7 +609,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             case R.id.icon_papermissmatch /*2131231117*/:
             case R.id.paper_size_text /*2131231310*/:
             case R.id.printtarget_size_text /*2131231374*/:
-                if (this.aPaperSourceSetting != null) {
+                if (aPaperSourceSetting != null) {
                     Intent intent = new Intent();
                     intent.setClass(this, PaperSourceSettingScr.class);
                     intent.putParcelableArrayListExtra(PaperSourceInfo.KEY_PAPERSOURCEINFO, aPaperSourceSetting);
@@ -632,7 +632,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                         }
                     }).show();
                     return;
-                } else if (this.currentPrinterName.equalsIgnoreCase(getString(R.string.str_lbl_title_scan))) {
+                } else if (currentPrinterName.equalsIgnoreCase(getString(R.string.str_lbl_title_scan))) {
                     new AlertDialog.Builder(this).setCancelable(false).setTitle(R.string.printer_notselect_title).setMessage(getString(R.string.printer_notselect_warning)).setPositiveButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
                         }

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

@@ -28,12 +28,12 @@ public class ApfAdapter {
     protected static final String FILE_PREFIX_TMP1 = "tmp1_";
     protected static final String FILE_PREFIX_TMP2 = "tmp2_";
     protected static final ReentrantLock mApfLock = new ReentrantLock();
-    protected File mApfImageDir = new File(ExternalFileUtils.getInstance(this.mApplicationContext).getCacheDir(), APF_IMAGE_DIR);
+    protected File mApfImageDir = new File(ExternalFileUtils.getInstance(mApplicationContext).getCacheDir(), APF_IMAGE_DIR);
     protected Context mApplicationContext;
 
     public ApfAdapter(Context context) {
         mApplicationContext = context.getApplicationContext();
-        ExternalFileUtils.getInstance(this.mApplicationContext).createTempFolder(this.mApfImageDir.getPath());
+        ExternalFileUtils.getInstance(mApplicationContext).createTempFolder(mApfImageDir.getPath());
     }
 
     public static void clearDirectory(Context context) {
@@ -171,11 +171,11 @@ public class ApfAdapter {
     }
 
     protected File convertPngToBmp(String str) {
-        String png2jpeg = ImageUtil.png2jpeg(this.mApplicationContext, str, 1);
+        String png2jpeg = ImageUtil.png2jpeg(mApplicationContext, str, 1);
         if (png2jpeg == null) {
             return null;
         }
-        File file = new File(new File(ExternalFileUtils.getInstance(this.mApplicationContext).getTempViewDir()), png2jpeg);
+        File file = new File(new File(ExternalFileUtils.getInstance(mApplicationContext).getTempViewDir()), png2jpeg);
         if (!file.exists()) {
             return null;
         }
@@ -241,7 +241,7 @@ public class ApfAdapter {
     }
 
     protected String getTmpBmpFilename(String str, String str2) {
-        if (this.mApfImageDir == null) {
+        if (mApfImageDir == null) {
             return null;
         }
         UUID nameUUIDFromBytes = UUID.nameUUIDFromBytes(str.getBytes());

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

@@ -31,7 +31,7 @@ public class ApfPreviewView implements PhotoPreview.PreviewBitmapMaker {
 
     public void init(Context context, PhotoPreview photoPreview) {
         mApplicationContext = context.getApplicationContext();
-        mApfAdapter = new ApfAdapter(this.mApplicationContext);
+        mApfAdapter = new ApfAdapter(mApplicationContext);
         mEPPreviewImageView = photoPreview;
         mEPPreviewImageView.setPreviewBitmapMaker(this);
     }
@@ -117,7 +117,7 @@ public class ApfPreviewView implements PhotoPreview.PreviewBitmapMaker {
 
     public Bitmap getPreviewBitmap(EPImage ePImage, int i, int i2, int i3, boolean z) {
         String filename;
-        if (this.mApfMode == 0 && mSharpnessValue == 0) {
+        if (mApfMode == 0 && mSharpnessValue == 0) {
             return null;
         }
         String apfResult = mApfAdapter.getApfResult(ePImage.loadImageFileName, mApfMode, mSharpnessValue, mClearlyVividMode);

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

@@ -38,16 +38,16 @@ public class SharedParamPhoto extends SharedParam implements Serializable {
         folder_name = bundle.getString("FOLDER_NAME");
         if (!this.folder_name.equals((Object) null)) {
             arrayFilePath = bundle.getStringArrayList("FILE_NAME");
-            if (this.arrayFilePath.size() != 0) {
+            if (arrayFilePath.size() != 0) {
                 print_mode = bundle.getInt("PRINT_MODE", 0);
                 int i2 = print_mode;
                 if (i2 < 0 || i2 > 1) {
                     throw new ParametersErrorException("PRINT_MODE error");
                 }
                 media_type = bundle.getInt("MEDIA_TYPE", 0);
-                if (this.media_type == Constants.MediaName.EPS_MTID_PLAIN.getCode() || media_type == Constants.MediaName.EPS_MTID_PGPHOTO.getCode() || media_type == Constants.MediaName.EPS_MTID_HAGAKIRECL.getCode() || media_type == Constants.MediaName.EPS_MTID_HAGAKIINKJET.getCode()) {
+                if (media_type == Constants.MediaName.EPS_MTID_PLAIN.getCode() || media_type == Constants.MediaName.EPS_MTID_PGPHOTO.getCode() || media_type == Constants.MediaName.EPS_MTID_HAGAKIRECL.getCode() || media_type == Constants.MediaName.EPS_MTID_HAGAKIINKJET.getCode()) {
                     media_size = bundle.getInt("MEDIA_SIZE", 0);
-                    if (this.media_size == Constants.PaperName.EPS_MSID_A4.getCode() || media_size == Constants.PaperName.EPS_MSID_4X6.getCode() || media_size == Constants.PaperName.EPS_MSID_L.getCode() || media_size == Constants.PaperName.EPS_MSID_POSTCARD.getCode()) {
+                    if (media_size == Constants.PaperName.EPS_MSID_A4.getCode() || media_size == Constants.PaperName.EPS_MSID_4X6.getCode() || media_size == Constants.PaperName.EPS_MSID_L.getCode() || media_size == Constants.PaperName.EPS_MSID_POSTCARD.getCode()) {
                         color_mode = bundle.getInt("COLOR_MODE", 0);
                         int i3 = color_mode;
                         if (i3 == 0 || i3 == 1) {
@@ -79,7 +79,7 @@ public class SharedParamPhoto extends SharedParam implements Serializable {
         arrayFileFullPath = new ArrayList<>();
         for (int i = 0; i < arrayFilePath.size(); i++) {
             ArrayList<String> arrayList = arrayFileFullPath;
-            arrayList.add(this.folder_name + CommonDefine.SLASH + arrayFilePath.get(i));
+            arrayList.add(folder_name + CommonDefine.SLASH + arrayFilePath.get(i));
         }
     }
 

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

@@ -32,7 +32,7 @@ public class SharedParamScan extends SharedParam implements Serializable {
             throw new ParametersErrorException("SCAN_TYPE errorr");
         }
         pixel_main = bundle.getInt("PIXEL_MAIN");
-        if (this.pixel_main >= 0) {
+        if (pixel_main >= 0) {
             pixel_sub = bundle.getInt("PIXEL_SUB");
             res_main = bundle.getInt("RES_MAIN");
             res_sub = bundle.getInt("RES_SUB");

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

@@ -77,7 +77,7 @@ public class SharedParamStatus extends SharedParam implements Serializable {
                     case -1:
                         break;
                     case 0:
-                        if (this.arrayOutInkRemain.get(i).intValue() != 0) {
+                        if (arrayOutInkRemain.get(i).intValue() != 0) {
                             arrayList2.add(0);
                             break;
                         } else {

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

@@ -80,7 +80,7 @@ public class LocalProgressDialog extends DialogFragment {
     }
 
     private void showCancelConfirmDialog() {
-        if (this.mCancelConfirmDialogTag != null) {
+        if (mCancelConfirmDialogTag != null) {
             FragmentManager fragmentManager = getFragmentManager();
             if (fragmentManager != null) {
                 ConfirmCancelDialog.newInstance(R.string.str_msg_scan_cancel).show(fragmentManager, mCancelConfirmDialogTag);

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

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

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

@@ -58,7 +58,7 @@ public abstract class StorageProcessActivity extends StorageActivity {
     protected void onStart() {
         super.onStart();
         updateSignInStatus();
-        if (this.mStorageServiceClient.isSignedIn(this)) {
+        if (mStorageServiceClient.isSignedIn(this)) {
             onUpdateProcessView();
         }
     }
@@ -102,7 +102,7 @@ public abstract class StorageProcessActivity extends StorageActivity {
     public void updateSignInStatus() {
         SignInStatus signInStatus;
         WiFiDirectManager.setPriorityToSimpleAP(this, false);
-        if (this.mStorageServiceClient.isSignedIn(this)) {
+        if (mStorageServiceClient.isSignedIn(this)) {
             signInStatus = SignInStatus.SIGNED_IN;
         } else {
             signInStatus = SignInStatus.SIGNED_OUT;
@@ -132,12 +132,12 @@ public abstract class StorageProcessActivity extends StorageActivity {
 
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.C2138menu.menu_sign_inout, menu);
-        if (this.mStorageServiceClient.isSignedIn(this)) {
+        if (mStorageServiceClient.isSignedIn(this)) {
             menu.removeItem(R.id.menu_signin);
-            menu.findItem(R.id.menu_signout).setEnabled(this.bEnableSighIn);
+            menu.findItem(R.id.menu_signout).setEnabled(bEnableSighIn);
         } else {
             menu.removeItem(R.id.menu_signout);
-            menu.findItem(R.id.menu_signin).setEnabled(this.bEnableSighIn);
+            menu.findItem(R.id.menu_signin).setEnabled(bEnableSighIn);
         }
         return super.onCreateOptionsMenu(menu);
     }

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

@@ -61,7 +61,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
             mPrintLog = (PrintLog) getIntent().getSerializableExtra("print_log");
         } catch (ClassCastException unused) {
         }
-        if (this.mPrintLog == null) {
+        if (mPrintLog == null) {
             mPrintLog = new PrintLog();
         }
     }
@@ -71,10 +71,10 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         if (storageItemAdapter == null) {
             finish();
         } else if (storageItemAdapter.areAllItemsEnabled()) {
-            if (this.mFolderStack.size() > 1) {
+            if (mFolderStack.size() > 1) {
                 mFolderStack.pop();
                 if (isConnected()) {
-                    new EnumerateTask(this.mFolderStack.peek()).executeOnExecutor(new Void[0]);
+                    new EnumerateTask(mFolderStack.peek()).executeOnExecutor(new Void[0]);
                 } else {
                     showConnectionError();
                 }
@@ -99,7 +99,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
 
     protected void onStop() {
         super.onStop();
-        if (this.mIsDownloading && Build.VERSION.SDK_INT >= 29) {
+        if (mIsDownloading && Build.VERSION.SDK_INT >= 29) {
             mIsDownloadInterruption = true;
             task.cancel(false);
         }
@@ -107,14 +107,14 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
 
     protected void onRestart() {
         super.onRestart();
-        if (this.mIsDownloadInterruption && !this.mIsDownloading) {
-            itemClick(this.mPosition);
+        if (mIsDownloadInterruption && !this.mIsDownloading) {
+            itemClick(mPosition);
         }
         mIsDownloadInterruption = false;
     }
 
     private void onUpdateProcessView() {
-        if (this.mListView.getAdapter() != null) {
+        if (mListView.getAdapter() != null) {
             return;
         }
         if (isConnected()) {
@@ -175,7 +175,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
 
             public void run() {
                 boolean unused = StorageProcessDownloadActivity.this.mIsDownloading = false;
-                if (this.error == StorageServiceClient.ProcessError.NONE) {
+                if (error == StorageServiceClient.ProcessError.NONE) {
                     StorageProcessDownloadActivity storageProcessDownloadActivity = StorageProcessDownloadActivity.this;
                     Intent previewIntent = StorageProcessDownloadActivity.getPreviewIntent(DownloadTask.this.localPath, storageProcessDownloadActivity, StorageProcessDownloadActivity.this.mPrintLog);
                     previewIntent.setFlags(Videoio.CAP_INTELPERC_IMAGE_GENERATOR);
@@ -183,7 +183,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
                     if (!StorageProcessDownloadActivity.this.mIsDownloadInterruption) {
                         storageProcessDownloadActivity.startActivityForResult(previewIntent, 0);
                     }
-                } else if (this.error != StorageServiceClient.ProcessError.CANCELED) {
+                } else if (error != StorageServiceClient.ProcessError.CANCELED) {
                     StorageProcessDownloadActivity.this.showErrorDialog((int) R.string.download_error_mes);
                 }
                 StorageProcessDownloadActivity.this.taskInvoked(false);
@@ -288,14 +288,14 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
             if (!isNeedSignin) {
                 progress.show();
             }
-            if (this.item.type == StorageItem.ItemType.LOADMORE) {
-                StorageProcessDownloadActivity.this.getEnumerator().enumerate(this.item, onLoadedMore);
+            if (item.type == StorageItem.ItemType.LOADMORE) {
+                StorageProcessDownloadActivity.this.getEnumerator().enumerate(item, onLoadedMore);
                 return null;
             } else if (!isNeedSignin) {
-                StorageProcessDownloadActivity.this.getEnumerator().enumerate(this.item, onEnumerated);
+                StorageProcessDownloadActivity.this.getEnumerator().enumerate(item, onEnumerated);
                 return null;
             } else {
-                StorageProcessDownloadActivity.this.getEnumerator().enumerate(this.item, onEnumerated, new StorageServiceClient.SigninCompletion() {
+                StorageProcessDownloadActivity.this.getEnumerator().enumerate(item, onEnumerated, new StorageServiceClient.SigninCompletion() {
                     public void onSigninCompletion() {
                         EnumerateTask.this.progress.show((String) null, (StorageActivity.CancelRequestCallback) null, false);
                     }
@@ -458,7 +458,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
     }
 
     private StorageServiceClient.Enumerator getEnumerator() {
-        if (this.mEnumerator == null) {
+        if (mEnumerator == null) {
             mEnumerator = getStorageClient().getEnumerator(this);
         }
         return mEnumerator;

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

@@ -69,7 +69,7 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
         if (!(bundle == null || (string = bundle.getString("Upload.Editing.Filename")) == null)) {
             mUploadFilename = string;
         }
-        setFilename(this.mUploadFilename);
+        setFilename(mUploadFilename);
         mUploadFileLocalPathList = getIntent().getStringArrayListExtra(StorageProcessActivity.EXTRA_UPLOADFILE_LIST);
         if (getStorageClient() instanceof GoogleV3UploadClient) {
             startActivity(GoogleV3UploadSignInActivity.getPlayServiceCheckIntent(this));
@@ -116,13 +116,13 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
                 }
             });
             String str = "";
-            if (StorageServiceClient.UploadFileType.PDF.equals(this.fileType)) {
-                String str2 = new File(this.localPaths.get(0)).getParent() + CommonDefine.SLASH + uploadFilename + CommonDefine.FileType_PDF;
+            if (StorageServiceClient.UploadFileType.PDF.equals(fileType)) {
+                String str2 = new File(localPaths.get(0)).getParent() + CommonDefine.SLASH + uploadFilename + CommonDefine.FileType_PDF;
                 new libHaru().createPDF((ArrayList) localPaths, str2);
                 localPaths.clear();
                 localPaths.add(str2);
                 str = CommonDefine.FileType_PDF;
-            } else if (StorageServiceClient.UploadFileType.JPEG.equals(this.fileType)) {
+            } else if (StorageServiceClient.UploadFileType.JPEG.equals(fileType)) {
                 str = ".jpg";
             }
             boolean z = !this.uploadFilename.equals(StorageProcessUploadActivity.this.generateUploadFilename(0));
@@ -180,7 +180,7 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
                     throw th;
                 }
             }
-            if (this.canceled) {
+            if (canceled) {
                 taskError = StorageServiceClient.ProcessError.CANCELED;
             }
             reentrantLock.unlock();
@@ -209,9 +209,9 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
             ((RadioGroup) findViewById(R.id.file_type_for_upload)).check(R.id.pdf_type);
             List<String> list = mUploadFileLocalPathList;
             if (list != null && list.size() > 0) {
-                setFilename(this.mUploadFilename);
+                setFilename(mUploadFilename);
             }
-            ((TextView) findViewById(R.id.file_size)).setText(getTotalFileSize(this.mUploadFileLocalPathList));
+            ((TextView) findViewById(R.id.file_size)).setText(getTotalFileSize(mUploadFileLocalPathList));
             return;
         }
         viewGroup.setVisibility(4);

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

@@ -41,7 +41,7 @@ public class StorageSecureStore {
     }
 
     public boolean put(String str, String str2) {
-        KeyValueDatabase keyValueDatabase = new KeyValueDatabase(this.mContext);
+        KeyValueDatabase keyValueDatabase = new KeyValueDatabase(mContext);
         boolean insert = keyValueDatabase.insert(str, str2);
         keyValueDatabase.close();
         reloadCache();
@@ -60,7 +60,7 @@ public class StorageSecureStore {
     }
 
     public boolean revoke(String str) {
-        KeyValueDatabase keyValueDatabase = new KeyValueDatabase(this.mContext);
+        KeyValueDatabase keyValueDatabase = new KeyValueDatabase(mContext);
         boolean delete = keyValueDatabase.delete(str);
         keyValueDatabase.close();
         reloadCache();
@@ -123,7 +123,7 @@ public class StorageSecureStore {
     }
 
     private void reloadCache() {
-        KeyValueDatabase keyValueDatabase = new KeyValueDatabase(this.mContext);
+        KeyValueDatabase keyValueDatabase = new KeyValueDatabase(mContext);
         mKeyValueMap = keyValueDatabase.select();
         keyValueDatabase.close();
     }

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

@@ -113,7 +113,7 @@ public abstract class StorageSignInActivity extends StorageActivity {
         protected Boolean doInBackground(Void... voidArr) {
             progress = new StorageActivity.OverlayProgress();
             progress.show();
-            return Boolean.valueOf(StorageSignInActivity.this.mBasicSignIn.signInBackground(this.mUserName, mPassword));
+            return Boolean.valueOf(StorageSignInActivity.this.mBasicSignIn.signInBackground(mUserName, mPassword));
         }
 
         protected void onPostExecute(Boolean bool) {

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

@@ -42,7 +42,7 @@ public class StorageWaitingActivity extends Activity {
     }
 
     protected void onDestroy() {
-        unregisterReceiver(this.mBroadcastReceiver);
+        unregisterReceiver(mBroadcastReceiver);
         super.onDestroy();
     }
 
@@ -66,7 +66,7 @@ public class StorageWaitingActivity extends Activity {
         intentFilter.addAction(DISMISS_ACTION);
         intentFilter.addAction(CHANGE_ACTION);
         intentFilter.addAction(REGISTER_ACTION);
-        registerReceiver(this.mBroadcastReceiver, intentFilter);
+        registerReceiver(mBroadcastReceiver, intentFilter);
     }
 
     private Dialog createCancelDialog() {

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

@@ -104,7 +104,7 @@ public class BoxNetClient extends StorageServiceClient {
 
             public void cancel() {
                 synchronized (this) {
-                    if (this.mDownloadThread != null) {
+                    if (mDownloadThread != null) {
                         mDownloadThread.cancel();
                     }
                 }
@@ -177,7 +177,7 @@ public class BoxNetClient extends StorageServiceClient {
             BoxSession boxSession = mBoxSession;
             if (boxSession != null) {
                 mBoxApiFolder = new BoxApiFolder(boxSession);
-                mBoxApiFile = new BoxApiFile(this.mBoxSession);
+                mBoxApiFile = new BoxApiFile(mBoxSession);
                 return;
             }
             return;
@@ -292,7 +292,7 @@ public class BoxNetClient extends StorageServiceClient {
     }
 
     private void uploadFileToFolder(@NonNull File file, @NonNull String str, @NonNull String str2) throws BoxException, IOException {
-        if (this.mBoxSession != null) {
+        if (mBoxSession != null) {
             String findOrCreateFolder = findOrCreateFolder(str);
             if (findOrCreateFolder != null) {
                 uploadOrUpdate(file, str2, findOrCreateFolder);
@@ -319,7 +319,7 @@ public class BoxNetClient extends StorageServiceClient {
     @Nullable
     private String searchFolderInRoot(@NonNull String str) throws BoxException {
         String str2 = "^" + str.replaceFirst(" .$", "");
-        BoxApiSearch boxApiSearch = new BoxApiSearch(this.mBoxSession);
+        BoxApiSearch boxApiSearch = new BoxApiSearch(mBoxSession);
         int i = 0;
         while (true) {
             Iterator it = ((BoxIteratorItems) boxApiSearch.getSearchRequest(str2).setOffset(i).setLimit(3).limitType(BoxFolder.TYPE).limitAncestorFolderIds(new String[]{BoxConstants.ROOT_FOLDER_ID}).send()).iterator();
@@ -372,7 +372,7 @@ public class BoxNetClient extends StorageServiceClient {
     /* access modifiers changed from: private */
     @NonNull
     public ArrayList<StorageItem> listFolder(@NonNull String str) throws BoxException {
-        if (this.mBoxApiFolder != null) {
+        if (mBoxApiFolder != null) {
             ArrayList<StorageItem> arrayList = new ArrayList<>();
             Iterator it = ((BoxIteratorItems) mBoxApiFolder.getItemsRequest(str).send()).iterator();
             while (it.hasNext()) {
@@ -393,7 +393,7 @@ public class BoxNetClient extends StorageServiceClient {
     }
 
     private void downloadFile(@NonNull String str, @NonNull String str2) throws IOException, BoxException {
-        if (this.mBoxApiFile != null) {
+        if (mBoxApiFile != null) {
             File file = new File(str2);
             file.createNewFile();
             mBoxApiFile.getDownloadRequest(file, str).send();
@@ -416,7 +416,7 @@ public class BoxNetClient extends StorageServiceClient {
 
         public void run() {
             try {
-                mCompleteListener.onEnumerateComplete(this.mBoxClient.listFolder(this.mBaseFolderId), StorageServiceClient.ProcessError.NONE);
+                mCompleteListener.onEnumerateComplete(mBoxClient.listFolder(mBaseFolderId), StorageServiceClient.ProcessError.NONE);
             } catch (BoxException unused) {
                 mCompleteListener.onEnumerateComplete((List<StorageItem>) null, StorageServiceClient.ProcessError.ERROR);
             }
@@ -441,14 +441,14 @@ public class BoxNetClient extends StorageServiceClient {
 
         public void run() {
             try {
-                mBoxClient.downloadFile(this.mOnlineStorageItem.path, mLocalPath);
-                if (this.mCanceled) {
+                mBoxClient.downloadFile(mOnlineStorageItem.path, mLocalPath);
+                if (mCanceled) {
                     mDownloadEndListener.onDownloadComplete((StorageItem) null, (String) null, StorageServiceClient.ProcessError.CANCELED);
                 } else {
-                    mDownloadEndListener.onDownloadComplete(this.mOnlineStorageItem, mLocalPath, StorageServiceClient.ProcessError.NONE);
+                    mDownloadEndListener.onDownloadComplete(mOnlineStorageItem, mLocalPath, StorageServiceClient.ProcessError.NONE);
                 }
             } catch (BoxException | IOException unused) {
-                if (this.mCanceled) {
+                if (mCanceled) {
                     mDownloadEndListener.onDownloadComplete((StorageItem) null, (String) null, StorageServiceClient.ProcessError.CANCELED);
                 } else {
                     mDownloadEndListener.onDownloadComplete((StorageItem) null, (String) null, StorageServiceClient.ProcessError.ERROR);
@@ -477,8 +477,8 @@ public class BoxNetClient extends StorageServiceClient {
 
         public void run() {
             try {
-                mBoxClient.uploadFileToFolder(new File(this.mOrigLocalFilePath), "Epson iPrint", mUploadOnlineName);
-                mUploadEndListener.onUploadComplete(this.mOrigLocalFilePath, mUploadOnlineName, StorageServiceClient.ProcessError.NONE);
+                mBoxClient.uploadFileToFolder(new File(mOrigLocalFilePath), "Epson iPrint", mUploadOnlineName);
+                mUploadEndListener.onUploadComplete(mOrigLocalFilePath, mUploadOnlineName, StorageServiceClient.ProcessError.NONE);
             } catch (BoxException | IOException unused) {
                 mUploadEndListener.onUploadComplete((String) null, (String) null, StorageServiceClient.ProcessError.ERROR);
             }

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

@@ -35,14 +35,14 @@ public class BoxNetSignInActivity extends StorageSignInActivity implements BoxAu
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         mModeLogout = getMode(getIntent());
-        if (this.mModeLogout) {
+        if (mModeLogout) {
             setContentView((int) R.layout.storage_progress);
             findViewById(R.id.messageText).setVisibility(8);
             findViewById(R.id.cancelButton).setVisibility(8);
         }
         mBoxClient = BoxNetClient.getInstance();
         mBoxClient.setSessionAuthListener(this);
-        if (this.mModeLogout) {
+        if (mModeLogout) {
             startLogoutTask();
         } else {
             mBoxClient.authenticate();
@@ -57,7 +57,7 @@ public class BoxNetSignInActivity extends StorageSignInActivity implements BoxAu
     }
 
     private void startLogoutTask() {
-        if (this.mBoxClient == null) {
+        if (mBoxClient == null) {
             finish();
         }
         new LogoutTask(this, mBoxClient).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);

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

@@ -235,7 +235,7 @@ public class DropboxV2Client extends StorageServiceClient {
         }
 
         public void start(StorageServiceClient.UploadCompletion uploadCompletion) {
-            AsyncTask.THREAD_POOL_EXECUTOR.execute(new LocalUploader(this.mOrgFilePath, mUploadPath, uploadCompletion));
+            AsyncTask.THREAD_POOL_EXECUTOR.execute(new LocalUploader(mOrgFilePath, mUploadPath, uploadCompletion));
         }
     }
 

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

@@ -55,7 +55,7 @@ public class EvernoteRequest {
     }
 
     public List<StorageItem> getItemList(StorageItem storageItem) throws IOException, TException, EDAMUserException, EDAMSystemException, EDAMNotFoundException {
-        EvernoteSession evernoteSession = EvernoteClient.getEvernoteSession(this.mContext);
+        EvernoteSession evernoteSession = EvernoteClient.getEvernoteSession(mContext);
         if (storageItem.type == StorageItem.ItemType.DIRECTORY) {
             ArrayList arrayList = new ArrayList();
             if (URI_FILE_FEED.equals(storageItem.path)) {
@@ -106,7 +106,7 @@ public class EvernoteRequest {
 
     private StorageItem getUploadFolder() throws TException, EDAMUserException, EDAMSystemException {
         StorageItem storageItem = null;
-        for (Notebook next : EvernoteClient.getEvernoteSession(this.mContext).getEvernoteClientFactory().getNoteStoreClient().listNotebooks()) {
+        for (Notebook next : EvernoteClient.getEvernoteSession(mContext).getEvernoteClientFactory().getNoteStoreClient().listNotebooks()) {
             if ("Epson iPrint".equals(next.getName())) {
                 storageItem = new StorageItem();
                 storageItem.path = next.getGuid();
@@ -119,7 +119,7 @@ public class EvernoteRequest {
     }
 
     private StorageItem newUploadFolder() throws TException, EDAMUserException, EDAMSystemException {
-        EvernoteSession evernoteSession = EvernoteClient.getEvernoteSession(this.mContext);
+        EvernoteSession evernoteSession = EvernoteClient.getEvernoteSession(mContext);
         Notebook notebook = new Notebook();
         notebook.setName("Epson iPrint");
         Notebook createNotebook = evernoteSession.getEvernoteClientFactory().getNoteStoreClient().createNotebook(notebook);
@@ -210,7 +210,7 @@ public class EvernoteRequest {
         if (message != null) {
             EPLog.e(TAG, message);
         }
-        EvernoteClient.logout(this.mContext);
+        EvernoteClient.logout(mContext);
         return StorageServiceClient.ProcessError.ERROR;
     }
 

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

@@ -39,14 +39,14 @@ public class DownloadTask extends AsyncTask<OnlineFile, Void, OnlineFile> implem
         }
         try {
             if (!(googleDriveFile instanceof GoogleDriveFile) || !googleDriveFile.isGoogleDocuments()) {
-                File outFile = getOutFile(this.mApplicationContext, getExtensionFromMimeType((OnlineFile) googleDriveFile));
+                File outFile = getOutFile(mApplicationContext, getExtensionFromMimeType((OnlineFile) googleDriveFile));
                 mDownloadFile = outFile;
                 if (outFile == null) {
                     return null;
                 }
                 return mMyDrive.downloadFile(googleDriveFile, outFile, this);
             }
-            File outFile2 = getOutFile(this.mApplicationContext, CommonDefine.FileType_PDF);
+            File outFile2 = getOutFile(mApplicationContext, CommonDefine.FileType_PDF);
             mDownloadFile = outFile2;
             if (outFile2 == null) {
                 return null;
@@ -75,7 +75,7 @@ public class DownloadTask extends AsyncTask<OnlineFile, Void, OnlineFile> implem
     }
 
     protected void onPostExecute(OnlineFile onlineFile) {
-        if (this.mDownloadCancelled) {
+        if (mDownloadCancelled) {
             mDownloadCompleteListener.onDownloadComplete(false, (String) null);
         }
         if (onlineFile != null) {
@@ -132,7 +132,7 @@ public class DownloadTask extends AsyncTask<OnlineFile, Void, OnlineFile> implem
     }
 
     public void deleteDownloadFile() {
-        if (this.mDownloadFile != null && mDownloadFile.exists()) {
+        if (mDownloadFile != null && mDownloadFile.exists()) {
             mDownloadFile.delete();
             mDownloadFile = null;
         }

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

@@ -21,7 +21,7 @@ public class DriveListTask extends AsyncTask<OnlineFile, Void, ArrayList<OnlineF
 
     protected ArrayList<OnlineFile> doInBackground(OnlineFile... onlineFileArr) {
         try {
-            return filterFiles(this.mMyDrive.listFile(onlineFileArr != null ? onlineFileArr[0] : null));
+            return filterFiles(mMyDrive.listFile(onlineFileArr != null ? onlineFileArr[0] : null));
         } catch (Exception e) {
             e.printStackTrace();
             mException = e;

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

@@ -66,7 +66,7 @@ public class GoogleDownloadPresenter implements GoogleDownloadContract.UserActio
                 downloadView.showOfflineErrorDialog();
             } else if (!this.mPlayServiceDialogManager.checkPlayService(downloadView.getActivityWrapper(), this) && mTaskRunning == TaskState.STOP) {
                 downloadView.setSignInButtonEnabled(true);
-                if (this.mIprintGoogleSignIn.isSignInValid(downloadView.getActivityWrapper().getActivity(), IprintGoogleSignIn.OperationType.DOWNLOAD)) {
+                if (mIprintGoogleSignIn.isSignInValid(downloadView.getActivityWrapper().getActivity(), IprintGoogleSignIn.OperationType.DOWNLOAD)) {
                     changeSignInStatus(downloadView, SignInState.SIGN_IN);
                     if (!this.mStartListDone) {
                         start1stListTask(downloadView, mIprintGoogleSignIn.getSignInAccount(downloadView.getActivityWrapper().getActivity()));
@@ -99,7 +99,7 @@ public class GoogleDownloadPresenter implements GoogleDownloadContract.UserActio
         GoogleDownloadContract.View downloadView = getDownloadView();
         if (downloadView != null) {
             downloadView.setSignInButtonEnabled(false);
-            if (this.mSignInStatus == SignInState.SIGN_IN) {
+            if (mSignInStatus == SignInState.SIGN_IN) {
                 mIprintGoogleSignIn.disconnectAccount(downloadView.getActivityWrapper(), this);
             } else {
                 mIprintGoogleSignIn.startSignIn(this, downloadView.getActivityWrapper(), IprintGoogleSignIn.OperationType.DOWNLOAD);
@@ -190,11 +190,11 @@ public class GoogleDownloadPresenter implements GoogleDownloadContract.UserActio
     public void backKeyPressed() {
         GoogleDownloadContract.View downloadView = getDownloadView();
         if (downloadView != null) {
-            if (this.mSignInStatus != SignInState.SIGN_IN) {
+            if (mSignInStatus != SignInState.SIGN_IN) {
                 downloadView.finishActivity();
             } else if (!this.mGoogleDownloader.isDownloadValid()) {
                 throw new IllegalStateException();
-            } else if (this.mGoogleDownloader.isRootFolder()) {
+            } else if (mGoogleDownloader.isRootFolder()) {
                 downloadView.finishActivity();
             } else {
                 startListTask(new ParentFolder());

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

@@ -253,7 +253,7 @@ public class GoogleDownloader {
         }
 
         private void gotoParent() {
-            if (this.mParentDirList.isEmpty()) {
+            if (mParentDirList.isEmpty()) {
                 mCurrentFolder = null;
                 gotoRoot();
                 return;

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

@@ -19,7 +19,7 @@ public class GoogleDriveFile implements OnlineFile {
     }
 
     public boolean isFolder() {
-        return GoogleDriveMimeType.MIME_TYPE_GOOGLE_FOLDER.equals(this.mDriveFile.getMimeType());
+        return GoogleDriveMimeType.MIME_TYPE_GOOGLE_FOLDER.equals(mDriveFile.getMimeType());
     }
 
     @Nullable

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

@@ -74,7 +74,7 @@ public class GoogleV3UploadClient extends StorageServiceClient {
         }
 
         public void start(StorageServiceClient.UploadCompletion uploadCompletion) {
-            new UploadTask(this.mContext, uploadCompletion).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new UploadInfo[]{this.mUploadInfo});
+            new UploadTask(mContext, uploadCompletion).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new UploadInfo[]{this.mUploadInfo});
         }
     }
 
@@ -93,7 +93,7 @@ public class GoogleV3UploadClient extends StorageServiceClient {
                 return null;
             }
             UploadInfo uploadInfo = uploadInfoArr[0];
-            DriveWriter createDriveWriter = DriveWriter.createDriveWriter(this.mContext);
+            DriveWriter createDriveWriter = DriveWriter.createDriveWriter(mContext);
             try {
                 createDriveWriter.uploadFile(uploadInfo.originalLocalPath, uploadInfo.uploadFilename, uploadInfo.fileType == StorageServiceClient.UploadFileType.PDF ? "application/pdf" : "image/jpeg", createDriveWriter.findOrCreateFolder("Epson iPrint"));
                 notifyUploadEnd(uploadInfo, StorageServiceClient.ProcessError.NONE);

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

@@ -94,11 +94,11 @@ public class GoogleV3UploadSignInActivity extends AppCompatActivity implements A
         if (!this.mMisc.isOnline(this)) {
             showErrorDialog(R.string.network_error_mes, DIALOG_TAG_OFFLINE_ERROR);
         } else if (!this.mPlayServiceDialogManager.checkPlayService(this, this)) {
-            if (this.mCheckServiceOnly) {
+            if (mCheckServiceOnly) {
                 finishWithResult(true);
             } else if (!this.mWaitSingInProcess) {
                 mWaitSingInProcess = true;
-                if (this.mStartForDisconnect) {
+                if (mStartForDisconnect) {
                     mIprintGoogleSignIn.disconnectAccount(this, this);
                 } else {
                     mIprintGoogleSignIn.startSignIn(this, this, IprintGoogleSignIn.OperationType.UPLOAD);
@@ -127,7 +127,7 @@ public class GoogleV3UploadSignInActivity extends AppCompatActivity implements A
     }
 
     public void playServiceInstallCancel() {
-        if (this.mCheckServiceOnly) {
+        if (mCheckServiceOnly) {
             finishWithResult(false);
         } else {
             showErrorDialog(R.string.authenticate_error_mes, DIALOG_TAG_SIGN_IN_FAILED);

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

@@ -76,7 +76,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         mListView = (ListView) findViewById(16908298);
         mListView.setCacheColorHint(0);
         mFileListAdapter = new FileListAdapter(getApplicationContext());
-        mListView.setAdapter(this.mFileListAdapter);
+        mListView.setAdapter(mFileListAdapter);
         mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
                 int unused = ListAndDownloadActivity.this.mPosition = i;
@@ -141,13 +141,13 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
 
     public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.C2138menu.menu_sign_inout, menu);
-        if (this.mSignInOutButtonType == 0) {
+        if (mSignInOutButtonType == 0) {
             menu.removeItem(R.id.menu_signout);
-            menu.findItem(R.id.menu_signin).setEnabled(this.mSignInOutButtonEnabled);
+            menu.findItem(R.id.menu_signin).setEnabled(mSignInOutButtonEnabled);
             return true;
         }
         menu.removeItem(R.id.menu_signin);
-        menu.findItem(R.id.menu_signout).setEnabled(this.mSignInOutButtonEnabled);
+        menu.findItem(R.id.menu_signout).setEnabled(mSignInOutButtonEnabled);
         return true;
     }
 
@@ -343,8 +343,8 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
 
     protected void onRestart() {
         super.onRestart();
-        if (this.mIsDownloadInterruption) {
-            localOnItemClick(this.mPosition);
+        if (mIsDownloadInterruption) {
+            localOnItemClick(mPosition);
         }
         mIsDownloadInterruption = false;
     }

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

@@ -249,7 +249,7 @@ public class OneDriveClient extends StorageServiceClient {
     private void uploadLargeFile(UploadSession uploadSession, InputStream inputStream, int i, IProgressCallback<Item> iProgressCallback) {
         ChunkedUploadProvider createUploadProvider;
         QueryOption queryOption = new QueryOption("@name.conflictBehavior", "rename");
-        if (uploadSession != null && (createUploadProvider = uploadSession.createUploadProvider(this.oneDriveClient, inputStream, i, Item.class)) != null) {
+        if (uploadSession != null && (createUploadProvider = uploadSession.createUploadProvider(oneDriveClient, inputStream, i, Item.class)) != null) {
             try {
                 createUploadProvider.upload(Collections.singletonList(queryOption), iProgressCallback, 655360, 5);
             } catch (IOException e) {
@@ -526,7 +526,7 @@ public class OneDriveClient extends StorageServiceClient {
                 boolean z = false;
                 bCanceled = false;
                 bConvertPdf = OneDriveClient.this.isConvertPdfExtension((Item) OneDriveDownloader.this.mStorageItem.userInfo) || OneDriveClient.this.isConvertPdfMimeType((Item) OneDriveDownloader.this.mStorageItem.userInfo);
-                if (this.bConvertPdf && !this.bCanceled) {
+                if (bConvertPdf && !this.bCanceled) {
                     try {
                         inputStream = OneDriveClient.this.getDownloadInputStreamPdf(OneDriveClient.this.oneDriveClient, OneDriveDownloader.this.mItemid);
                     } catch (ClientException e) {
@@ -547,7 +547,7 @@ public class OneDriveClient extends StorageServiceClient {
                     }
                 }
                 String access$1600 = bConvertPdf ? OneDriveClient.this.getConvertPdfName(OneDriveDownloader.this.mWriteFilename) : OneDriveDownloader.this.mWriteFilename;
-                if (this.inputStream != null && !this.bCanceled) {
+                if (inputStream != null && !this.bCanceled) {
                     try {
                         File file = new File(access$1600);
                         if (!file.exists()) {
@@ -581,7 +581,7 @@ public class OneDriveClient extends StorageServiceClient {
 
             private void closeStream() {
                 try {
-                    if (this.inputStream != null) {
+                    if (inputStream != null) {
                         inputStream.close();
                         inputStream = null;
                     }
@@ -617,8 +617,8 @@ public class OneDriveClient extends StorageServiceClient {
             StorageServiceClient.ProcessError unused = OneDriveClient.this.mUploadProcessError = StorageServiceClient.ProcessError.NONE;
             OneDriveClient oneDriveClient = OneDriveClient.this;
             if (!oneDriveClient.isExpired(oneDriveClient.oneDriveClient)) {
-                mLocalUploader = new LocalUploader(this.mActivity, mOrgFilePath, mUploadPath, uploadCompletion);
-                AsyncTask.THREAD_POOL_EXECUTOR.execute(this.mLocalUploader);
+                mLocalUploader = new LocalUploader(mActivity, mOrgFilePath, mUploadPath, uploadCompletion);
+                AsyncTask.THREAD_POOL_EXECUTOR.execute(mLocalUploader);
                 return;
             }
             StorageServiceClient.ProcessError unused2 = OneDriveClient.this.mUploadProcessError = StorageServiceClient.ProcessError.RETRY;
@@ -649,10 +649,10 @@ public class OneDriveClient extends StorageServiceClient {
         public void run() {
             bCanceled = false;
             result = false;
-            if (!(this.mOrgFilePath == null || mUploadFilename == null || bCanceled)) {
+            if (!(mOrgFilePath == null || mUploadFilename == null || bCanceled)) {
                 fileInputStream = null;
                 try {
-                    fileInputStream = new FileInputStream(this.mOrgFilePath);
+                    fileInputStream = new FileInputStream(mOrgFilePath);
                     try {
                         int available = fileInputStream.available();
                         if (available > 0 && !this.bCanceled) {
@@ -669,7 +669,7 @@ public class OneDriveClient extends StorageServiceClient {
                 }
                 closefile();
             }
-            mNotifier.onUploadComplete(this.mOrgFilePath, mUploadFilename, result ? StorageServiceClient.ProcessError.NONE : bCanceled ? StorageServiceClient.ProcessError.CANCELED : StorageServiceClient.ProcessError.ERROR);
+            mNotifier.onUploadComplete(mOrgFilePath, mUploadFilename, result ? StorageServiceClient.ProcessError.NONE : bCanceled ? StorageServiceClient.ProcessError.CANCELED : StorageServiceClient.ProcessError.ERROR);
         }
 
         private void upload(int i) {
@@ -705,7 +705,7 @@ public class OneDriveClient extends StorageServiceClient {
 
         private void closefile() {
             try {
-                if (this.fileInputStream != null) {
+                if (fileInputStream != null) {
                     fileInputStream.close();
                 }
             } catch (IOException e) {

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

@@ -35,7 +35,7 @@ public class OneDriveStorageProcessUploadActivity extends StorageProcessUploadAc
     private void checkSession() {
         if (isConnected()) {
             mStorageServiceClient = (OneDriveClient) getStorageClient();
-            if (this.mStorageServiceClient.isSignedIn(this) && mStorageServiceClient.isSessionExpired()) {
+            if (mStorageServiceClient.isSignedIn(this) && mStorageServiceClient.isSessionExpired()) {
                 new Thread() {
                     public void run() {
                         super.run();

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

@@ -52,7 +52,7 @@ public class AltViewImageAdapter extends BaseAdapter implements CommonDefine {
         ImageItem imageItem;
         if (view == null) {
             relativeLayout = new RelativeLayout(mContext);
-            relativeLayout.setLayoutParams(new AbsListView.LayoutParams(this.itmW, itmH));
+            relativeLayout.setLayoutParams(new AbsListView.LayoutParams(itmW, itmH));
             relativeLayout.setGravity(17);
         } else {
             relativeLayout = (RelativeLayout) view;

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

@@ -116,7 +116,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
             }
         }
         isKeepSimleApConnect = false;
-        if (this.doTotalFileSizeCalc) {
+        if (doTotalFileSizeCalc) {
             mTotalFileSizeCalcTask = new TotalFileSizeCalcTask();
             mTotalFileSizeCalcTask.execute(new Void[0]);
             doTotalFileSizeCalc = false;

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

@@ -167,7 +167,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
             }
         }
         isKeepSimleApConnect = false;
-        if (this.doDirectoryNameTask) {
+        if (doDirectoryNameTask) {
             mDirectoryNameTask = new DirectoryNameTask();
             mDirectoryNameTask.execute(new Void[0]);
             doDirectoryNameTask = false;

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

@@ -205,7 +205,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         isKeepSimleApConnect = false;
         discconectOnThreadFinish = false;
         if (!this.isFinishRequested) {
-            chengeTargetDirectory(this.targetDir);
+            chengeTargetDirectory(targetDir);
         }
     }
 

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

@@ -90,7 +90,7 @@ public class MemcardReadProgress extends Activity {
     }
 
     public void finishWithState(int i, @Nullable CommonLog commonLog) {
-        if (this.discconectOnThreadFinish) {
+        if (discconectOnThreadFinish) {
             WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, MemcardUtil.getPrinterIpAddress(this));
         }
         if (commonLog != null && commonLog.numberOfSheet > 0) {
@@ -136,10 +136,10 @@ public class MemcardReadProgress extends Activity {
 
         protected Integer doInBackground(Void... voidArr) {
             try {
-                if (this.cifsAccess.initDefault(MemcardReadProgress.this, 1) == 0) {
+                if (cifsAccess.initDefault(MemcardReadProgress.this, 1) == 0) {
                     return 3;
                 }
-                if (this.cifsAccess.connectDefaultStorageWidthDefaultAthInfo(MemcardReadProgress.mMemcardStorageType) == 0) {
+                if (cifsAccess.connectDefaultStorageWidthDefaultAthInfo(MemcardReadProgress.mMemcardStorageType) == 0) {
                     cifsAccess.free();
                     return 3;
                 }

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

@@ -34,12 +34,12 @@ public class ReviewInvitationDialog extends DialogFragment {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setMessage(R.string.review_guidance_message).setPositiveButton(R.string.review_guidance_ok, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                ReviewInvitationDialog.this.startReview();
-                ReviewInvitationDialog.this.doCallback(true);
+                startReview();
+                doCallback(true);
             }
         }).setNegativeButton(R.string.review_guidance_cancel, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                ReviewInvitationDialog.this.doCallback(false);
+                doCallback(false);
             }
         });
         setCancelable(false);

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

@@ -126,7 +126,7 @@ public class BleScanWork {
                     byte[] bArr2 = new byte[3];
                     System.arraycopy(bArr, 7, bArr2, 0, bArr2.length);
                     EPLog.d(name + " Company information = " + sb2 + " getManufacturerSpecificData = " + sb3);
-                    if (this.update(bluetoothDevice, i, name, bArr2) && mSuccess != null && name != null) {
+                    if (update(bluetoothDevice, i, name, bArr2) && mSuccess != null && name != null) {
                         EPLog.e("mScannedDeviceList --- " + mScannedDeviceList.size());
                         mSuccess.call(mScannedDeviceList);
                     }

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

@@ -199,9 +199,9 @@ public class BleWork {
 
             public void onDescriptorWrite(BluetoothGatt bluetoothGatt, BluetoothGattDescriptor bluetoothGattDescriptor, int i) {
                 super.onDescriptorWrite(bluetoothGatt, bluetoothGattDescriptor, i);
-                BleWork.this.showStatus("DescriptorWrite", i);
+                showStatus("DescriptorWrite", i);
                 if (i != 0) {
-                    BleWork.this.sequenceError();
+                    sequenceError();
                 } else if (BleWork.mResposne != null) {
                     BleWork.mResposne.call(bluetoothGattDescriptor);
                 }
@@ -220,8 +220,8 @@ public class BleWork {
                         EPLog.e("gatt  NULL !");
                     }
                     BluetoothGatt unused = BleWork.mConnGatt = bluetoothGatt;
-                    BleWork.this.handlerWrite.removeCallbacks((Runnable) null);
-                    BleWork.this.handlerWrite.postDelayed(new Runnable() {
+                    handlerWrite.removeCallbacks((Runnable) null);
+                    handlerWrite.postDelayed(new Runnable() {
                         public void run() {
                             EPLog.i("discoverServices");
                             try {
@@ -236,7 +236,7 @@ public class BleWork {
                 } else if (i != 0 || i2 == 0) {
                     EPLog.i("STATE_DISCONNECTED " + BleWork.mSequence + " mReconnect = " + BleWork.mReconnect + " mRetry  " + BleWork.mRetry);
                     if (!BleWork.mReconnect && BleWork.mSequence == jobSequence.UNINITIALIZED) {
-                        BleWork.this.failedProcessing();
+                        failedProcessing();
                     } else if (BleWork.mReconnect || BleWork.mSequence == jobSequence.UNINITIALIZED || BleWork.mSequence == jobSequence.MIB_REBOOT_NW || BleWork.mSequence == jobSequence.DISCONNECTED || BleWork.mSequence == jobSequence.MIB_SET_SSID || BleWork.mSequence == jobSequence.AFTER_SETTING_PASSWORD) {
                         EPLog.d("★ stopScan");
                         BleScanWork.getInstace().stopScan();
@@ -244,12 +244,12 @@ public class BleWork {
                         bleWork2.mStatus = i2;
                         if ((bleWork2.mSequence == jobSequence.AFTER_SETTING_PASSWORD || BleWork.mSequence == jobSequence.BEFORE_CHECK_SSID || BleWork.mSequence == jobSequence.MIB_SET_SSID || BleWork.mSequence == jobSequence.MIB_REBOOT_NW) && !BleWork.mReconnect) {
                             if (BleWork.mSequence == jobSequence.MIB_REBOOT_NW) {
-                                BleWork.this.gattClose();
+                                gattClose();
                             }
                             EPLog.i(" BREAK ★ mSequence " + BleWork.mSequence);
                             return;
                         }
-                        BleWork.this.gattClose();
+                        gattClose();
                         if (BleWork.mSequence != jobSequence.UNINITIALIZED && !BleWork.mReconnect) {
                             return;
                         }
@@ -262,12 +262,12 @@ public class BleWork {
                             EPLog.m82w("retry " + BleWork.mRetry);
                             BleWork.access$508(BleWork.this);
                             EPLog.e("init");
-                            boolean unused2 = BleWork.this.init();
+                            boolean unused2 = init();
                             return;
                         }
-                        BleWork.this.failedProcessing();
+                        failedProcessing();
                     } else {
-                        BleWork.this.failedProcessing();
+                        failedProcessing();
                     }
                 } else if (i2 == 1) {
                     EPLog.i("STATE_CONNECTING");
@@ -303,7 +303,7 @@ public class BleWork {
                 } catch (BleException e) {
                     EPLog.e(e.getMessage());
                     e.printStackTrace();
-                    BleWork.this.failedProcessing();
+                    failedProcessing();
                 }
             }
 
@@ -315,19 +315,19 @@ public class BleWork {
                     String sh = valueOf.toString();
                     if (valueOf.shortValue() == 0) {
                         EPLog.i("[Notify]SNMP Status" + sh);
-                        BleWork.this.characteristicRead();
+                        characteristicRead();
                         return;
                     }
                     EPLog.e("[Notify]SNMP Status" + sh);
-                    BleWork.this.failedProcessing();
+                    failedProcessing();
                 } else if (BLEUuid.CHAR_SECURITY_TYPE_STRING.equals(bluetoothGattCharacteristic.getUuid().toString())) {
                     Short valueOf2 = Short.valueOf(bluetoothGattCharacteristic.getIntValue(17, 0).shortValue());
-                    BleWork.this.setSecurityType(valueOf2.shortValue());
+                    setSecurityType(valueOf2.shortValue());
                     String sh2 = valueOf2.toString();
                     EPLog.i("[Notify]Security Type " + sh2);
                     if (valueOf2.shortValue() <= 0) {
                         BleWork.mSsidLis.clear();
-                        BleWork.this.getSSIDList();
+                        getSSIDList();
                     } else if (BleWork.mSequenceCallbackSuccess != null) {
                         BleWork.mSequenceCallbackSuccess.call(BleWork.mSequence);
                     }
@@ -338,7 +338,7 @@ public class BleWork {
             }
 
             public void onCharacteristicRead(BluetoothGatt bluetoothGatt, @NonNull BluetoothGattCharacteristic bluetoothGattCharacteristic, int i) {
-                BleWork.this.showStatus("Read", i);
+                showStatus("Read", i);
                 if (i == 0) {
                     readCharacteristicData(bluetoothGattCharacteristic);
                 } else {
@@ -783,11 +783,11 @@ public class BleWork {
             }
 
             public void onCharacteristicWrite(BluetoothGatt bluetoothGatt, BluetoothGattCharacteristic bluetoothGattCharacteristic, int i) {
-                BleWork.this.showStatus("Write", i);
+                showStatus("Write", i);
                 if (i != 0) {
                     byte unused = BleWork.mIndex = (byte) 0;
                     if (BleWork.mSequence == jobSequence.INITIALIZE) {
-                        BleWork.this.failedProcessing();
+                        failedProcessing();
                     } else if (BleWork.mSequence == jobSequence.MIB_REBOOT_NW) {
                         if (BleWork.mSuccess != null) {
                             BleWork.mSuccess.call(BleWork.mSequence);
@@ -796,7 +796,7 @@ public class BleWork {
                         BleWork.mFailed.call(BleWork.mSequence);
                     }
                 } else if (BleWork.mSequence == jobSequence.INITIALIZE) {
-                    BleWork.this.characteristicRead();
+                    characteristicRead();
                 } else if (BleWork.mSequence == jobSequence.MIB_REBOOT_NW && BleWork.mSuccess != null) {
                     BleWork.mSuccess.call(BleWork.mSequence);
                 }
@@ -922,7 +922,7 @@ public class BleWork {
     private void setSSIDWork() {
         ((Activity) mContext).runOnUiThread(new Runnable() {
             public void run() {
-                BleWork.this.startSetSSID();
+                startSetSSID();
             }
         });
     }
@@ -956,14 +956,14 @@ public class BleWork {
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
-            BleWork.this.setNotifyCallback(new BLEUtility.BleWorkCallback() {
+            setNotifyCallback(new BLEUtility.BleWorkCallback() {
                 public void call(@NonNull Object obj) {
                     EPLog.i(" -- NotifySetThread call");
                     BluetoothGattCharacteristic bluetoothGattCharacteristic = BLEUuid.GattCharsMap.get(BLEUuid.CHAR_SECURITY_TYPE_STRING);
                     BluetoothGattCharacteristic bluetoothGattCharacteristic2 = BLEUuid.GattCharsMap.get(BLEUuid.CHAR_SNMP_STATUS_STRING);
                     BluetoothGattDescriptor bluetoothGattDescriptor = (BluetoothGattDescriptor) obj;
                     if (bluetoothGattCharacteristic == bluetoothGattDescriptor.getCharacteristic()) {
-                        BleWork.this.notifySet(bluetoothGattCharacteristic2);
+                        notifySet(bluetoothGattCharacteristic2);
                     } else if (bluetoothGattCharacteristic2 == bluetoothGattDescriptor.getCharacteristic()) {
                         NotifySetThread notifySetThread = NotifySetThread.this;
                         notifySetThread.stop = true;
@@ -978,7 +978,7 @@ public class BleWork {
         /* access modifiers changed from: protected */
         @Nullable
         public Boolean doInBackground(Void... voidArr) {
-            BleWork.this.notifySet(BLEUuid.GattCharsMap.get(BLEUuid.CHAR_SECURITY_TYPE_STRING));
+            notifySet(BLEUuid.GattCharsMap.get(BLEUuid.CHAR_SECURITY_TYPE_STRING));
             long currentTimeMillis = System.currentTimeMillis();
             while (System.currentTimeMillis() - currentTimeMillis <= 30000) {
                 try {
@@ -988,10 +988,10 @@ public class BleWork {
                     if (!this.stop) {
                     }
                 }
-                if (this.stop) {
+                if (stop) {
                     EPLog.i(" set ended ");
                     EPLog.i();
-                    return Boolean.valueOf(this.success);
+                    return Boolean.valueOf(success);
                 }
             }
             EPLog.e(" set failed! ");
@@ -1007,11 +1007,11 @@ public class BleWork {
                     e.printStackTrace();
                 }
                 BleWork.mSequence = jobSequence.INITIALIZE;
-                BleWork.this.checkPassword();
+                checkPassword();
                 return;
             }
             EPLog.e("setNotify");
-            BleWork.this.failedProcessing();
+            failedProcessing();
         }
     }
 
@@ -1038,12 +1038,12 @@ public class BleWork {
                                     iArr[0] = i;
                                     if (i < 3) {
                                         EPLog.e("FALSE !! retry " + iArr[0]);
-                                        BleWork.this.handlerRead.removeCallbacks((Runnable) null);
-                                        BleWork.this.handlerRead.postDelayed(this, (long) (iArr[0] * 500));
+                                        handlerRead.removeCallbacks((Runnable) null);
+                                        handlerRead.postDelayed(this, (long) (iArr[0] * 500));
                                         return;
                                     }
                                     EPLog.e("FALSE !!!");
-                                    BleWork.this.sequenceError();
+                                    sequenceError();
                                     return;
                                 }
                                 return;
@@ -1168,12 +1168,12 @@ public class BleWork {
                         iArr[0] = i;
                         if (i <= 3) {
                             EPLog.e("writeCharacteristic error ! retry " + iArr[0]);
-                            BleWork.this.handlerWrite.removeCallbacks((Runnable) null);
-                            BleWork.this.handlerWrite.postDelayed(this, (long) (iArr[0] * 500));
+                            handlerWrite.removeCallbacks((Runnable) null);
+                            handlerWrite.postDelayed(this, (long) (iArr[0] * 500));
                             return;
                         }
                         EPLog.e("writeCharacteristic error !! retry failed !!");
-                        BleWork.this.failedProcessing();
+                        failedProcessing();
                     }
                 } catch (NullPointerException unused) {
                     EPLog.e("mConnGatt NULL !");

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/escpr/EscprLib.java

@@ -368,7 +368,7 @@ public class EscprLib {
             String name = getClass().getName();
             EPLog.i(name, "EXTRACT Printer information: " + printerList);
             String[] split = printerList.split("\\|\\|");
-            if (this.printerIp == null || printerId == null || !this.printerIp.equals(split[2]) || printerId.equals(split[4])) {
+            if (printerIp == null || printerId == null || !this.printerIp.equals(split[2]) || printerId.equals(split[4])) {
                 EPLog.i("JAVA mIsSearch == " + mIsSearch);
                 if (mIsSearch) {
                     EPLog.i("JAVA mHandler == " + mHandler);

+ 2 - 2
app/src/main/java/com/epson/mobilephone/common/escpr/Info_paper.java

@@ -122,8 +122,8 @@ public class Info_paper {
         border_bottom_margin = (i11 - i12) / 2;
         borderless_left_margin = i5;
         borderless_top_margin = i6;
-        borderless_right_margin = (this.paper_width_boderless - i9) - i5;
-        borderless_bottom_margin = (this.paper_height_boderless - i11) - i6;
+        borderless_right_margin = (paper_width_boderless - i9) - i5;
+        borderless_bottom_margin = (paper_height_boderless - i11) - i6;
     }
 
     public Info_paper(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14) {

+ 4 - 4
app/src/main/java/com/epson/mobilephone/common/escpr/MediaInfo.java

@@ -196,7 +196,7 @@ public interface MediaInfo {
         protected final Hashtable<Integer, Integer> sCodeTable = new Hashtable<>();
 
         public int getStringId(int i) {
-            if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
+            if (sCodeTable.containsKey(Integer.valueOf(i))) {
                 return sCodeTable.get(Integer.valueOf(i)).intValue();
             }
             return sCodeTable.get(0).intValue();
@@ -211,7 +211,7 @@ public interface MediaInfo {
         }
 
         public int getID(int i) {
-            if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
+            if (sCodeTable.containsKey(Integer.valueOf(i))) {
                 return sCodeTable.get(Integer.valueOf(i)).intValue();
             }
             return -1;
@@ -320,7 +320,7 @@ public interface MediaInfo {
         protected final Hashtable<Integer, Info_paper> sCodeTable = new Hashtable<>();
 
         public Info_paper getStringId(int i) {
-            if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
+            if (sCodeTable.containsKey(Integer.valueOf(i))) {
                 return sCodeTable.get(Integer.valueOf(i));
             }
             return null;
@@ -330,7 +330,7 @@ public interface MediaInfo {
             if (i == 3) {
                 return new Info_paper(2098, 2976, 1816, 2694, 0, 0, 2098, 2976, 141, 141, 141, 141, 0, 0);
             }
-            if (this.sCodeTable.containsKey(Integer.valueOf(i))) {
+            if (sCodeTable.containsKey(Integer.valueOf(i))) {
                 return sCodeTable.get(Integer.valueOf(i));
             }
             return null;

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/keyenc/SecureKeyFactory.java

@@ -98,7 +98,7 @@ public class SecureKeyFactory {
     public String Decode(String str) {
         byte[] decode;
         byte[] decodeAes;
-        if (this.key == null || (decode = Base64.decode(str, 10)) == null || (decodeAes = decodeAes(decode, key)) == null) {
+        if (key == null || (decode = Base64.decode(str, 10)) == null || (decodeAes = decodeAes(decode, key)) == null) {
             return "";
         }
         return new String(decodeAes, charset);

+ 3 - 3
app/src/main/java/com/epson/mobilephone/common/maintain2/BatteryInfo.java

@@ -37,8 +37,8 @@ public class BatteryInfo implements Parcelable {
     }
 
     public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeInt(this.powerSourceType);
-        parcel.writeInt(this.batteryChargeState);
-        parcel.writeInt(this.batteryRemain);
+        parcel.writeInt(powerSourceType);
+        parcel.writeInt(batteryChargeState);
+        parcel.writeInt(batteryRemain);
     }
 }

+ 11 - 11
app/src/main/java/com/epson/mobilephone/common/maintain2/BatteryInfoEx.java

@@ -42,21 +42,21 @@ public class BatteryInfoEx implements Parcelable {
         powerSourceType = parcel.readInt();
         number = parcel.readInt();
         batteryType = new int[parcel.readInt()];
-        parcel.readIntArray(this.batteryType);
+        parcel.readIntArray(batteryType);
         batteryState = new int[parcel.readInt()];
-        parcel.readIntArray(this.batteryState);
+        parcel.readIntArray(batteryState);
         batteryRemain = new int[parcel.readInt()];
-        parcel.readIntArray(this.batteryRemain);
+        parcel.readIntArray(batteryRemain);
     }
 
     public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeInt(this.powerSourceType);
-        parcel.writeInt(this.number);
-        parcel.writeInt(this.batteryType.length);
-        parcel.writeIntArray(this.batteryType);
-        parcel.writeInt(this.batteryState.length);
-        parcel.writeIntArray(this.batteryState);
-        parcel.writeInt(this.batteryRemain.length);
-        parcel.writeIntArray(this.batteryRemain);
+        parcel.writeInt(powerSourceType);
+        parcel.writeInt(number);
+        parcel.writeInt(batteryType.length);
+        parcel.writeIntArray(batteryType);
+        parcel.writeInt(batteryState.length);
+        parcel.writeIntArray(batteryState);
+        parcel.writeInt(batteryRemain.length);
+        parcel.writeIntArray(batteryRemain);
     }
 }

+ 1 - 1
app/src/main/java/com/epson/mobilephone/common/usb/UsbPrintDriver.java

@@ -132,7 +132,7 @@ public class UsbPrintDriver {
                                     i4 = 2;
                                 }
                                 if (!(usbEndpoint == null || usbEndpoint2 == null)) {
-                                    UsbPrinter usbPrinter = new UsbPrinter(this.usbManager, usbDevice, usbInterface, usbEndpoint, usbEndpoint2);
+                                    UsbPrinter usbPrinter = new UsbPrinter(usbManager, usbDevice, usbInterface, usbEndpoint, usbEndpoint2);
                                     EPLog.i("EPSON", "Found Printer " + usbPrinter.toString());
                                     arrayList.add(usbPrinter);
                                 }

+ 15 - 15
app/src/main/java/com/epson/mobilephone/common/usb/UsbPrinter.java

@@ -68,8 +68,8 @@ public class UsbPrinter {
 
     public synchronized int openPort() {
         try {
-            usbPrinter = usbManager.openDevice(this.usbDevice);
-            if (this.usbPrinter == null) {
+            usbPrinter = usbManager.openDevice(usbDevice);
+            if (usbPrinter == null) {
                 return -1;
             }
             return usbPrinter.getFileDescriptor();
@@ -79,40 +79,40 @@ public class UsbPrinter {
     }
 
     public synchronized long readPort(byte[] bArr, int i) {
-        if (this.usbPrinter == null) {
+        if (usbPrinter == null) {
             return -1;
         }
-        if (!this.usbPrinter.claimInterface(this.usbInterface, true)) {
+        if (!this.usbPrinter.claimInterface(usbInterface, true)) {
             return -1;
         }
         setStartTime();
         EPLog.i(TAG, "bulkTransfer length=" + i);
-        int bulkTransfer = usbPrinter.bulkTransfer(this.endPointIn, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
+        int bulkTransfer = usbPrinter.bulkTransfer(endPointIn, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
         EPLog.i(TAG, "bulkTransfer readByte=" + bulkTransfer);
         if (bulkTransfer < 0 && (getElapsedTime()) >= 4500.0d) {
             bulkTransfer = 0;
             EPLog.i(TAG, "bulkTransfer timeout occurred");
         }
-        usbPrinter.releaseInterface(this.usbInterface);
+        usbPrinter.releaseInterface(usbInterface);
         return (long) bulkTransfer;
     }
 
     public synchronized long writePort(byte[] bArr, int i) {
-        if (this.usbPrinter == null) {
+        if (usbPrinter == null) {
             return -1;
         }
-        if (!this.usbPrinter.claimInterface(this.usbInterface, true)) {
+        if (!this.usbPrinter.claimInterface(usbInterface, true)) {
             return -1;
         }
         setStartTime();
         EPLog.i(TAG, "bulkTransfer length=" + i);
-        int bulkTransfer = usbPrinter.bulkTransfer(this.endPointOut, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
+        int bulkTransfer = usbPrinter.bulkTransfer(endPointOut, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
         EPLog.i(TAG, "bulkTransfer writtenByte=" + bulkTransfer);
         if (bulkTransfer < 0 && (getElapsedTime()) >= 4500.0d) {
             bulkTransfer = 0;
             EPLog.i(TAG, "bulkTransfer timeout occurred");
         }
-        usbPrinter.releaseInterface(this.usbInterface);
+        usbPrinter.releaseInterface(usbInterface);
         return (long) bulkTransfer;
     }
 
@@ -125,17 +125,17 @@ public class UsbPrinter {
     }
 
     public synchronized long getDeviceIdString(byte[] bArr, int i) {
-        if (this.usbPrinter == null) {
+        if (usbPrinter == null) {
             return -1;
         }
-        if (!this.usbPrinter.claimInterface(this.usbInterface, true)) {
+        if (!this.usbPrinter.claimInterface(usbInterface, true)) {
             return -1;
         }
         int controlTransfer = usbPrinter.controlTransfer(161, 0, 0, usbInterface.getId() << 8, bArr, i, Constants.EDAM_BUSINESS_NOTEBOOKS_MAX);
         if (controlTransfer > 0) {
             EPLog.i("EPSON", "DeviceIdString = " + new String(bArr, 2, controlTransfer - 2));
         }
-        usbPrinter.releaseInterface(this.usbInterface);
+        usbPrinter.releaseInterface(usbInterface);
         return (long) controlTransfer;
     }
 
@@ -187,14 +187,14 @@ public class UsbPrinter {
     }
 
     public synchronized void closePort() {
-        if (this.usbPrinter != null) {
+        if (usbPrinter != null) {
             usbPrinter.close();
             usbPrinter = null;
         }
     }
 
     public String toString() {
-        String str = "deviceName = " + usbDevice.getDeviceName() + " : endPointOut = " + Integer.toHexString(this.endPointOut.getAddress()) + " : endPointIn = " + Integer.toHexString(this.endPointIn.getAddress());
+        String str = "deviceName = " + usbDevice.getDeviceName() + " : endPointOut = " + Integer.toHexString(endPointOut.getAddress()) + " : endPointIn = " + Integer.toHexString(endPointIn.getAddress());
         if (Build.VERSION.SDK_INT < 21) {
             return str;
         }

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

@@ -148,7 +148,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
     }
 
     public void setupObserver() {
-        connectingObserver.start(this.timeout * 1000);
+        connectingObserver.start(timeout * 1000);
     }
 
     class ConnectingObserver {

+ 10 - 10
app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectP2P.java

@@ -229,7 +229,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         if (!WiFiControl.isSimpleAP(curSSID) || instance.invalidateSimpleAP(this, instance.getCurNetworkId())) {
             WifiP2pUtils.ConnectionInfo connectionInfo = WifiP2pUtils.getInstance(this).getConnectionInfo();
             if (connectionInfo != null) {
-                if (this.targetSsid.equals(connectionInfo.printerName)) {
+                if (targetSsid.equals(connectionInfo.printerName)) {
                     EPLog.d(TAG, "Already Connected!!");
                     status = ActivityConnectBase.Status.WIFI_CONNECTING;
                     mHandler.sendEmptyMessage(10);
@@ -357,7 +357,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         EPLog.d(TAG, "onConnect()");
         interruptConnecting();
         ManageDefaultNetwork.getInstance(this).resetDefaultNetwork();
-        if (this.showConnectedTip) {
+        if (showConnectedTip) {
             Toast.makeText(this, getString(R.string.str_notice_wifi_connected), 0).show();
         }
         if (!this.needInfo) {
@@ -368,7 +368,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
             finish();
             return;
         }
-        if (this.taskFindPrinter != null) {
+        if (taskFindPrinter != null) {
             EPLog.w(TAG, "Already called onConnect()");
         }
         WifiP2pUtils.ConnectionInfo connectionInfo = WifiP2pUtils.getInstance(this).getConnectionInfo();
@@ -385,31 +385,31 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
     private void onError() {
         closeWaitingDialog();
         Toast.makeText(this, getString(R.string.str_error_connecting_printer_short), 1).show();
-        if (this.searchWiFiDirectPrinter != null) {
+        if (searchWiFiDirectPrinter != null) {
             searchWiFiDirectPrinter.interrupt();
             searchWiFiDirectPrinter = null;
         }
-        switch (this.status) {
+        switch (status) {
             case WIFI_CONNECTING:
-                if (this.p2pConnectConfig != null) {
+                if (p2pConnectConfig != null) {
                     interruptConnecting();
                     if (mWiFiP2PManager != null) {
                         EPLog.d(TAG, "cancelConnect() " + targetSsid);
-                        mWiFiP2PManager.cancelConnect(this.p2pChannnel, (WifiP2pManager.ActionListener) null);
+                        mWiFiP2PManager.cancelConnect(p2pChannnel, (WifiP2pManager.ActionListener) null);
                         p2pConnectConfig = null;
                         break;
                     }
                 }
                 break;
             case PRINTER_FINDING:
-                if (this.taskFindPrinter != null) {
+                if (taskFindPrinter != null) {
                     taskFindPrinter.cancel();
                     taskFindPrinter = null;
                     break;
                 }
                 break;
         }
-        if (this.showErrorDlg) {
+        if (showErrorDlg) {
             mModelDialog.doShow(IDD_WIFI_ERROR);
             return;
         }
@@ -431,7 +431,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
     private void setupObserver() {
         super.setupObserver();
         p2pStateChangeReciever = new WiFiDirectBroadcastReceiver();
-        registerReceiver(this.p2pStateChangeReciever, new IntentFilter("android.net.wifi.p2p.CONNECTION_STATE_CHANGE"));
+        registerReceiver(p2pStateChangeReciever, new IntentFilter("android.net.wifi.p2p.CONNECTION_STATE_CHANGE"));
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:12:0x0029  */

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

@@ -42,10 +42,10 @@ public class ActivityControlWiFi extends Activity {
             showProgress = extras.getBoolean(SHOWPROGRESS, false);
             showWifiSettings = extras.getBoolean(SHOWWIFISETTINGS, false);
         }
-        if (this.showProgress) {
+        if (showProgress) {
             setContentView(R.layout.progress);
         }
-        if (this.showWifiSettings) {
+        if (showWifiSettings) {
             WiFiUtils.showOsWifiSettings(this, 0);
         } else if (!mWifiManager.isWifiEnabled()) {
             showDialog(0);
@@ -86,9 +86,9 @@ public class ActivityControlWiFi extends Activity {
     protected void onDestroy() {
         EPLog.d(TAG, "onDestroy()");
         super.onDestroy();
-        if (this.networkStateChangeReciever != null) {
+        if (networkStateChangeReciever != null) {
             EPLog.d(TAG, "unregisterReceiver()");
-            unregisterReceiver(this.networkStateChangeReciever);
+            unregisterReceiver(networkStateChangeReciever);
             networkStateChangeReciever = null;
         }
         scannigObserver.interrunpt();
@@ -124,12 +124,12 @@ public class ActivityControlWiFi extends Activity {
     }
 
     private void registerReciever() {
-        if (this.networkStateChangeReciever == null) {
+        if (networkStateChangeReciever == null) {
             EPLog.d(TAG, "registerReceiver()");
             networkStateChangeReciever = new NetworkStateChangeReciever();
-            registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.STATE_CHANGE"));
-            registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.WIFI_STATE_CHANGED"));
-            registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.supplicant.STATE_CHANGE"));
+            registerReceiver(networkStateChangeReciever, new IntentFilter("android.net.wifi.STATE_CHANGE"));
+            registerReceiver(networkStateChangeReciever, new IntentFilter("android.net.wifi.WIFI_STATE_CHANGED"));
+            registerReceiver(networkStateChangeReciever, new IntentFilter("android.net.wifi.supplicant.STATE_CHANGE"));
         }
     }
 

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

@@ -145,7 +145,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
                     return;
                 }
             }
-            if (!shouldShowRequestPermissionRationale(this.requestPermission)) {
+            if (!shouldShowRequestPermissionRationale(requestPermission)) {
                 SharedPreferences.Editor edit = getPreferences(0).edit();
                 edit.putBoolean(DONOTASKAGAIN, true);
                 edit.apply();

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

@@ -47,7 +47,7 @@ public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
     }
 
     public void onBackPressed() {
-        if (this.bDisplayHomeAsUpEnabled) {
+        if (bDisplayHomeAsUpEnabled) {
             EPLog.d(getLocalClassName(), "finish with RESULT_BACK");
             setResult(1);
             finish();
@@ -63,7 +63,7 @@ public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
-        if (this.bSupportCancel) {
+        if (bSupportCancel) {
             getMenuInflater().inflate(R.menu.menu_cancel, menu);
         }
         return super.onCreateOptionsMenu(menu);

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

@@ -36,7 +36,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
                 ActivityiPrintConnectStart.this.startActivityForResult(new Intent(ActivityiPrintConnectStart.this, ActivityiPrintConnect.class), 10);
             }
         });
-        mEscprLib.epsWrapperGetSetupConnectStrings(this.settingsTempAp);
+        mEscprLib.epsWrapperGetSetupConnectStrings(settingsTempAp);
         if (!ActivityRequestLocationPermission.canAccessWiFiInfo(this, 1)) {
             ActivityRequestLocationPermission.requestLocationPermissionForce(this, 1);
         } else {
@@ -57,7 +57,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
     protected void onResume() {
         super.onResume();
         networkStateChangeReciever = new NetworkStateChangeReciever();
-        registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
+        registerReceiver(networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
         getWindow().addFlags(128);
     }
 
@@ -83,7 +83,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
     }
 
     private void onScanResultAvailable() {
-        if (this.bFirstScanResultAvailable) {
+        if (bFirstScanResultAvailable) {
             EPLog.w(TAG, "First onScanResultAvailable, ignore this");
             bFirstScanResultAvailable = false;
         } else {
@@ -95,7 +95,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
             }
             if (arrayList.size() != 0) {
                 for (ScanResult scanResult : arrayList) {
-                    if (this.settingsTempAp.ssid.equals(WiFiUtils.removeQuotationsInSSID(scanResult.SSID))) {
+                    if (settingsTempAp.ssid.equals(WiFiUtils.removeQuotationsInSSID(scanResult.SSID))) {
                         EPLog.d(TAG, "Found TempAP");
                         btnNext.performClick();
                         return;

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

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

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

@@ -21,7 +21,7 @@ class FindPrinterTask extends AsyncTask<Void, Void, Boolean> {
 
     protected void onPreExecute() {
         super.onPreExecute();
-        mEscprLib.setHanlder(this.handler, idFound);
+        mEscprLib.setHanlder(handler, idFound);
         mEscprLib.setSearchStt(true);
     }
 
@@ -43,7 +43,7 @@ class FindPrinterTask extends AsyncTask<Void, Void, Boolean> {
     protected void onPostExecute(Boolean bool) {
         if (bool.booleanValue() || !this.canceled) {
             EPLog.d(TAG, "epsWrapperFindPrinter = EPS_ERR_PRINTER_NOT_FOUND");
-            handler.sendEmptyMessage(this.idNotFound);
+            handler.sendEmptyMessage(idNotFound);
         }
     }
 

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

@@ -50,7 +50,7 @@ public class MacAddrFilter {
     public boolean isExcludedMacAddress(String str) {
         try {
             String p2pAddr2MacAddrStr = MacAddrUtils.p2pAddr2MacAddrStr(str);
-            if (this.excludeMacAddressList == null) {
+            if (excludeMacAddressList == null) {
                 excludeMacAddressList = readMacAddressTable(EXCLUDE_MACADDRESS_FILE);
             }
             Iterator<MacAddressEntry> it = excludeMacAddressList.iterator();

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

@@ -61,7 +61,7 @@ public class ManageDefaultNetwork {
             return false;
         }
         if (Build.VERSION.SDK_INT < 23 || (activeNetwork = connectivityManager.getActiveNetwork()) == null || (networkCapabilities = connectivityManager.getNetworkCapabilities(activeNetwork)) == null || !networkCapabilities.hasTransport(0)) {
-            synchronized (this.lock) {
+            synchronized (lock) {
                 EPLog.d(TAG, "Checking whether isOnline : " + str);
                 new Thread(new Runnable() {
                     public void run() {
@@ -111,19 +111,19 @@ public class ManageDefaultNetwork {
                 EPLog.d(TAG, "Not connected");
                 return;
             }
-            if (!curSSID.equals(this.checkedSSID)) {
+            if (!curSSID.equals(checkedSSID)) {
                 checkedSSID = curSSID;
                 isOnline = checkCurSSIDisOnline(curSSID);
-                if (this.isOnline) {
+                if (isOnline) {
                     EPLog.d(TAG, curSSID + "is online.");
                     return;
                 }
-            } else if (this.isOnline) {
+            } else if (isOnline) {
                 EPLog.d(TAG, curSSID + "is online.");
                 return;
             }
             if (Build.VERSION.SDK_INT >= 23) {
-                if (this.connectivityManager.getBoundNetworkForProcess() != null) {
+                if (connectivityManager.getBoundNetworkForProcess() != null) {
                     EPLog.d(TAG, "Already bindProcessToNetwork called");
                     return;
                 }
@@ -170,7 +170,7 @@ public class ManageDefaultNetwork {
 
     public synchronized void resetDefaultNetwork() {
         if (Build.VERSION.SDK_INT >= 23) {
-            if (this.connectivityManager.getBoundNetworkForProcess() != null) {
+            if (connectivityManager.getBoundNetworkForProcess() != null) {
                 EPLog.d(TAG, "resetProcessDefaultNetwork");
                 connectivityManager.bindProcessToNetwork((Network) null);
             }

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

@@ -43,7 +43,7 @@ public class NfcTagParser {
     }
 
     public String getMacAddress() {
-        return NfcMacAddrUtils.getMacAdressStr(ArrayUtils.subarray(this.tagData, 115, Imgproc.COLOR_YUV2RGBA_YVYU));
+        return NfcMacAddrUtils.getMacAdressStr(ArrayUtils.subarray(tagData, 115, Imgproc.COLOR_YUV2RGBA_YVYU));
     }
 
     public String getSSID() {
@@ -61,11 +61,11 @@ public class NfcTagParser {
     }
 
     public String getIPAddressV4() {
-        return formatIPAddressV4(ArrayUtils.subarray(this.tagData, OFFSET_IPADDRESSV4, 150));
+        return formatIPAddressV4(ArrayUtils.subarray(tagData, OFFSET_IPADDRESSV4, 150));
     }
 
     public String getIPAddressV4SimpleAP() {
-        return formatIPAddressV4(ArrayUtils.subarray(this.tagData, 258, 262));
+        return formatIPAddressV4(ArrayUtils.subarray(tagData, 258, 262));
     }
 
     private String formatIPAddressV4(byte[] bArr) {
@@ -85,19 +85,19 @@ public class NfcTagParser {
 
     private int getPrinterStatus() {
         int i = tagData[114] != 0 ? 1 : 0;
-        if (this.tagData[130] != 0) {
+        if (tagData[130] != 0) {
             i |= 2;
         }
         if ((1 & tagData[131]) != 0) {
             i |= 4;
         }
-        if ((this.tagData[131] & 2) != 0) {
+        if ((tagData[131] & 2) != 0) {
             i |= 16;
         }
-        if (this.tagData[68] != 0) {
+        if (tagData[68] != 0) {
             i |= 256;
         }
-        if (this.tagData[132] != 0) {
+        if (tagData[132] != 0) {
             i |= 65536;
         }
         return tagData[133] != 0 ? i | 16777216 : i;

+ 9 - 9
app/src/main/java/com/epson/mobilephone/common/wifidirect/NfcTagUtils.java

@@ -76,14 +76,14 @@ public class NfcTagUtils {
         public void writeToParcel(Parcel parcel, int i) {
             parcel.writeString(macAdress);
             parcel.writeString(macAdressP2P);
-            parcel.writeString(this.ssid);
-            parcel.writeString(this.password);
-            parcel.writeString(this.initialpassword);
-            parcel.writeString(this.aarPackageName);
-            parcel.writeString(this.tagVersion);
-            parcel.writeString(this.ipAddressV4);
-            parcel.writeString(this.ipAddressV4SimpleAP);
-            parcel.writeInt(this.printerStatus);
+            parcel.writeString(ssid);
+            parcel.writeString(password);
+            parcel.writeString(initialpassword);
+            parcel.writeString(aarPackageName);
+            parcel.writeString(tagVersion);
+            parcel.writeString(ipAddressV4);
+            parcel.writeString(ipAddressV4SimpleAP);
+            parcel.writeInt(printerStatus);
         }
 
         public boolean isTagWithInterface() {
@@ -92,7 +92,7 @@ public class NfcTagUtils {
         }
 
         public boolean hasOwnAAR(Context context) {
-            return context.getPackageName().equals(this.aarPackageName);
+            return context.getPackageName().equals(aarPackageName);
         }
     }
 

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

@@ -121,7 +121,7 @@ public class SearchWiFiDirectPrinterTask {
     }
 
     private boolean start(int i, Handler handler, int i2, int i3) {
-        if (this.serarchingStatus != 0) {
+        if (serarchingStatus != 0) {
             EPLog.d(TAG, "Already started");
             return true;
         }
@@ -138,13 +138,13 @@ public class SearchWiFiDirectPrinterTask {
         scannigObserver.start(i3 * 1000);
         if ((i & 1) != 0) {
             networkStateChangeReciever = new NetworkStateChangeReciever();
-            context.registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
+            context.registerReceiver(networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
             serarchingStatus |= 1;
             onScanResultAvailable();
         }
         if (!((i & 2) == 0 || mWiFiP2PManager == null || p2pChannnel == null)) {
             p2pStateChangeReciever = new WiFiDirectBroadcastReceiver();
-            context.registerReceiver(this.p2pStateChangeReciever, new IntentFilter("android.net.wifi.p2p.PEERS_CHANGED"));
+            context.registerReceiver(p2pStateChangeReciever, new IntentFilter("android.net.wifi.p2p.PEERS_CHANGED"));
             bDisConnectP2P = false;
             searchHandler.sendEmptyMessage(0);
         }
@@ -160,7 +160,7 @@ public class SearchWiFiDirectPrinterTask {
         scannigObserver.interrunpt();
         if (!(mWiFiP2PManager == null || p2pChannnel == null)) {
             EPLog.d(TAG, "stopPeerDiscovery");
-            mWiFiP2PManager.stopPeerDiscovery(this.p2pChannnel, (WifiP2pManager.ActionListener) null);
+            mWiFiP2PManager.stopPeerDiscovery(p2pChannnel, (WifiP2pManager.ActionListener) null);
         }
         unRegisterReceiverSimpleAp();
         unRegisterReceiverP2P();
@@ -202,7 +202,7 @@ public class SearchWiFiDirectPrinterTask {
             if (j != 0 && elapsedRealtime - j < 30000) {
                 EPLog.i(TAG, "onScanResultAvailable, use this Result");
                 z = true;
-            } else if (this.retryScaning > 0) {
+            } else if (retryScaning > 0) {
                 EPLog.i(TAG, "onScanResultAvailable, use this Retry Result");
                 z = true;
             } else {
@@ -219,7 +219,7 @@ public class SearchWiFiDirectPrinterTask {
             }
             if (arrayList.size() != 0) {
                 for (ScanResult scanResult : arrayList) {
-                    if (this.retryScaning < 3 && Build.VERSION.SDK_INT >= 17) {
+                    if (retryScaning < 3 && Build.VERSION.SDK_INT >= 17) {
                         long j2 = elapsedRealtime - (scanResult.timestamp / 1000);
                         if (j2 >= 30000) {
                             EPLog.w(TAG, "onScanResultAvailable, Ignore for timeout : SSID =" + scanResult.SSID + " past " + j2 + " msec");
@@ -227,10 +227,10 @@ public class SearchWiFiDirectPrinterTask {
                     }
                     String removeQuotationsInSSID = WiFiUtils.removeQuotationsInSSID(scanResult.SSID);
                     if (WiFiControl.isSimpleAP(removeQuotationsInSSID)) {
-                        int networkId = WiFiUtils.getInstance(this.context).getNetworkId(removeQuotationsInSSID);
+                        int networkId = WiFiUtils.getInstance(context).getNetworkId(removeQuotationsInSSID);
                         if (networkId != -1) {
                             onFindPrinterResult(WiFiControl.addSSIDPrefix(removeQuotationsInSSID, WiFiControl.ConnectType.SimpleAP), networkId, scanResult.BSSID);
-                        } else if (Build.VERSION.SDK_INT < 23 && (existSimpleApDisabled = WiFiUtils.getInstance(this.context).getExistSimpleApDisabled(removeQuotationsInSSID)) != -1) {
+                        } else if (Build.VERSION.SDK_INT < 23 && (existSimpleApDisabled = WiFiUtils.getInstance(context).getExistSimpleApDisabled(removeQuotationsInSSID)) != -1) {
                             onFindPrinterResult(WiFiControl.addSSIDPrefix(removeQuotationsInSSID, WiFiControl.ConnectType.SimpleAP), existSimpleApDisabled, scanResult.BSSID);
                         }
                     }
@@ -239,7 +239,7 @@ public class SearchWiFiDirectPrinterTask {
         }
         lastScan = elapsedRealtime;
         retryScaning++;
-        if (this.retryScaning < 5) {
+        if (retryScaning < 5) {
             EPLog.i(TAG, "Retry startScan()");
             mWifiManager.startScan();
             return;
@@ -247,8 +247,8 @@ public class SearchWiFiDirectPrinterTask {
         EPLog.i(TAG, "MAX_RETRY_SCANING");
         unRegisterReceiverSimpleAp();
         serarchingStatus &= -2;
-        if (this.serarchingStatus == 0) {
-            mHandler.sendEmptyMessage(this.idResult);
+        if (serarchingStatus == 0) {
+            mHandler.sendEmptyMessage(idResult);
             interrupt();
         }
     }
@@ -256,11 +256,11 @@ public class SearchWiFiDirectPrinterTask {
     private void onFindPrinterResult(String str, int i, String str2) {
         if (!this.listFoundSSID.contains(str)) {
             listFoundSSID.add(str);
-            SimpleAPInfoDB.SimpleAPInfo simpleAPInfoDB = SimpleAPInfoDB.getSimpleAPInfoDB(this.context, str);
+            SimpleAPInfoDB.SimpleAPInfo simpleAPInfoDB = SimpleAPInfoDB.getSimpleAPInfoDB(context, str);
             if (simpleAPInfoDB == null) {
                 simpleAPInfoDB = new SimpleAPInfoDB.SimpleAPInfo();
                 simpleAPInfoDB.ssid = str;
-                WiFiControl.getInstance(this.context);
+                WiFiControl.getInstance(context);
                 simpleAPInfoDB.printerName = WiFiControl.getPrinterNetworkName(str);
             }
             Message obtain = Message.obtain();

+ 4 - 4
app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiDirectPrinterListUtils.java

@@ -98,7 +98,7 @@ public class WiFiDirectPrinterListUtils {
                 if (str2 == null || str2.isEmpty()) {
                     EPLog.w(TAG, "Invalid MacAddress");
                     return;
-                } else if (str2.equals(this.p2pPrinterMacAddr)) {
+                } else if (str2.equals(p2pPrinterMacAddr)) {
                     EPLog.d(TAG, "Ignore Printer. This printer communicates via P2P:" + str);
                     return;
                 } else {
@@ -139,7 +139,7 @@ public class WiFiDirectPrinterListUtils {
                             if (str4 != null && str4.equals(str2)) {
                                 switch (WiFiControl.getSSIDType(str)) {
                                     case WiFiP2P:
-                                        if (next2.ssid.equals(this.curConnectInfo)) {
+                                        if (next2.ssid.equals(curConnectInfo)) {
                                             break;
                                         } else {
                                             EPLog.d(TAG, "Replace Duplicate Printer:" + next2.ssid + "->" + str);
@@ -154,7 +154,7 @@ public class WiFiDirectPrinterListUtils {
                                             }
                                         }
                                     case SimpleAP:
-                                        if (str.equals(this.curConnectInfo)) {
+                                        if (str.equals(curConnectInfo)) {
                                             break;
                                         } else {
                                             EPLog.d(TAG, "Found Duplicate Printer:" + next2.ssid + "(" + str + ")");
@@ -175,7 +175,7 @@ public class WiFiDirectPrinterListUtils {
                                     WiFiControl wiFiControl2 = wiFiControl;
                                     if (iArr[WiFiControl.getSSIDType(str).ordinal()] != 2) {
                                         z2 = z;
-                                    } else if (curConnectInfo2.equals(this.curConnectInfo)) {
+                                    } else if (curConnectInfo2.equals(curConnectInfo)) {
                                         EPLog.d(TAG, "Replace Duplicate Printer:" + next2.f157ip + "->" + str);
                                         int indexOf3 = uiPrinterList.indexOf(next2.printer);
                                         if (-1 != indexOf3) {

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

@@ -39,7 +39,7 @@ public class WiFiScanner {
         } else if (wifiManager.startScan()) {
             return true;
         } else {
-            EPLog.e(this.TAG, "Failed startScan()");
+            EPLog.e(TAG, "Failed startScan()");
             return false;
         }
     }

+ 6 - 6
app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiUtils.java

@@ -208,7 +208,7 @@ public class WiFiUtils {
         EPLog.i(TAG, "Enable Wifi Profile: SSID = " + wifiConfig.SSID);
         if (Build.VERSION.SDK_INT < 23) {
             wifiConfig.SSID = "\"" + str + "\"";
-            if (this.f159wm.updateNetwork(wifiConfig) == -1) {
+            if (f159wm.updateNetwork(wifiConfig) == -1) {
                 EPLog.e(TAG, "Failed  updateNetwork");
                 return false;
             }
@@ -228,7 +228,7 @@ public class WiFiUtils {
         if (!this.f159wm.enableNetwork(i, true)) {
             EPLog.e(TAG, "Failed  enableNetwork");
             return false;
-        } else if (saveWifiConfiguration(this.f159wm)) {
+        } else if (saveWifiConfiguration(f159wm)) {
             return true;
         } else {
             EPLog.e(TAG, "Failed  saveConfiguration");
@@ -260,7 +260,7 @@ public class WiFiUtils {
         if (!this.f159wm.removeNetwork(i)) {
             EPLog.e(TAG, "Failed  removeNetwork");
             return false;
-        } else if (saveWifiConfiguration(this.f159wm)) {
+        } else if (saveWifiConfiguration(f159wm)) {
             return true;
         } else {
             EPLog.e(TAG, "Failed  saveConfiguration");
@@ -318,10 +318,10 @@ public class WiFiUtils {
                     f159wm.removeNetwork(next.networkId);
                 }
             }
-            if (this.f159wm.updateNetwork(wifiConfig) == -1) {
+            if (f159wm.updateNetwork(wifiConfig) == -1) {
                 EPLog.e(TAG, "Failed  updateNetwork");
                 return false;
-            } else if (!saveWifiConfiguration(this.f159wm)) {
+            } else if (!saveWifiConfiguration(f159wm)) {
                 EPLog.e(TAG, "Failed  saveConfiguration");
                 return false;
             }
@@ -341,7 +341,7 @@ public class WiFiUtils {
                 f159wm.enableNetwork(next.networkId, false);
             }
         }
-        if (!saveWifiConfiguration(this.f159wm)) {
+        if (!saveWifiConfiguration(f159wm)) {
             EPLog.e(TAG, "Failed  saveConfiguration");
         }
         if (!this.f159wm.reassociate()) {

+ 5 - 5
app/src/main/java/com/epson/mobilephone/common/wifidirect/WifiP2pUtils.java

@@ -67,7 +67,7 @@ public class WifiP2pUtils {
             WifiP2pManager wifiP2pManager = mWiFiP2PManager;
             if (wifiP2pManager != null) {
                 p2pChannnel = wifiP2pManager.initialize(mAppContext, handlerThread.getLooper(), (WifiP2pManager.ChannelListener) null);
-                if (this.p2pChannnel == null) {
+                if (p2pChannnel == null) {
                     mWiFiP2PManager = null;
                 }
             }
@@ -124,9 +124,9 @@ public class WifiP2pUtils {
             return null;
         }
         groupInfo = null;
-        synchronized (this.lock) {
+        synchronized (lock) {
             status = STATUS.REQUEST_GROUPINFO;
-            mWiFiP2PManager.requestGroupInfo(this.p2pChannnel, new WifiP2pManager.GroupInfoListener() {
+            mWiFiP2PManager.requestGroupInfo(p2pChannnel, new WifiP2pManager.GroupInfoListener() {
                 public void onGroupInfoAvailable(WifiP2pGroup wifiP2pGroup) {
                     WifiP2pGroup unused = groupInfo = wifiP2pGroup;
                     if (groupInfo != null) {
@@ -148,7 +148,7 @@ public class WifiP2pUtils {
     }
 
     private void resumeThread() {
-        synchronized (this.lock) {
+        synchronized (lock) {
             try {
                 lock.notifyAll();
             } catch (IllegalMonitorStateException e) {
@@ -160,7 +160,7 @@ public class WifiP2pUtils {
     public void disconnect() {
         WifiP2pManager wifiP2pManager = mWiFiP2PManager;
         if (wifiP2pManager != null) {
-            wifiP2pManager.removeGroup(this.p2pChannnel, new WifiP2pManager.ActionListener() {
+            wifiP2pManager.removeGroup(p2pChannnel, new WifiP2pManager.ActionListener() {
                 public void onSuccess() {
                     EPLog.d(WifiP2pUtils.TAG, "Success removeGroup");
                 }