Browse Source

删除 this.

liuyuqi-dellpc 3 years ago
parent
commit
31a21cda6a
100 changed files with 3309 additions and 3309 deletions
  1. 6 6
      app/src/main/java/com/epson/cameracopy/alt/BmpFileInfo.java
  2. 38 38
      app/src/main/java/com/epson/cameracopy/device/AptSensorAdapter.java
  3. 15 15
      app/src/main/java/com/epson/cameracopy/device/CameraFile.java
  4. 13 13
      app/src/main/java/com/epson/cameracopy/device/CameraPreviewControl.java
  5. 8 8
      app/src/main/java/com/epson/cameracopy/device/CameraSizeList.java
  6. 41 41
      app/src/main/java/com/epson/cameracopy/device/OpenCvCameraView.java
  7. 75 75
      app/src/main/java/com/epson/cameracopy/device/PortraitCameraView.java
  8. 4 4
      app/src/main/java/com/epson/cameracopy/device/SimpleSize.java
  9. 6 6
      app/src/main/java/com/epson/cameracopy/p006ui/CameraFileAdapter.java
  10. 111 111
      app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewFragment.java
  11. 40 40
      app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewOptionActivity.java
  12. 32 32
      app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintProgress.java
  13. 93 93
      app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintSettingActivity.java
  14. 327 327
      app/src/main/java/com/epson/cameracopy/p006ui/CropImageActivity.java
  15. 8 8
      app/src/main/java/com/epson/cameracopy/p006ui/CurrentFolderName.java
  16. 126 126
      app/src/main/java/com/epson/cameracopy/p006ui/DocumentSizeEditActivity.java
  17. 33 33
      app/src/main/java/com/epson/cameracopy/p006ui/DocumentSizeSettingActivity.java
  18. 36 36
      app/src/main/java/com/epson/cameracopy/p006ui/FolderInformation.java
  19. 20 20
      app/src/main/java/com/epson/cameracopy/p006ui/FolderSelectActivity.java
  20. 328 328
      app/src/main/java/com/epson/cameracopy/p006ui/ImageCollectView.java
  21. 13 13
      app/src/main/java/com/epson/cameracopy/p006ui/ImageFolderFile.java
  22. 5 5
      app/src/main/java/com/epson/cameracopy/p006ui/ImageFolderFileViewModel.java
  23. 39 39
      app/src/main/java/com/epson/cameracopy/p006ui/ImagePreviewActivity.java
  24. 3 3
      app/src/main/java/com/epson/cameracopy/p006ui/ItemData.java
  25. 3 3
      app/src/main/java/com/epson/cameracopy/p006ui/ItemDataAdapter.java
  26. 8 8
      app/src/main/java/com/epson/cameracopy/p006ui/MenuControl.java
  27. 6 6
      app/src/main/java/com/epson/cameracopy/p006ui/PictureResolutionDialogFragment.java
  28. 86 86
      app/src/main/java/com/epson/cameracopy/p006ui/PrintPreviewActivity.java
  29. 2 2
      app/src/main/java/com/epson/cameracopy/p006ui/SimpleMessageDialogFragment.java
  30. 11 11
      app/src/main/java/com/epson/cameracopy/printlayout/CustomManuscriptSize.java
  31. 32 32
      app/src/main/java/com/epson/cameracopy/printlayout/DocumentSizeInfo.java
  32. 6 6
      app/src/main/java/com/epson/cameracopy/printlayout/IdManuscriptSize.java
  33. 51 51
      app/src/main/java/com/epson/cameracopy/printlayout/ImageAndLayout.java
  34. 20 20
      app/src/main/java/com/epson/cameracopy/printlayout/ManuscriptSize.java
  35. 150 150
      app/src/main/java/com/epson/cameracopy/printlayout/PreviewPosition.java
  36. 110 110
      app/src/main/java/com/epson/cameracopy/printlayout/PreviewView.java
  37. 42 42
      app/src/main/java/com/epson/cameracopy/printlayout/RegistedDocumentSizeList.java
  38. 53 53
      app/src/main/java/com/epson/lib/escani2/EscanI2Lib.java
  39. 3 3
      app/src/main/java/com/epson/lib/escani2/EscanI2NativeIf.java
  40. 5 5
      app/src/main/java/com/epson/lib/escani2/ScanI2PropertyTaker.java
  41. 8 8
      app/src/main/java/com/epson/lib/escani2/ScanI2Runner.java
  42. 25 25
      app/src/main/java/com/epson/lib/escani2/ScanSize.java
  43. 14 14
      app/src/main/java/com/epson/memcardacc/AltViewImageAdapter.java
  44. 18 18
      app/src/main/java/com/epson/memcardacc/BitmapCache.java
  45. 8 8
      app/src/main/java/com/epson/memcardacc/CifsAccess.java
  46. 7 7
      app/src/main/java/com/epson/memcardacc/CifsFileInfo.java
  47. 50 50
      app/src/main/java/com/epson/memcardacc/ConfirmReadMemcard.java
  48. 37 37
      app/src/main/java/com/epson/memcardacc/ConfirmWriteMemcard.java
  49. 20 20
      app/src/main/java/com/epson/memcardacc/CopyTask.java
  50. 4 4
      app/src/main/java/com/epson/memcardacc/DirectoryCache.java
  51. 19 19
      app/src/main/java/com/epson/memcardacc/DirectorySelecterActivity.java
  52. 13 13
      app/src/main/java/com/epson/memcardacc/EscprLibPrinter.java
  53. 8 8
      app/src/main/java/com/epson/memcardacc/FileConvertTask.java
  54. 12 12
      app/src/main/java/com/epson/memcardacc/FileConvertViewModel.java
  55. 48 48
      app/src/main/java/com/epson/memcardacc/ImageFileListAdapter.java
  56. 2 2
      app/src/main/java/com/epson/memcardacc/ImageUtil.java
  57. 2 2
      app/src/main/java/com/epson/memcardacc/LocalAlertDialogFragment.java
  58. 7 7
      app/src/main/java/com/epson/memcardacc/MemCardWriteConvertViewModel.java
  59. 13 13
      app/src/main/java/com/epson/memcardacc/MemcardCheckTask.java
  60. 100 100
      app/src/main/java/com/epson/memcardacc/MemcardImageGrid.java
  61. 6 6
      app/src/main/java/com/epson/memcardacc/MemcardPhotocopyTop.java
  62. 31 31
      app/src/main/java/com/epson/memcardacc/MemcardReadProgress.java
  63. 7 7
      app/src/main/java/com/epson/memcardacc/MemcardTop.java
  64. 36 36
      app/src/main/java/com/epson/memcardacc/MemcardTopSuper.java
  65. 32 32
      app/src/main/java/com/epson/memcardacc/MemcardWriteProgress.java
  66. 8 8
      app/src/main/java/com/epson/memcardacc/PasswordDialogFragment.java
  67. 16 16
      app/src/main/java/com/epson/memcardacc/PhotoCopyImageSelectActivity.java
  68. 4 4
      app/src/main/java/com/epson/memcardacc/PhotoCopyWriteProgress.java
  69. 7 7
      app/src/main/java/com/epson/memcardacc/ReaderSelectedImage.java
  70. 8 8
      app/src/main/java/com/epson/memcardacc/SmbAuthInfo.java
  71. 3 3
      app/src/main/java/com/epson/mobilephone/common/ReviewInvitationDialog.java
  72. 6 6
      app/src/main/java/com/epson/mobilephone/common/ReviewInvitationViewModel.java
  73. 26 26
      app/src/main/java/com/epson/mobilephone/common/ble/BleAsyncTask.java
  74. 35 35
      app/src/main/java/com/epson/mobilephone/common/ble/BleScanWork.java
  75. 171 171
      app/src/main/java/com/epson/mobilephone/common/ble/BleWork.java
  76. 141 141
      app/src/main/java/com/epson/mobilephone/common/ble/BleWorkActivity.java
  77. 6 6
      app/src/main/java/com/epson/mobilephone/common/ble/DeviceAdapter.java
  78. 37 37
      app/src/main/java/com/epson/mobilephone/common/ble/ProbePrinter.java
  79. 20 20
      app/src/main/java/com/epson/mobilephone/common/ble/util/ScannedDevice.java
  80. 17 17
      app/src/main/java/com/epson/mobilephone/common/escpr/EscprLib.java
  81. 35 35
      app/src/main/java/com/epson/mobilephone/common/escpr/PaperSize.java
  82. 20 20
      app/src/main/java/com/epson/mobilephone/common/guide/GuideWebviewFragment.java
  83. 36 36
      app/src/main/java/com/epson/mobilephone/common/guide/NoticeGuideActivity.java
  84. 3 3
      app/src/main/java/com/epson/mobilephone/common/keyenc/SecureKeyFactory.java
  85. 7 7
      app/src/main/java/com/epson/mobilephone/common/license/InfoDisplayActivity.java
  86. 10 10
      app/src/main/java/com/epson/mobilephone/common/license/LicenseTopActivity.java
  87. 4 4
      app/src/main/java/com/epson/mobilephone/common/license/RestoreScrollView.java
  88. 6 6
      app/src/main/java/com/epson/mobilephone/common/license/SimpleMessageDialogFragment.java
  89. 12 12
      app/src/main/java/com/epson/mobilephone/common/license/UserSurveyInvitationActivity.java
  90. 16 16
      app/src/main/java/com/epson/mobilephone/common/maintain/MaintainPrinter.java
  91. 10 10
      app/src/main/java/com/epson/mobilephone/common/maintain/MaintainPrinterInfo.java
  92. 29 29
      app/src/main/java/com/epson/mobilephone/common/maintain2/MaintainPrinter2.java
  93. 11 11
      app/src/main/java/com/epson/mobilephone/common/maintain2/MaintainPrinterInfo2.java
  94. 1 1
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectBase.java
  95. 21 21
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectP2P.java
  96. 13 13
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectSimpleAP.java
  97. 6 6
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityControlWiFi.java
  98. 6 6
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityRequestLocationPermission.java
  99. 13 13
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectManual.java
  100. 10 10
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityiPrintConnect.java

+ 6 - 6
app/src/main/java/com/epson/cameracopy/alt/BmpFileInfo.java

@@ -470,24 +470,24 @@ class BmpFileInfo {
                     fileChannel4.close();
                 } catch (IOException unused7) {
                 }
-                this.mWriteChannel = null;
+                mWriteChannel = null;
             }
-            RandomAccessFile randomAccessFile4 = this.mOfs;
+            RandomAccessFile randomAccessFile4 = mOfs;
             if (randomAccessFile4 != null) {
                 try {
                     randomAccessFile4.close();
                 } catch (IOException unused8) {
                 }
-                this.mOfs = null;
+                mOfs = null;
             }
             throw th;
         }
     }
 
     protected void addSize(int i, int i2) {
-        this.mFileSize += i;
-        this.mImageDataBytes += i;
-        this.mHeight += i2;
+        mFileSize += i;
+        mImageDataBytes += i;
+        mHeight += i2;
     }
 
     public static BmpFileInfo createH0Instance(int i, int i2, String str) {

+ 38 - 38
app/src/main/java/com/epson/cameracopy/device/AptSensorAdapter.java

@@ -34,24 +34,24 @@ public class AptSensorAdapter implements SensorEventListener {
     }
 
     public void setSensorManager(SensorManager sensorManager) {
-        this.mSensorManager = sensorManager;
+        mSensorManager = sensorManager;
     }
 
     public void start() {
-        Sensor defaultSensor = this.mSensorManager.getDefaultSensor(1);
+        Sensor defaultSensor = mSensorManager.getDefaultSensor(1);
         if (defaultSensor != null) {
-            this.mSensorManager.registerListener(this, defaultSensor, 2);
+            mSensorManager.registerListener(this, defaultSensor, 2);
         }
-        Sensor defaultSensor2 = this.mSensorManager.getDefaultSensor(10);
+        Sensor defaultSensor2 = mSensorManager.getDefaultSensor(10);
         if (defaultSensor2 != null) {
-            this.mSensorManager.registerListener(this, defaultSensor2, 2);
+            mSensorManager.registerListener(this, defaultSensor2, 2);
         }
-        this.mLastOverTime = 0;
-        this.mLastOverTime2 = 0;
+        mLastOverTime = 0;
+        mLastOverTime2 = 0;
     }
 
     public void stop() {
-        this.mSensorManager.unregisterListener(this);
+        mSensorManager.unregisterListener(this);
     }
 
     public static double getRangeCompValue(int i) {
@@ -59,24 +59,24 @@ public class AptSensorAdapter implements SensorEventListener {
     }
 
     public void setDisplayRotation(int i) {
-        this.mDisplayRotation = i;
+        mDisplayRotation = i;
     }
 
     public void setReferenceAccelaration(double d) {
-        this.mReferenceAccelaration = d;
-        this.mLastOverTime = 0;
+        mReferenceAccelaration = d;
+        mLastOverTime = 0;
     }
 
     public void resetTime() {
-        this.mLastOverTime = 0;
+        mLastOverTime = 0;
     }
 
     public boolean isTerminalAngleInRange(double d) {
-        if (!this.mIsValidValue) {
+        if (!mIsValidValue) {
             return false;
         }
-        float f = this.mPosX;
-        float f2 = this.mPosY;
+        float f = mPosX;
+        float f2 = mPosY;
         if (d >= ((double) ((f * f) + (f2 * f2)))) {
             return true;
         }
@@ -84,11 +84,11 @@ public class AptSensorAdapter implements SensorEventListener {
     }
 
     public float getPosX() {
-        return this.mPosX;
+        return mPosX;
     }
 
     public float getPosY() {
-        return this.mPosY;
+        return mPosY;
     }
 
     public void onSensorChanged(SensorEvent sensorEvent) {
@@ -105,54 +105,54 @@ public class AptSensorAdapter implements SensorEventListener {
         while (true) {
             if (i >= 3) {
                 break;
-            } else if (((double) Math.abs(sensorEvent.values[i])) > this.mReferenceAccelaration) {
-                this.mLastOverTime = System.currentTimeMillis();
+            } else if (((double) Math.abs(sensorEvent.values[i])) > mReferenceAccelaration) {
+                mLastOverTime = System.currentTimeMillis();
                 break;
             } else {
                 i++;
             }
         }
-        if (this.mLastOverTime == 0) {
-            this.mLastOverTime = System.currentTimeMillis();
+        if (mLastOverTime == 0) {
+            mLastOverTime = System.currentTimeMillis();
         }
     }
 
     private void updateAccValue(SensorEvent sensorEvent) {
-        this.mIsValidValue = true;
-        switch (this.mDisplayRotation) {
+        mIsValidValue = true;
+        switch (mDisplayRotation) {
             case 0:
-                this.mPosX = sensorEvent.values[0];
-                this.mPosY = sensorEvent.values[1];
+                mPosX = sensorEvent.values[0];
+                mPosY = sensorEvent.values[1];
                 break;
             case 1:
-                this.mPosX = -sensorEvent.values[1];
-                this.mPosY = sensorEvent.values[0];
+                mPosX = -sensorEvent.values[1];
+                mPosY = sensorEvent.values[0];
                 break;
             case 2:
-                this.mPosX = -sensorEvent.values[0];
-                this.mPosY = -sensorEvent.values[1];
+                mPosX = -sensorEvent.values[0];
+                mPosY = -sensorEvent.values[1];
                 break;
             case 3:
-                this.mPosX = sensorEvent.values[1];
-                this.mPosY = -sensorEvent.values[0];
+                mPosX = sensorEvent.values[1];
+                mPosY = -sensorEvent.values[0];
                 break;
         }
         float f = sensorEvent.values[0];
         float f2 = sensorEvent.values[1];
         float f3 = sensorEvent.values[2];
-        this.mPreD0 = f;
-        this.mPreD1 = f2;
-        this.mPreD2 = f3;
-        if (((float) (Math.pow((double) (this.mPreD0 - f), 2.0d) + Math.pow((double) (this.mPreD1 - f2), 2.0d) + Math.pow((double) (this.mPreD2 - f3), 2.0d))) > this.m2BaseValue) {
-            this.mLastOverTime2 = System.currentTimeMillis();
+        mPreD0 = f;
+        mPreD1 = f2;
+        mPreD2 = f3;
+        if (((float) (Math.pow((double) (mPreD0 - f), 2.0d) + Math.pow((double) (mPreD1 - f2), 2.0d) + Math.pow((double) (mPreD2 - f3), 2.0d))) > m2BaseValue) {
+            mLastOverTime2 = System.currentTimeMillis();
         }
     }
 
     public long getLastOverTime2() {
-        return this.mLastOverTime2;
+        return mLastOverTime2;
     }
 
     public long getLastAccelOverTime() {
-        return this.mLastOverTime;
+        return mLastOverTime;
     }
 }

+ 15 - 15
app/src/main/java/com/epson/cameracopy/device/CameraFile.java

@@ -16,8 +16,8 @@ public class CameraFile implements Serializable {
     private String mTempFileName;
 
     public CameraFile(Date date, String str) {
-        this.mFileCreateDate = date;
-        this.mTempFileName = str;
+        mFileCreateDate = date;
+        mTempFileName = str;
     }
 
     public String getFileName(String str) {
@@ -25,7 +25,7 @@ public class CameraFile implements Serializable {
         if ((!file.exists() && !file.mkdirs()) || !file.isDirectory()) {
             return null;
         }
-        String format = new SimpleDateFormat("yyyyMMddHHmm", Locale.US).format(this.mFileCreateDate);
+        String format = new SimpleDateFormat("yyyyMMddHHmm", Locale.US).format(mFileCreateDate);
         for (int i = 0; i < 100; i++) {
             File file2 = new File(file, String.format(Locale.US, "%s_%02d.jpg", new Object[]{format, Integer.valueOf(i)}));
             if (!file2.exists()) {
@@ -37,21 +37,21 @@ public class CameraFile implements Serializable {
 
     public boolean moveTo(String str) {
         String fileName;
-        if (this.mTempFileName == null || (fileName = getFileName(str)) == null) {
+        if (mTempFileName == null || (fileName = getFileName(str)) == null) {
             return false;
         }
-        File file = new File(this.mTempFileName);
+        File file = new File(mTempFileName);
         File file2 = new File(fileName);
         if (file.renameTo(file2)) {
-            this.mDstFile = file2;
-            this.mTempFileName = null;
+            mDstFile = file2;
+            mTempFileName = null;
             return true;
         }
         try {
             FileUtils.copy(file, file2);
             file.delete();
-            this.mDstFile = file2;
-            this.mTempFileName = null;
+            mDstFile = file2;
+            mTempFileName = null;
             return true;
         } catch (IOException unused) {
             return false;
@@ -59,15 +59,15 @@ public class CameraFile implements Serializable {
     }
 
     public boolean isMovable() {
-        return this.mTempFileName != null;
+        return mTempFileName != null;
     }
 
     public String getValidFileName() {
-        String str = this.mTempFileName;
+        String str = mTempFileName;
         if (str != null) {
             return str;
         }
-        File file = this.mDstFile;
+        File file = mDstFile;
         if (file != null) {
             return file.toString();
         }
@@ -75,17 +75,17 @@ public class CameraFile implements Serializable {
     }
 
     public boolean isMoved() {
-        return this.mDstFile != null;
+        return mDstFile != null;
     }
 
     public void deleteTemporaryFile() {
-        String str = this.mTempFileName;
+        String str = mTempFileName;
         if (str != null) {
             File file = new File(str);
             if (file.exists()) {
                 file.delete();
             }
-            this.mTempFileName = null;
+            mTempFileName = null;
         }
     }
 }

+ 13 - 13
app/src/main/java/com/epson/cameracopy/device/CameraPreviewControl.java

@@ -34,7 +34,7 @@ public class CameraPreviewControl {
     }
 
     private CameraPreviewControl(Context context) {
-        this.mContext = context.getApplicationContext();
+        mContext = context.getApplicationContext();
     }
 
     public static boolean hasBackCamera() {
@@ -57,27 +57,27 @@ public class CameraPreviewControl {
     }
 
     public boolean getGuideMode() {
-        return this.mContext.getSharedPreferences(PREFS_NAME, 0).getBoolean(KEY_GUIDE_MODE, true);
+        return mContext.getSharedPreferences(PREFS_NAME, 0).getBoolean(KEY_GUIDE_MODE, true);
     }
 
     public void setGuideMode(boolean z) {
-        this.mContext.getSharedPreferences(PREFS_NAME, 0).edit().putBoolean(KEY_GUIDE_MODE, z).commit();
+        mContext.getSharedPreferences(PREFS_NAME, 0).edit().putBoolean(KEY_GUIDE_MODE, z).commit();
     }
 
     public boolean getAutoPictureMode() {
-        return this.mContext.getSharedPreferences(PREFS_NAME, 0).getBoolean(KEY_AUTO_PICTURE_MODE, false);
+        return mContext.getSharedPreferences(PREFS_NAME, 0).getBoolean(KEY_AUTO_PICTURE_MODE, false);
     }
 
     public void setAutoPictureMode(Boolean bool) {
-        this.mContext.getSharedPreferences(PREFS_NAME, 0).edit().putBoolean(KEY_AUTO_PICTURE_MODE, bool.booleanValue()).commit();
+        mContext.getSharedPreferences(PREFS_NAME, 0).edit().putBoolean(KEY_AUTO_PICTURE_MODE, bool.booleanValue()).commit();
     }
 
     public String getSaveDirecotry() {
-        return this.mContext.getSharedPreferences(PREFS_NAME, 0).getString(KEY_SAVE_DIRECTORY, Environment.getExternalStorageDirectory().getAbsolutePath() + DEFAULT_SAVE_DIRECTORY);
+        return mContext.getSharedPreferences(PREFS_NAME, 0).getString(KEY_SAVE_DIRECTORY, Environment.getExternalStorageDirectory().getAbsolutePath() + DEFAULT_SAVE_DIRECTORY);
     }
 
     public void setSaveDirecotry(String str) {
-        this.mContext.getSharedPreferences(PREFS_NAME, 0).edit().putString(KEY_SAVE_DIRECTORY, str).commit();
+        mContext.getSharedPreferences(PREFS_NAME, 0).edit().putString(KEY_SAVE_DIRECTORY, str).commit();
     }
 
     public void setPictureSize(Camera.Size size) {
@@ -88,7 +88,7 @@ public class CameraPreviewControl {
 
     public void setPictureSize(Point point) {
         if (point != null) {
-            SharedPreferences.Editor edit = this.mContext.getSharedPreferences(PREFS_NAME, 0).edit();
+            SharedPreferences.Editor edit = mContext.getSharedPreferences(PREFS_NAME, 0).edit();
             edit.putInt(KEY_PICTURE_WIDTH, point.x);
             edit.putInt(KEY_PICTURE_HEIGHT, point.y);
             edit.commit();
@@ -98,18 +98,18 @@ public class CameraPreviewControl {
 
     public Point getPictureSize() {
         Point point = new Point();
-        SharedPreferences sharedPreferences = this.mContext.getSharedPreferences(PREFS_NAME, 0);
+        SharedPreferences sharedPreferences = mContext.getSharedPreferences(PREFS_NAME, 0);
         point.x = sharedPreferences.getInt(KEY_PICTURE_WIDTH, -1);
         point.y = sharedPreferences.getInt(KEY_PICTURE_HEIGHT, -1);
         return point;
     }
 
     public int getPictureResolutionMode() {
-        return this.mContext.getSharedPreferences(PREFS_NAME, 0).getInt(KEY_PICTURE_RESOLUTION_MODE, 0);
+        return mContext.getSharedPreferences(PREFS_NAME, 0).getInt(KEY_PICTURE_RESOLUTION_MODE, 0);
     }
 
     private void setPictureResolutionMode(int i) {
-        this.mContext.getSharedPreferences(PREFS_NAME, 0).edit().putInt(KEY_PICTURE_RESOLUTION_MODE, i).commit();
+        mContext.getSharedPreferences(PREFS_NAME, 0).edit().putInt(KEY_PICTURE_RESOLUTION_MODE, i).commit();
     }
 
     public void setPictureResolutionModeAuto() {
@@ -127,12 +127,12 @@ public class CameraPreviewControl {
                 sb.append(PreferencesConstants.COOKIE_DELIMITER);
                 sb.append(Integer.toString(next.height));
             }
-            this.mContext.getSharedPreferences(PREFS_NAME, 0).edit().putString(KEY_PICTURE_SIZE_LIST, sb.toString()).commit();
+            mContext.getSharedPreferences(PREFS_NAME, 0).edit().putString(KEY_PICTURE_SIZE_LIST, sb.toString()).commit();
         }
     }
 
     public List<Point> getCameraPictureSizes() {
-        String[] split = this.mContext.getSharedPreferences(PREFS_NAME, 0).getString(KEY_PICTURE_SIZE_LIST, "").split(":");
+        String[] split = mContext.getSharedPreferences(PREFS_NAME, 0).getString(KEY_PICTURE_SIZE_LIST, "").split(":");
         ArrayList arrayList = new ArrayList();
         for (String split2 : split) {
             String[] split3 = split2.split(PreferencesConstants.COOKIE_DELIMITER);

+ 8 - 8
app/src/main/java/com/epson/cameracopy/device/CameraSizeList.java

@@ -16,20 +16,20 @@ public class CameraSizeList implements Iterable<SizeWrapper> {
         }
 
         public CameraSizeWarpper(Camera.Size size) {
-            this.mCameraSize = size;
+            mCameraSize = size;
         }
 
         public int getWidth() {
-            return this.mCameraSize.width;
+            return mCameraSize.width;
         }
 
         public int getHeight() {
-            return this.mCameraSize.height;
+            return mCameraSize.height;
         }
     }
 
     public CameraSizeList(List<Camera.Size> list) {
-        this.mCameraSizeList = list;
+        mCameraSizeList = list;
     }
 
     public Iterator<SizeWrapper> iterator() {
@@ -40,15 +40,15 @@ public class CameraSizeList implements Iterable<SizeWrapper> {
             }
 
             public boolean hasNext() {
-                return this.mIndex < CameraSizeList.this.mCameraSizeList.size();
+                return mIndex < CameraSizeList.mCameraSizeList.size();
             }
 
             public SizeWrapper next() {
-                if (this.mIndex >= CameraSizeList.this.mCameraSizeList.size()) {
+                if (mIndex >= CameraSizeList.mCameraSizeList.size()) {
                     return null;
                 }
-                this.mIndex++;
-                return new CameraSizeWarpper(CameraSizeList.this.mCameraSizeList.get(this.mIndex));
+                mIndex++;
+                return new CameraSizeWarpper(CameraSizeList.mCameraSizeList.get(mIndex));
             }
         };
     }

+ 41 - 41
app/src/main/java/com/epson/cameracopy/device/OpenCvCameraView.java

@@ -30,19 +30,19 @@ public class OpenCvCameraView extends PortraitCameraView implements Camera.Pictu
     }
 
     public boolean isInAutofocus() {
-        return this.mInAutofocus;
+        return mInAutofocus;
     }
 
     public OpenCvCameraView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
         PackageManager packageManager = context.getPackageManager();
         if (packageManager != null) {
-            this.mHasAutoFocus = packageManager.hasSystemFeature("android.hardware.camera.autofocus");
+            mHasAutoFocus = packageManager.hasSystemFeature("android.hardware.camera.autofocus");
         }
     }
 
     public Camera getCamera() {
-        return this.mCamera;
+        return mCamera;
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:18:0x0037 A[Catch:{ all -> 0x0061 }] */
@@ -131,85 +131,85 @@ public class OpenCvCameraView extends PortraitCameraView implements Camera.Pictu
     }
 
     public synchronized void takePicture(String str, MyPictureTakeCallback myPictureTakeCallback) {
-        this.mPictureTaking = true;
-        if (!this.mInAutofocus) {
-            this.mInAutofocus = true;
-            this.mPictureFileName = str;
-            this.mPictureTakeCallback = myPictureTakeCallback;
-            if (!this.mHasAutoFocus) {
-                this.mCamera.setPreviewCallback((Camera.PreviewCallback) null);
-                this.mCamera.takePicture(this, (Camera.PictureCallback) null, this);
-                this.mPictureTaking = false;
-                this.mInAutofocus = false;
+        mPictureTaking = true;
+        if (!mInAutofocus) {
+            mInAutofocus = true;
+            mPictureFileName = str;
+            mPictureTakeCallback = myPictureTakeCallback;
+            if (!mHasAutoFocus) {
+                mCamera.setPreviewCallback((Camera.PreviewCallback) null);
+                mCamera.takePicture(this, (Camera.PictureCallback) null, this);
+                mPictureTaking = false;
+                mInAutofocus = false;
                 return;
             }
-            this.mTakePictuerAutofocus = true;
+            mTakePictuerAutofocus = true;
             localAutofocus();
         }
     }
 
     private void localAutofocus() {
-        if (!this.mHasAutoFocus) {
-            this.mInAutofocus = false;
+        if (!mHasAutoFocus) {
+            mInAutofocus = false;
             return;
         }
         try {
-            this.mCamera.autoFocus(this);
+            mCamera.autoFocus(this);
         } catch (Exception unused) {
-            onAutoFocus(false, this.mCamera);
+            onAutoFocus(false, mCamera);
         }
     }
 
     private void localCancelAutofocus() {
-        if (!this.mHasAutoFocus) {
-            this.mInAutofocus = false;
-        } else if (this.mCamera != null) {
-            this.mCamera.cancelAutoFocus();
+        if (!mHasAutoFocus) {
+            mInAutofocus = false;
+        } else if (mCamera != null) {
+            mCamera.cancelAutoFocus();
         }
     }
 
     public void onAutoFocus(boolean z, Camera camera) {
-        if (this.mTakePictuerAutofocus) {
-            this.mTakePictuerAutofocus = false;
-            this.mCamera.setPreviewCallback((Camera.PreviewCallback) null);
-            this.mCamera.takePicture(this, (Camera.PictureCallback) null, this);
+        if (mTakePictuerAutofocus) {
+            mTakePictuerAutofocus = false;
+            mCamera.setPreviewCallback((Camera.PreviewCallback) null);
+            mCamera.takePicture(this, (Camera.PictureCallback) null, this);
         } else {
-            AutoFocusCallBack autoFocusCallBack = this.mAutoFocusCallBack;
+            AutoFocusCallBack autoFocusCallBack = mAutoFocusCallBack;
             if (autoFocusCallBack != null) {
                 autoFocusCallBack.onAutoFocusCompleted(z);
-                this.mAutoFocusCallBack = null;
+                mAutoFocusCallBack = null;
             }
         }
-        this.mInAutofocus = false;
+        mInAutofocus = false;
     }
 
     public synchronized void doAutofocus(AutoFocusCallBack autoFocusCallBack) {
-        if (!this.mInAutofocus && !this.mPictureTaking) {
-            this.mAutoFocusCallBack = autoFocusCallBack;
-            this.mInAutofocus = true;
+        if (!mInAutofocus && !mPictureTaking) {
+            mAutoFocusCallBack = autoFocusCallBack;
+            mInAutofocus = true;
             localAutofocus();
         }
     }
 
     public void cancelAutofocus() {
         localCancelAutofocus();
-        this.mInAutofocus = false;
-        this.mAutoFocusCallBack = null;
-        this.mTakePictuerAutofocus = false;
-        this.mPictureTaking = false;
-        this.mPictureTakeCallback = null;
+        mInAutofocus = false;
+        mAutoFocusCallBack = null;
+        mTakePictuerAutofocus = false;
+        mPictureTaking = false;
+        mPictureTakeCallback = null;
     }
 
     public void enableView() {
         super.enableView();
-        this.mInAutofocus = false;
-        this.mPictureTaking = false;
+        mInAutofocus = false;
+        mPictureTaking = false;
     }
 
     public float getScale() {
-        if (this.mScale <= 0.0f) {
+        if (mScale <= 0.0f) {
             return 1.0f;
         }
-        return this.mScale;
+        return mScale;
     }
 }

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

@@ -193,13 +193,13 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
         boolean z;
         Log.m52d(TAG, "Initialize java camera");
         synchronized (this) {
-            this.mCamera = openBackCamera();
+            mCamera = openBackCamera();
             z = false;
-            if (this.mCamera == null) {
+            if (mCamera == null) {
                 return false;
             }
             try {
-                Camera.Parameters parameters = this.mCamera.getParameters();
+                Camera.Parameters parameters = mCamera.getParameters();
                 Log.m52d(TAG, "getSupportedPreviewSizes()");
                 List<Camera.Size> supportedPreviewSizes = parameters.getSupportedPreviewSizes();
                 if (supportedPreviewSizes != null) {
@@ -212,38 +212,38 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
                     int i3 = Build.VERSION.SDK_INT;
                     setForcusMode(parameters);
                     parameters.setRotation(90);
-                    this.mCamera.setParameters(parameters);
-                    Camera.Parameters parameters2 = this.mCamera.getParameters();
-                    this.mFrameWidth = parameters2.getPreviewSize().height;
-                    this.mFrameHeight = parameters2.getPreviewSize().width;
-                    int i4 = this.mFrameHeight;
-                    int i5 = this.mFrameWidth;
+                    mCamera.setParameters(parameters);
+                    Camera.Parameters parameters2 = mCamera.getParameters();
+                    mFrameWidth = parameters2.getPreviewSize().height;
+                    mFrameHeight = parameters2.getPreviewSize().width;
+                    int i4 = mFrameHeight;
+                    int i5 = mFrameWidth;
                     if (getLayoutParams().width == -1 && getLayoutParams().height == -1) {
-                        this.mScale = Math.min(((float) i2) / ((float) this.mFrameHeight), ((float) i) / ((float) this.mFrameWidth));
+                        mScale = Math.min(((float) i2) / ((float) mFrameHeight), ((float) i) / ((float) mFrameWidth));
                     } else {
-                        this.mScale = 0.0f;
+                        mScale = 0.0f;
                     }
-                    if (this.mFpsMeter != null) {
-                        this.mFpsMeter.setResolution(this.mFrameWidth, this.mFrameHeight);
+                    if (mFpsMeter != null) {
+                        mFpsMeter.setResolution(mFrameWidth, mFrameHeight);
                     }
-                    this.mBuffer = new byte[(((this.mFrameWidth * this.mFrameHeight) * ImageFormat.getBitsPerPixel(parameters2.getPreviewFormat())) / 8)];
-                    this.mCamera.addCallbackBuffer(this.mBuffer);
-                    this.mCamera.setPreviewCallbackWithBuffer(this);
-                    this.mFrameChain = new Mat[2];
-                    this.mFrameChain[0] = new Mat((i5 / 2) + i5, i4, CvType.CV_8UC1);
-                    this.mFrameChain[1] = new Mat(i5 + (i5 / 2), i4, CvType.CV_8UC1);
+                    mBuffer = new byte[(((mFrameWidth * mFrameHeight) * ImageFormat.getBitsPerPixel(parameters2.getPreviewFormat())) / 8)];
+                    mCamera.addCallbackBuffer(mBuffer);
+                    mCamera.setPreviewCallbackWithBuffer(this);
+                    mFrameChain = new Mat[2];
+                    mFrameChain[0] = new Mat((i5 / 2) + i5, i4, CvType.CV_8UC1);
+                    mFrameChain[1] = new Mat(i5 + (i5 / 2), i4, CvType.CV_8UC1);
                     AllocateCache();
-                    this.mCameraFrame = new JavaCameraFrame[2];
-                    this.mCameraFrame[0] = new JavaCameraFrame(this.mFrameChain[0], this.mFrameWidth, this.mFrameHeight);
-                    this.mCameraFrame[1] = new JavaCameraFrame(this.mFrameChain[1], this.mFrameWidth, this.mFrameHeight);
+                    mCameraFrame = new JavaCameraFrame[2];
+                    mCameraFrame[0] = new JavaCameraFrame(mFrameChain[0], mFrameWidth, mFrameHeight);
+                    mCameraFrame[1] = new JavaCameraFrame(mFrameChain[1], mFrameWidth, mFrameHeight);
                     if (Build.VERSION.SDK_INT >= 11) {
-                        this.mSurfaceTexture = new SurfaceTexture(10);
-                        this.mCamera.setPreviewTexture(this.mSurfaceTexture);
+                        mSurfaceTexture = new SurfaceTexture(10);
+                        mCamera.setPreviewTexture(mSurfaceTexture);
                     } else {
-                        this.mCamera.setPreviewDisplay((SurfaceHolder) null);
+                        mCamera.setPreviewDisplay((SurfaceHolder) null);
                     }
                     Log.m52d(TAG, "startPreview");
-                    this.mCamera.startPreview();
+                    mCamera.startPreview();
                     z = true;
                 }
             } catch (Exception e) {
@@ -450,7 +450,7 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
     }
 
     public Camera.Size getCameraPictureSize() {
-        Camera camera = this.mCamera;
+        Camera camera = mCamera;
         if (camera == null) {
             return null;
         }
@@ -466,7 +466,7 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
     }
 
     public List<Camera.Size> getPictureSizeList() {
-        Camera camera = this.mCamera;
+        Camera camera = mCamera;
         if (camera == null) {
             return null;
         }
@@ -483,19 +483,19 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
 
     protected void releaseCamera() {
         synchronized (this) {
-            if (this.mCamera != null) {
-                this.mCamera.stopPreview();
-                this.mCamera.setPreviewCallback((Camera.PreviewCallback) null);
-                this.mCamera.release();
+            if (mCamera != null) {
+                mCamera.stopPreview();
+                mCamera.setPreviewCallback((Camera.PreviewCallback) null);
+                mCamera.release();
             }
-            this.mCamera = null;
-            if (this.mFrameChain != null) {
-                this.mFrameChain[0].release();
-                this.mFrameChain[1].release();
+            mCamera = null;
+            if (mFrameChain != null) {
+                mFrameChain[0].release();
+                mFrameChain[1].release();
             }
-            if (this.mCameraFrame != null) {
-                this.mCameraFrame[0].release();
-                this.mCameraFrame[1].release();
+            if (mCameraFrame != null) {
+                mCameraFrame[0].release();
+                mCameraFrame[1].release();
             }
         }
     }
@@ -505,48 +505,48 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
         if (!initializeCamera(i, i2)) {
             return false;
         }
-        this.mCameraFrameReady = false;
+        mCameraFrameReady = false;
         Log.m52d(TAG, "Starting processing thread");
-        this.mStopThread = false;
-        this.mThread = new Thread(new CameraWorker(), "CameraWorker");
-        this.mThread.start();
+        mStopThread = false;
+        mThread = new Thread(new CameraWorker(), "CameraWorker");
+        mThread.start();
         return true;
     }
 
     protected void disconnectCamera() {
         Log.m52d(TAG, "Disconnecting from camera");
         try {
-            this.mStopThread = true;
+            mStopThread = true;
             Log.m52d(TAG, "Notify thread");
             synchronized (this) {
                 notify();
             }
             Log.m52d(TAG, "Wating for thread");
-            if (this.mThread != null) {
-                this.mThread.join();
+            if (mThread != null) {
+                mThread.join();
             }
         } catch (InterruptedException e) {
             try {
                 e.printStackTrace();
             } catch (Throwable th) {
-                this.mThread = null;
+                mThread = null;
                 throw th;
             }
         }
-        this.mThread = null;
+        mThread = null;
         releaseCamera();
-        this.mCameraFrameReady = false;
+        mCameraFrameReady = false;
     }
 
     public void onPreviewFrame(byte[] bArr, Camera camera) {
         synchronized (this) {
-            this.mFrameChain[this.mChainIdx].put(0, 0, bArr);
-            this.mCameraFrameReady = true;
+            mFrameChain[mChainIdx].put(0, 0, bArr);
+            mCameraFrameReady = true;
             notify();
         }
-        Camera camera2 = this.mCamera;
+        Camera camera2 = mCamera;
         if (camera2 != null) {
-            camera2.addCallbackBuffer(this.mBuffer);
+            camera2.addCallbackBuffer(mBuffer);
         }
     }
 
@@ -558,38 +558,38 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
         private Mat mYuvFrameData;
 
         public Mat gray() {
-            Mat mat = this.mRotated;
+            Mat mat = mRotated;
             if (mat != null) {
                 mat.release();
             }
-            this.mRotated = this.mYuvFrameData.submat(0, this.mWidth, 0, this.mHeight);
-            this.mRotated = this.mRotated.mo42753t();
-            Mat mat2 = this.mRotated;
+            mRotated = mYuvFrameData.submat(0, mWidth, 0, mHeight);
+            mRotated = mRotated.mo42753t();
+            Mat mat2 = mRotated;
             Core.flip(mat2, mat2, 1);
-            return this.mRotated;
+            return mRotated;
         }
 
         public Mat rgba() {
-            Imgproc.cvtColor(this.mYuvFrameData, this.mRgba, 96, 4);
-            Mat mat = this.mRotated;
+            Imgproc.cvtColor(mYuvFrameData, mRgba, 96, 4);
+            Mat mat = mRotated;
             if (mat != null) {
                 mat.release();
             }
-            this.mRotated = this.mRgba.mo42753t();
-            Mat mat2 = this.mRotated;
+            mRotated = mRgba.mo42753t();
+            Mat mat2 = mRotated;
             Core.flip(mat2, mat2, 1);
-            return this.mRotated;
+            return mRotated;
         }
 
         public JavaCameraFrame(Mat mat, int i, int i2) {
-            this.mWidth = i;
-            this.mHeight = i2;
-            this.mYuvFrameData = mat;
+            mWidth = i;
+            mHeight = i2;
+            mYuvFrameData = mat;
         }
 
         public void release() {
-            this.mRgba.release();
-            Mat mat = this.mRotated;
+            mRgba.release();
+            Mat mat = mRotated;
             if (mat != null) {
                 mat.release();
             }
@@ -604,7 +604,7 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
             boolean z;
             do {
                 synchronized (PortraitCameraView.this) {
-                    while (!PortraitCameraView.this.mCameraFrameReady && !PortraitCameraView.this.mStopThread) {
+                    while (!PortraitCameraView.mCameraFrameReady && !PortraitCameraView.mStopThread) {
                         try {
                             PortraitCameraView.this.wait();
                         } catch (InterruptedException e) {
@@ -612,17 +612,17 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
                         }
                     }
                     z = false;
-                    if (PortraitCameraView.this.mCameraFrameReady) {
-                        int unused = PortraitCameraView.this.mChainIdx = 1 - PortraitCameraView.this.mChainIdx;
-                        boolean unused2 = PortraitCameraView.this.mCameraFrameReady = false;
+                    if (PortraitCameraView.mCameraFrameReady) {
+                        int unused = PortraitCameraView.mChainIdx = 1 - PortraitCameraView.mChainIdx;
+                        boolean unused2 = PortraitCameraView.mCameraFrameReady = false;
                         z = true;
                     }
                 }
-                if (!PortraitCameraView.this.mStopThread && z && !PortraitCameraView.this.mFrameChain[1 - PortraitCameraView.this.mChainIdx].empty()) {
+                if (!PortraitCameraView.mStopThread && z && !PortraitCameraView.mFrameChain[1 - PortraitCameraView.mChainIdx].empty()) {
                     PortraitCameraView portraitCameraView = PortraitCameraView.this;
-                    portraitCameraView.deliverAndDrawFrame(portraitCameraView.mCameraFrame[1 - PortraitCameraView.this.mChainIdx]);
+                    portraitCameraView.deliverAndDrawFrame(portraitCameraView.mCameraFrame[1 - PortraitCameraView.mChainIdx]);
                 }
-            } while (!PortraitCameraView.this.mStopThread);
+            } while (!PortraitCameraView.mStopThread);
             Log.m52d(PortraitCameraView.TAG, "Finish processing thread");
         }
     }

+ 4 - 4
app/src/main/java/com/epson/cameracopy/device/SimpleSize.java

@@ -5,15 +5,15 @@ public class SimpleSize implements SizeWrapper {
     private int mWidth;
 
     public SimpleSize(int i, int i2) {
-        this.mWidth = i;
-        this.mHeight = i2;
+        mWidth = i;
+        mHeight = i2;
     }
 
     public int getWidth() {
-        return this.mWidth;
+        return mWidth;
     }
 
     public int getHeight() {
-        return this.mHeight;
+        return mHeight;
     }
 }

+ 6 - 6
app/src/main/java/com/epson/cameracopy/p006ui/CameraFileAdapter.java

@@ -11,26 +11,26 @@ class CameraFileAdapter implements ImagePreviewFile, Serializable {
     private CameraFile mCameraFile;
 
     public CameraFileAdapter(CameraFile cameraFile) {
-        this.mCameraFile = cameraFile;
+        mCameraFile = cameraFile;
     }
 
     public String getImageProcFileName(Context context) {
-        return this.mCameraFile.getValidFileName();
+        return mCameraFile.getValidFileName();
     }
 
     public String getPrintFileName() {
-        return this.mCameraFile.getValidFileName();
+        return mCameraFile.getValidFileName();
     }
 
     public void deleteTemporaryFile() {
-        this.mCameraFile.deleteTemporaryFile();
+        mCameraFile.deleteTemporaryFile();
     }
 
     public boolean needSaveButton() {
-        return this.mCameraFile.isMovable();
+        return mCameraFile.isMovable();
     }
 
     public boolean doSave(String str) {
-        return this.mCameraFile.moveTo(str);
+        return mCameraFile.moveTo(str);
     }
 }

+ 111 - 111
app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewFragment.java

@@ -87,48 +87,48 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
     }
 
     public boolean isPreviewActivityStarted() {
-        return this.mPreviewActivityStarted;
+        return mPreviewActivityStarted;
     }
 
     public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
         View inflate = layoutInflater.inflate(R.layout.fragment_camera_preview, viewGroup, false);
         setHasOptionsMenu(true);
         setButtonListener(inflate);
-        this.mOpenCvCameraView = (OpenCvCameraView) inflate.findViewById(R.id.view1);
+        mOpenCvCameraView = (OpenCvCameraView) inflate.findViewById(R.id.view1);
         if (CameraPreviewControl.hasBackCamera()) {
-            this.mHasCamera = true;
-            this.mOpenCvCameraView.setCvCameraViewListener((CameraBridgeViewBase.CvCameraViewListener2) this);
+            mHasCamera = true;
+            mOpenCvCameraView.setCvCameraViewListener((CameraBridgeViewBase.CvCameraViewListener2) this);
         } else {
-            this.mHasCamera = false;
-            UiCommon.setButtonEnabled(this.mPhtographButton, false);
+            mHasCamera = false;
+            UiCommon.setButtonEnabled(mPhtographButton, false);
             if (bundle == null && this.noCameraDialog) {
                 this.noCameraDialog = false;
                 SimpleMessageDialogFragment.newInstance(R.string.back_camera_not_exists_message).show(getFragmentManager(), "error-dialog");
             }
         }
-        this.mOpenCvCameraView.setVisibility(0);
-        this.mDisplayRotation = ((WindowManager) getActivity().getSystemService("window")).getDefaultDisplay().getRotation();
-        this.mSensorEventListener.setDisplayRotation(this.mDisplayRotation);
-        this.mSensorEventListener.setSensorManager((SensorManager) getActivity().getSystemService("sensor"));
-        this.mSensorEventListener.setReferenceAccelaration(REFERENCE_ACCELARATION);
-        this.mFunctionBarView = inflate.findViewById(R.id.function_bar);
-        this.mDisplayDensity = getActivity().getResources().getDisplayMetrics().density;
+        mOpenCvCameraView.setVisibility(0);
+        mDisplayRotation = ((WindowManager) getActivity().getSystemService("window")).getDefaultDisplay().getRotation();
+        mSensorEventListener.setDisplayRotation(mDisplayRotation);
+        mSensorEventListener.setSensorManager((SensorManager) getActivity().getSystemService("sensor"));
+        mSensorEventListener.setReferenceAccelaration(REFERENCE_ACCELARATION);
+        mFunctionBarView = inflate.findViewById(R.id.function_bar);
+        mDisplayDensity = getActivity().getResources().getDisplayMetrics().density;
         return inflate;
     }
 
     private void setButtonListener(View view) {
-        this.mPhotoSelectButton = (Button) view.findViewById(R.id.photo_select_button);
-        this.mPhotoSelectButton.setOnClickListener(new View.OnClickListener() {
+        mPhotoSelectButton = (Button) view.findViewById(R.id.photo_select_button);
+        mPhotoSelectButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                if (!CameraPreviewFragment.this.mPictureTaking) {
+                if (!CameraPreviewFragment.mPictureTaking) {
                     CameraPreviewFragment.this.startPhotoSelectActivity();
                 }
             }
         });
-        this.mPhtographButton = (Button) view.findViewById(R.id.photograph_button);
-        this.mPhtographButton.setOnClickListener(new View.OnClickListener() {
+        mPhtographButton = (Button) view.findViewById(R.id.photograph_button);
+        mPhtographButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                if (!CameraPreviewFragment.this.mPictureTaking) {
+                if (!CameraPreviewFragment.mPictureTaking) {
                     CameraPreviewFragment.this.takePicture();
                 }
             }
@@ -144,14 +144,14 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
     }
 
     public void onCameraViewStarted(int i, int i2) {
-        this.mRgba = new Mat(i, i2, CvType.CV_8UC4);
+        mRgba = new Mat(i, i2, CvType.CV_8UC4);
         savePictureSizeList();
         checkPictureSize();
     }
 
     private void savePictureSizeList() {
         List<Camera.Size> pictureSizeList;
-        OpenCvCameraView openCvCameraView = this.mOpenCvCameraView;
+        OpenCvCameraView openCvCameraView = mOpenCvCameraView;
         if (openCvCameraView != null && (pictureSizeList = openCvCameraView.getPictureSizeList()) != null) {
             Iterator<Camera.Size> it = pictureSizeList.iterator();
             while (it.hasNext()) {
@@ -168,23 +168,23 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         OpenCvCameraView openCvCameraView;
         Camera.Size cameraPictureSize;
         CameraPreviewControl instance = CameraPreviewControl.getInstance(getActivity());
-        if (instance.getPictureResolutionMode() == 0 && (openCvCameraView = this.mOpenCvCameraView) != null && (cameraPictureSize = openCvCameraView.getCameraPictureSize()) != null && cameraPictureSize.width * cameraPictureSize.height < 1000000) {
+        if (instance.getPictureResolutionMode() == 0 && (openCvCameraView = mOpenCvCameraView) != null && (cameraPictureSize = openCvCameraView.getCameraPictureSize()) != null && cameraPictureSize.width * cameraPictureSize.height < 1000000) {
             int i = R.string.camera_picture_low_message;
             List<android.graphics.Point> cameraPictureSizes = instance.getCameraPictureSizes();
             if (cameraPictureSizes == null || cameraPictureSizes.size() <= 0) {
                 i = R.string.has_no_hireso_picture_message;
             }
-            this.mCameraPictureLowResolutionDialog = SimpleMessageDialogFragment.newInstance(i);
-            this.mCameraPictureLowResolutionDialog.show(getFragmentManager(), "camera-resolution-warning-dialog");
+            mCameraPictureLowResolutionDialog = SimpleMessageDialogFragment.newInstance(i);
+            mCameraPictureLowResolutionDialog.show(getFragmentManager(), "camera-resolution-warning-dialog");
         }
     }
 
     public void onCameraViewStopped() {
-        this.mRgba.release();
-        SimpleMessageDialogFragment simpleMessageDialogFragment = this.mCameraPictureLowResolutionDialog;
+        mRgba.release();
+        SimpleMessageDialogFragment simpleMessageDialogFragment = mCameraPictureLowResolutionDialog;
         if (simpleMessageDialogFragment != null) {
             simpleMessageDialogFragment.dismiss();
-            this.mCameraPictureLowResolutionDialog = null;
+            mCameraPictureLowResolutionDialog = null;
         }
     }
 
@@ -192,9 +192,9 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         int i;
         int height = mat.height();
         if (height > 0) {
-            double scale = (double) (1.0f / this.mOpenCvCameraView.getScale());
-            int height2 = (int) (((double) this.mFunctionBarView.getHeight()) * scale);
-            int height3 = (int) (((double) this.mOpenCvCameraView.getHeight()) * scale);
+            double scale = (double) (1.0f / mOpenCvCameraView.getScale());
+            int height2 = (int) (((double) mFunctionBarView.getHeight()) * scale);
+            int height3 = (int) (((double) mOpenCvCameraView.getHeight()) * scale);
             double d = (double) height;
             if (height2 + 0 + height > height3) {
                 i = (int) (((double) 0) - (((double) (height3 - height)) / 2.0d));
@@ -202,7 +202,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
             } else {
                 i = 0;
             }
-            Size size = this.mRgba.size();
+            Size size = mRgba.size();
             double d2 = size.width / 2.0d;
             double d3 = d / 10.0d;
             double d4 = scale;
@@ -217,7 +217,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
             point2.f432x = d8;
             double d9 = d5 + d;
             point2.f433y = d9 - d3;
-            Imgproc.line(this.mRgba, point, point2, this.mGridColor, 1);
+            Imgproc.line(mRgba, point, point2, mGridColor, 1);
             double d10 = d7;
             point.f432x = d10;
             double d11 = d5 + d6;
@@ -226,7 +226,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
             double d12 = d2;
             point2.f432x = size2.width - d10;
             point2.f433y = d11;
-            Imgproc.line(this.mRgba, point, point2, this.mGridColor, 1);
+            Imgproc.line(mRgba, point, point2, mGridColor, 1);
             double d13 = size2.width / 20.0d;
             double d14 = d / 20.0d;
             double d15 = d13 * 3.0d;
@@ -243,7 +243,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
             point2.f432x = d15;
             point2.f433y = d23;
             double d24 = d21;
-            Imgproc.line(this.mRgba, point, point2, this.mGridColor, 2);
+            Imgproc.line(mRgba, point, point2, mGridColor, 2);
             double d25 = size2.width - d15;
             point.f432x = d25;
             point.f433y = d23;
@@ -251,50 +251,50 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
             double d27 = d18;
             point2.f432x = d27;
             point2.f433y = d23;
-            Imgproc.line(this.mRgba, point, point2, this.mGridColor, 2);
+            Imgproc.line(mRgba, point, point2, mGridColor, 2);
             point.f432x = d13;
             double d28 = d23;
             double d29 = d22;
             point.f433y = d29;
             point2.f432x = d15;
             point2.f433y = d29;
-            Imgproc.line(this.mRgba, point, point2, this.mGridColor, 2);
+            Imgproc.line(mRgba, point, point2, mGridColor, 2);
             point.f432x = d25;
             point.f433y = d29;
             point2.f432x = d27;
             point2.f433y = d29;
-            Imgproc.line(this.mRgba, point, point2, this.mGridColor, 2);
+            Imgproc.line(mRgba, point, point2, mGridColor, 2);
             point.f432x = d13;
             double d30 = d28;
             point.f433y = d30;
             point2.f432x = d13;
             double d31 = d26;
             point2.f433y = d31;
-            Imgproc.line(this.mRgba, point, point2, this.mGridColor, 2);
+            Imgproc.line(mRgba, point, point2, mGridColor, 2);
             point.f432x = d13;
             double d32 = d24;
             point.f433y = d32;
             point2.f432x = d13;
             point2.f433y = d29;
-            Imgproc.line(this.mRgba, point, point2, this.mGridColor, 2);
+            Imgproc.line(mRgba, point, point2, mGridColor, 2);
             point.f432x = d27;
             point.f433y = d30;
             point2.f432x = d27;
             point2.f433y = d31;
-            Imgproc.line(this.mRgba, point, point2, this.mGridColor, 2);
+            Imgproc.line(mRgba, point, point2, mGridColor, 2);
             point.f432x = d27;
             point.f433y = d32;
             point2.f432x = d27;
             point2.f433y = d29;
-            Imgproc.line(this.mRgba, point, point2, this.mGridColor, 2);
+            Imgproc.line(mRgba, point, point2, mGridColor, 2);
             if (z) {
-                double posX = d12 - (((double) (this.mSensorEventListener.getPosX() * 0.05098581f)) * d12);
-                double posY = d6 + (((double) (this.mSensorEventListener.getPosY() * 0.05098581f)) * d6) + d20;
-                int i2 = (int) (d4 * 20.0d * ((double) this.mDisplayDensity));
-                Imgproc.circle(this.mRgba, new Point(posX, posY), i2, this.mPositionCursorColor, 1);
+                double posX = d12 - (((double) (mSensorEventListener.getPosX() * 0.05098581f)) * d12);
+                double posY = d6 + (((double) (mSensorEventListener.getPosY() * 0.05098581f)) * d6) + d20;
+                int i2 = (int) (d4 * 20.0d * ((double) mDisplayDensity));
+                Imgproc.circle(mRgba, new Point(posX, posY), i2, mPositionCursorColor, 1);
                 double d33 = (double) i2;
-                Imgproc.line(this.mRgba, new Point(posX, posY - d33), new Point(posX, posY + d33), this.mPositionCursorColor);
-                Imgproc.line(this.mRgba, new Point(posX - d33, posY), new Point(posX + d33, posY), this.mPositionCursorColor);
+                Imgproc.line(mRgba, new Point(posX, posY - d33), new Point(posX, posY + d33), mPositionCursorColor);
+                Imgproc.line(mRgba, new Point(posX - d33, posY), new Point(posX + d33, posY), mPositionCursorColor);
             }
         }
     }
@@ -318,11 +318,11 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
     }
 
     private boolean checkAutoPictureAngle() {
-        return this.mSensorEventListener.isTerminalAngleInRange(this.AUTO_PICTURE_RANGE_VALUE);
+        return mSensorEventListener.isTerminalAngleInRange(this.AUTO_PICTURE_RANGE_VALUE);
     }
 
     private boolean checkAccelerrationTime() {
-        long lastOverTime2 = this.mSensorEventListener.getLastOverTime2();
+        long lastOverTime2 = mSensorEventListener.getLastOverTime2();
         if (lastOverTime2 > 0 && System.currentTimeMillis() - lastOverTime2 >= 3000) {
             return true;
         }
@@ -330,103 +330,103 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
     }
 
     private boolean autofousTime() {
-        return System.currentTimeMillis() - this.mSensorEventListener.getLastOverTime2() >= 500;
+        return System.currentTimeMillis() - mSensorEventListener.getLastOverTime2() >= 500;
     }
 
     private void sensorAndCamera() {
         if (this.isFragmentVisible) {
             long currentTimeMillis = System.currentTimeMillis();
-            if (this.mAutoPhotoMode && this.mSensorEventListener.isTerminalAngleInRange(this.PAPER_DETECT_VALUE)) {
+            if (mAutoPhotoMode && mSensorEventListener.isTerminalAngleInRange(this.PAPER_DETECT_VALUE)) {
                 boolean checkAutoPictureAngle = checkAutoPictureAngle();
-                int detectAndDrawRectangle2 = RectangleDetector.detectAndDrawRectangle2(this.mRgba.getNativeObjAddr(), 0, this.mFunctionBarView.getHeight(), checkAutoPictureAngle);
+                int detectAndDrawRectangle2 = RectangleDetector.detectAndDrawRectangle2(mRgba.getNativeObjAddr(), 0, mFunctionBarView.getHeight(), checkAutoPictureAngle);
                 if (checkAutoPictureAngle && detectAndDrawRectangle2 == 1 && checkAccelerrationTime()) {
                     takePicture();
                     return;
                 } else if (detectAndDrawRectangle2 != 0) {
-                    this.mPAfTime = currentTimeMillis;
+                    mPAfTime = currentTimeMillis;
                 }
             }
-            if (!this.mPictureTaking && !this.mAutoPhotoMode && !this.mPictureTaking && currentTimeMillis - this.mPAfTime > 4000 && !this.mOpenCvCameraView.isInAutofocus() && autofousTime()) {
-                this.mOpenCvCameraView.doAutofocus(this);
-                this.mPAfTime = currentTimeMillis;
+            if (!mPictureTaking && !mAutoPhotoMode && !mPictureTaking && currentTimeMillis - mPAfTime > 4000 && !mOpenCvCameraView.isInAutofocus() && autofousTime()) {
+                mOpenCvCameraView.doAutofocus(this);
+                mPAfTime = currentTimeMillis;
             }
         }
     }
 
     public Mat onCameraFrame(CameraBridgeViewBase.CvCameraViewFrame cvCameraViewFrame) {
-        this.mRgba = cvCameraViewFrame.rgba();
-        if (!this.mHasCamera || this.mPictureTaking) {
-            return this.mRgba;
+        mRgba = cvCameraViewFrame.rgba();
+        if (!mHasCamera || mPictureTaking) {
+            return mRgba;
         }
-        int i = this.mInitCount;
+        int i = mInitCount;
         if (i < 2) {
-            this.mInitCount = i + 1;
-            this.mScreenSize.f432x = (double) this.mRgba.width();
-            this.mScreenSize.f433y = (double) this.mRgba.height();
-            Imgproc.rectangle(this.mRgba, POSITION_0_0, this.mScreenSize, COLOR_BLACK, -1);
+            mInitCount = i + 1;
+            mScreenSize.f432x = (double) mRgba.width();
+            mScreenSize.f433y = (double) mRgba.height();
+            Imgproc.rectangle(mRgba, POSITION_0_0, mScreenSize, COLOR_BLACK, -1);
         }
         sensorAndCamera();
-        if (this.mCameraPreviewControl.getGuideMode()) {
-            drawSensorPos(this.mRgba, this.mSensorEventListener.isTerminalAngleInRange(this.PAPER_DETECT_VALUE));
+        if (mCameraPreviewControl.getGuideMode()) {
+            drawSensorPos(mRgba, mSensorEventListener.isTerminalAngleInRange(this.PAPER_DETECT_VALUE));
         }
-        return this.mRgba;
+        return mRgba;
     }
 
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        this.mCameraPreviewControl = CameraPreviewControl.getInstance(getActivity());
-        this.mPictureTaking = false;
+        mCameraPreviewControl = CameraPreviewControl.getInstance(getActivity());
+        mPictureTaking = false;
     }
 
     public void onResume() {
         super.onResume();
-        if (this.mHasCamera) {
+        if (mHasCamera) {
             enableAllButton();
-            if (this.mOpenCvCameraView.checkBackCamera()) {
-                this.mOpenCvCameraView.enableView();
-                this.mSensorEventListener.start();
-                this.mPAfTime = 0;
+            if (mOpenCvCameraView.checkBackCamera()) {
+                mOpenCvCameraView.enableView();
+                mSensorEventListener.start();
+                mPAfTime = 0;
             } else {
-                UiCommon.setButtonEnabled(this.mPhtographButton, false);
+                UiCommon.setButtonEnabled(mPhtographButton, false);
                 disableSettingButton(true);
                 SimpleMessageDialogFragment.newInstance(R.string.back_camera_not_exists_message).show(getFragmentManager(), "error-dialog");
             }
-            this.mPictureTaking = false;
+            mPictureTaking = false;
         }
-        this.mInitCount = 0;
-        if (this.mPreviewActivityStarted) {
-            this.mPreviewActivityStarted = false;
-            this.mPictureTaking = false;
+        mInitCount = 0;
+        if (mPreviewActivityStarted) {
+            mPreviewActivityStarted = false;
+            mPictureTaking = false;
             enableAllButton();
         }
-        this.mAutoPhotoMode = this.mCameraPreviewControl.getAutoPictureMode();
+        mAutoPhotoMode = mCameraPreviewControl.getAutoPictureMode();
         this.isFragmentVisible = true;
     }
 
     public void onPause() {
         this.isFragmentVisible = false;
-        this.mSensorEventListener.stop();
-        TakePictureTask takePictureTask = this.mTakePictureTask;
+        mSensorEventListener.stop();
+        TakePictureTask takePictureTask = mTakePictureTask;
         if (takePictureTask != null) {
             takePictureTask.cancel(false);
-            this.mTakePictureTask = null;
+            mTakePictureTask = null;
         }
-        OpenCvCameraView openCvCameraView = this.mOpenCvCameraView;
+        OpenCvCameraView openCvCameraView = mOpenCvCameraView;
         if (openCvCameraView != null) {
             openCvCameraView.cancelAutofocus();
-            this.mOpenCvCameraView.disableView();
+            mOpenCvCameraView.disableView();
         }
-        this.mPictureTaking = false;
+        mPictureTaking = false;
         super.onPause();
     }
 
     public void onDestroy() {
-        OpenCvCameraView openCvCameraView = this.mOpenCvCameraView;
+        OpenCvCameraView openCvCameraView = mOpenCvCameraView;
         if (openCvCameraView != null) {
             openCvCameraView.cancelAutofocus();
-            this.mOpenCvCameraView.disableView();
-            this.mOpenCvCameraView.setCvCameraViewListener((CameraBridgeViewBase.CvCameraViewListener2) null);
-            this.mOpenCvCameraView = null;
+            mOpenCvCameraView.disableView();
+            mOpenCvCameraView.setCvCameraViewListener((CameraBridgeViewBase.CvCameraViewListener2) null);
+            mOpenCvCameraView = null;
         }
         super.onDestroy();
     }
@@ -436,26 +436,26 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
     }
 
     public void takePicture() {
-        if (!this.mPictureTaking) {
-            this.mPictureTaking = true;
+        if (!mPictureTaking) {
+            mPictureTaking = true;
             getActivity().runOnUiThread(new Runnable() {
                 public void run() {
                     CameraPreviewFragment.this.disableAllButton();
                 }
             });
-            this.mSensorEventListener.stop();
-            this.mTakePictureTask = new TakePictureTask(this.mOpenCvCameraView);
-            this.mTakePictureTask.execute(new Void[0]);
+            mSensorEventListener.stop();
+            mTakePictureTask = new TakePictureTask(mOpenCvCameraView);
+            mTakePictureTask.execute(new Void[0]);
         }
     }
 
     private void takePictureStep2() {
-        this.mOpenCvCameraView.takePicture(FileUtils.getNewTemporaryJpegFile(getActivity()).getPath(), new OpenCvCameraView.MyPictureTakeCallback() {
+        mOpenCvCameraView.takePicture(FileUtils.getNewTemporaryJpegFile(getActivity()).getPath(), new OpenCvCameraView.MyPictureTakeCallback() {
             public void onMyPictureTaken(boolean z, String str) {
                 if (!z || str == null) {
                     CameraPreviewFragment.this.enableAllButton();
-                    CameraPreviewFragment.this.mSensorEventListener.start();
-                    boolean unused = CameraPreviewFragment.this.mPictureTaking = false;
+                    CameraPreviewFragment.mSensorEventListener.start();
+                    boolean unused = CameraPreviewFragment.mPictureTaking = false;
                     CameraPreviewFragment.this.showErrorDialog();
                     return;
                 }
@@ -466,36 +466,36 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
 
     private void enableAllButton() {
         if (CameraPreviewControl.hasBackCamera()) {
-            UiCommon.setButtonEnabled(this.mPhtographButton, true);
+            UiCommon.setButtonEnabled(mPhtographButton, true);
             disableSettingButton(false);
         }
-        UiCommon.setButtonEnabled(this.mPhotoSelectButton, true);
+        UiCommon.setButtonEnabled(mPhotoSelectButton, true);
     }
 
     private void disableAllButton() {
-        UiCommon.setButtonEnabled(this.mPhtographButton, false);
+        UiCommon.setButtonEnabled(mPhtographButton, false);
         disableSettingButton(true);
-        UiCommon.setButtonEnabled(this.mPhotoSelectButton, false);
+        UiCommon.setButtonEnabled(mPhotoSelectButton, false);
     }
 
     private void startPictureViewActivity(String str) {
         Intent intent = new Intent(getActivity(), ImagePreviewActivity.class);
         intent.putExtra(ImagePreviewActivity.PARAM_CAMERA_FILE, new CameraFile(new Date(), str));
         startActivity(intent);
-        this.mPreviewActivityStarted = true;
+        mPreviewActivityStarted = true;
     }
 
     public void onAutoFocusCompleted(boolean z) {
-        this.mPAfTime = System.currentTimeMillis();
+        mPAfTime = System.currentTimeMillis();
     }
 
     private void disableSettingButton(boolean z) {
-        this.mDisableSettingsButton = z;
+        mDisableSettingsButton = z;
         getActivity().invalidateOptionsMenu();
     }
 
     public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
-        if (!this.mDisableSettingsButton) {
+        if (!mDisableSettingsButton) {
             menuInflater.inflate(R.C2138menu.camera_menu, menu);
         }
         super.onCreateOptionsMenu(menu, menuInflater);
@@ -505,7 +505,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         if (menuItem.getItemId() != R.id.camera_setting) {
             return super.onOptionsItemSelected(menuItem);
         }
-        if (this.mPictureTaking) {
+        if (mPictureTaking) {
             return false;
         }
         startSettingActivity();
@@ -513,7 +513,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
     }
 
     public boolean onBackPressed() {
-        return !this.mPictureTaking;
+        return !mPictureTaking;
     }
 
     /* renamed from: com.epson.cameracopy.ui.CameraPreviewFragment$TakePictureTask */
@@ -521,12 +521,12 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         private OpenCvCameraView mMyOpenCvCameraView;
 
         public TakePictureTask(OpenCvCameraView openCvCameraView) {
-            this.mMyOpenCvCameraView = openCvCameraView;
+            mMyOpenCvCameraView = openCvCameraView;
         }
 
         protected Void doInBackground(Void... voidArr) {
             System.currentTimeMillis();
-            while (!isCancelled() && this.mMyOpenCvCameraView.isInAutofocus()) {
+            while (!isCancelled() && mMyOpenCvCameraView.isInAutofocus()) {
                 try {
                     Thread.sleep(100);
                 } catch (InterruptedException e) {

+ 40 - 40
app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewOptionActivity.java

@@ -30,14 +30,14 @@ public class CameraPreviewOptionActivity extends ActivityIACommon implements Pic
         setContentView((int) R.layout.activity_camera_preview_option);
         setActionBar((int) R.string.camera_option_title, true);
         if (bundle == null) {
-            this.mFragment = new PlaceholderFragment();
-            getSupportFragmentManager().beginTransaction().add((int) R.id.container, (Fragment) this.mFragment).commit();
+            mFragment = new PlaceholderFragment();
+            getSupportFragmentManager().beginTransaction().add((int) R.id.container, (Fragment) mFragment).commit();
         }
     }
 
     public void onItemSelected(boolean z, int i, Point point) {
         PlaceholderFragment placeholderFragment;
-        if (z && (placeholderFragment = this.mFragment) != null) {
+        if (z && (placeholderFragment = mFragment) != null) {
             placeholderFragment.changeSelectedCameraPictureResolution(i, point);
         }
     }
@@ -55,95 +55,95 @@ public class CameraPreviewOptionActivity extends ActivityIACommon implements Pic
 
         public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
             View inflate = layoutInflater.inflate(R.layout.fragment_camera_preview_option, viewGroup, false);
-            this.mCameraPreviewControl = CameraPreviewControl.getInstance(getActivity());
+            mCameraPreviewControl = CameraPreviewControl.getInstance(getActivity());
             setHasOptionsMenu(true);
-            this.mGuideToggleButton = (Switch) inflate.findViewById(R.id.guideToggleButton);
-            this.mGuideToggleButton.setChecked(this.mCameraPreviewControl.getGuideMode());
-            this.mGuideToggleButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            mGuideToggleButton = (Switch) inflate.findViewById(R.id.guideToggleButton);
+            mGuideToggleButton.setChecked(mCameraPreviewControl.getGuideMode());
+            mGuideToggleButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                 public void onCheckedChanged(CompoundButton compoundButton, boolean z) {
                     PlaceholderFragment.this.changeAutoPhotoToggleButtonStatus(z);
                 }
             });
-            this.mAutoPhotoToggleButton = (Switch) inflate.findViewById(R.id.autoPictureToggleButton);
-            this.mAutoPhotoToggleButton.setChecked(this.mCameraPreviewControl.getAutoPictureMode());
-            changeAutoPhotoToggleButtonStatus(this.mGuideToggleButton.isChecked());
+            mAutoPhotoToggleButton = (Switch) inflate.findViewById(R.id.autoPictureToggleButton);
+            mAutoPhotoToggleButton.setChecked(mCameraPreviewControl.getAutoPictureMode());
+            changeAutoPhotoToggleButtonStatus(mGuideToggleButton.isChecked());
             ((LinearLayout) inflate.findViewById(R.id.save_directory_layout)).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     PlaceholderFragment.this.startSaveDirectoryActivity();
                 }
             });
-            this.mSaveDirectoryText = (TextView) inflate.findViewById(R.id.saveDirectoryText);
-            setSaveDirectoryText(this.mCameraPreviewControl.getSaveDirecotry());
+            mSaveDirectoryText = (TextView) inflate.findViewById(R.id.saveDirectoryText);
+            setSaveDirectoryText(mCameraPreviewControl.getSaveDirecotry());
             inflate.findViewById(R.id.picture_resolution_layout).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     PlaceholderFragment.this.openPictureResolutionDialog();
                 }
             });
-            this.mPictureResolutionText = (TextView) inflate.findViewById(R.id.pictureResolutionText);
+            mPictureResolutionText = (TextView) inflate.findViewById(R.id.pictureResolutionText);
             setCameraPictureResolutionModeFromCameraPreviewControl();
             setPictureResolutionText();
             return inflate;
         }
 
         public void changeSelectedCameraPictureResolution(int i, Point point) {
-            this.mCameraPictureResolutionMode = i;
-            if (this.mCameraPictureResolutionMode == 0) {
-                this.mCameraPictureSize = null;
+            mCameraPictureResolutionMode = i;
+            if (mCameraPictureResolutionMode == 0) {
+                mCameraPictureSize = null;
             } else {
-                this.mCameraPictureSize = point;
+                mCameraPictureSize = point;
             }
             setPictureResolutionText();
         }
 
         private void setPictureResolutionText() {
-            if (this.mCameraPictureResolutionMode == 0) {
-                this.mPictureResolutionText.setText(R.string.picture_size_auto);
+            if (mCameraPictureResolutionMode == 0) {
+                mPictureResolutionText.setText(R.string.picture_size_auto);
                 return;
             }
-            Point point = this.mCameraPictureSize;
-            if (point == null || point.x <= 0 || this.mCameraPictureSize.y <= 0) {
-                this.mPictureResolutionText.setText("");
+            Point point = mCameraPictureSize;
+            if (point == null || point.x <= 0 || mCameraPictureSize.y <= 0) {
+                mPictureResolutionText.setText("");
                 return;
             }
-            this.mPictureResolutionText.setText(CameraPreviewControl.getPictureSizeString(this.mCameraPictureSize.x, this.mCameraPictureSize.y));
+            mPictureResolutionText.setText(CameraPreviewControl.getPictureSizeString(mCameraPictureSize.x, mCameraPictureSize.y));
         }
 
         private void setCameraPictureResolutionModeFromCameraPreviewControl() {
-            this.mCameraPictureResolutionMode = this.mCameraPreviewControl.getPictureResolutionMode();
-            this.mCameraPictureSize = null;
-            if (this.mCameraPictureResolutionMode == 1) {
-                this.mCameraPictureSize = this.mCameraPreviewControl.getPictureSize();
+            mCameraPictureResolutionMode = mCameraPreviewControl.getPictureResolutionMode();
+            mCameraPictureSize = null;
+            if (mCameraPictureResolutionMode == 1) {
+                mCameraPictureSize = mCameraPreviewControl.getPictureSize();
             }
         }
 
         private void openPictureResolutionDialog() {
-            PictureResolutionDialogFragment.newInstance(this.mCameraPictureResolutionMode, this.mCameraPictureSize).show(getActivity().getSupportFragmentManager(), "picture-resolution");
+            PictureResolutionDialogFragment.newInstance(mCameraPictureResolutionMode, mCameraPictureSize).show(getActivity().getSupportFragmentManager(), "picture-resolution");
         }
 
         private void changeValueAndFinish() {
-            this.mCameraPreviewControl.setGuideMode(this.mGuideToggleButton.isChecked());
-            this.mCameraPreviewControl.setAutoPictureMode(Boolean.valueOf(this.mAutoPhotoToggleButton.isChecked()));
-            this.mCameraPreviewControl.setSaveDirecotry(this.mSaveDirectoryName);
-            if (this.mCameraPictureResolutionMode == 0) {
-                this.mCameraPreviewControl.setPictureResolutionModeAuto();
+            mCameraPreviewControl.setGuideMode(mGuideToggleButton.isChecked());
+            mCameraPreviewControl.setAutoPictureMode(Boolean.valueOf(mAutoPhotoToggleButton.isChecked()));
+            mCameraPreviewControl.setSaveDirecotry(mSaveDirectoryName);
+            if (mCameraPictureResolutionMode == 0) {
+                mCameraPreviewControl.setPictureResolutionModeAuto();
             } else {
-                this.mCameraPreviewControl.setPictureSize(this.mCameraPictureSize);
+                mCameraPreviewControl.setPictureSize(mCameraPictureSize);
             }
             getActivity().finish();
         }
 
         private void changeAutoPhotoToggleButtonStatus(boolean z) {
-            if (z && this.mCameraPreviewControl.hasAutoPictureHardware(getActivity())) {
-                this.mAutoPhotoToggleButton.setEnabled(true);
+            if (z && mCameraPreviewControl.hasAutoPictureHardware(getActivity())) {
+                mAutoPhotoToggleButton.setEnabled(true);
                 return;
             }
-            this.mAutoPhotoToggleButton.setChecked(false);
-            this.mAutoPhotoToggleButton.setEnabled(false);
+            mAutoPhotoToggleButton.setChecked(false);
+            mAutoPhotoToggleButton.setEnabled(false);
         }
 
         private void setSaveDirectoryText(String str) {
-            this.mSaveDirectoryName = str;
-            this.mSaveDirectoryText.setText(new File(this.mSaveDirectoryName).getName());
+            mSaveDirectoryName = str;
+            mSaveDirectoryText.setText(new File(mSaveDirectoryName).getName());
         }
 
         public void startSaveDirectoryActivity() {

+ 32 - 32
app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintProgress.java

@@ -799,9 +799,9 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         getWindow().addFlags(128);
         super.onCreate(bundle);
         Utils.setFInishOnTOuchOutside(this, false);
-        this.mError = false;
+        mError = false;
         curError = 0;
-        this.mWaitEpsonServiceForFinish = false;
+        mWaitEpsonServiceForFinish = false;
         synchronized (mLockInit) {
             EPLog.m307e("Epson", "PrintProgress.java: onCreate() call init() funciton");
             init();
@@ -811,8 +811,8 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         PrintSetting printSetting = new PrintSetting(this, PrintSetting.Kind.cameracopy);
         printSetting.loadSettings();
         copies = printSetting.copiesValue;
-        this.mImageAndLayoutList = getIntent().getExtras().getParcelableArrayList(KEY_IMAGE_AND_LAYOUT);
-        ArrayList<ImageAndLayout> arrayList = this.mImageAndLayoutList;
+        mImageAndLayoutList = getIntent().getExtras().getParcelableArrayList(KEY_IMAGE_AND_LAYOUT);
+        ArrayList<ImageAndLayout> arrayList = mImageAndLayoutList;
         if (arrayList == null) {
             finish();
             return;
@@ -822,30 +822,30 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         setContentView(R.layout.progress_layout);
         this.context = this;
         mProgressPercent = (ProgressBar) findViewById(R.id.progress_percent);
-        this.mPercent = (TextView) findViewById(R.id.percent);
+        mPercent = (TextView) findViewById(R.id.percent);
         mProgressCopies = (ProgressBar) findViewById(R.id.progress_copies);
-        this.mCopies = (TextView) findViewById(R.id.copies);
-        this.mPage = (TextView) findViewById(R.id.page);
+        mCopies = (TextView) findViewById(R.id.copies);
+        mPage = (TextView) findViewById(R.id.page);
         mProgressPage = (ProgressBar) findViewById(R.id.progress_page);
         if (this.sheets > 1) {
-            TextView textView = this.mPage;
+            TextView textView = mPage;
             textView.setText(getString(R.string.page) + ": " + this.curSheet + CommonDefine.SLASH + this.sheets);
             mProgressPage.setProgress((this.curSheet * 100) / this.sheets);
         } else {
             mProgressPage.setVisibility(4);
-            this.mPage.setVisibility(4);
+            mPage.setVisibility(4);
         }
         if (copies <= 1 || this.isRemotePrinter) {
             mProgressCopies.setVisibility(4);
-            this.mCopies.setVisibility(4);
+            mCopies.setVisibility(4);
             copies = 1;
         } else {
-            TextView textView2 = this.mCopies;
+            TextView textView2 = mCopies;
             textView2.setText(getString(R.string.copies) + ": " + this.curCopy + CommonDefine.SLASH + copies);
             mProgressCopies.setProgress((this.curCopy * 100) / copies);
         }
-        this.mCancelButton = (Button) findViewById(R.id.cancel_button);
-        this.mCancelButton.setOnClickListener(new View.OnClickListener() {
+        mCancelButton = (Button) findViewById(R.id.cancel_button);
+        mCancelButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 CameraPrintProgress.this.CancelPrint();
             }
@@ -856,20 +856,20 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         } else {
             this.percentString = getString(R.string.printing);
         }
-        TextView textView3 = this.mPercent;
+        TextView textView3 = mPercent;
         textView3.setText(this.percentString + "         0%");
         mProgressPercent.setProgress(0);
         findViewById(R.id.epsonColorImageView).setVisibility(8);
         if (this.isRemotePrinter) {
-            this.mHandler.sendEmptyMessage(2);
+            mHandler.sendEmptyMessage(2);
         } else {
-            this.mHandler.sendEmptyMessage(6);
+            mHandler.sendEmptyMessage(6);
         }
         EPLog.m313i("Epson", "printProgress.java: onCreate() finish");
     }
 
     private void triggerPrint() {
-        this.mHandler.sendEmptyMessage(2);
+        mHandler.sendEmptyMessage(2);
     }
 
     protected void onDestroy() {
@@ -877,10 +877,10 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         EPLog.m307e("Epson", "PrintProgress.java: onDestroy()call");
         EPLog.m307e("Epson", "clearFlags : FLAG_KEEP_SCREEN_ON ");
         getWindow().clearFlags(128);
-        this.mHandler.removeMessages(1);
-        this.mHandler.removeMessages(3);
-        this.mHandler.removeMessages(2);
-        this.mHandler.removeMessages(4);
+        mHandler.removeMessages(1);
+        mHandler.removeMessages(3);
+        mHandler.removeMessages(2);
+        mHandler.removeMessages(4);
         EPLog.m307e("Epson", "PrintProgress.java: onDestroy() finish");
     }
 
@@ -925,7 +925,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                             CameraPrintProgress.curError = 0;
                             boolean unused = CameraPrintProgress.this.isDialogOpen = false;
                             CameraPrintProgress.this.removeDialog(0);
-                            CameraPrintProgress.this.mHandler.sendEmptyMessage(5);
+                            CameraPrintProgress.mHandler.sendEmptyMessage(5);
                         }
                     });
                     negativeButton.setOnKeyListener(new DialogInterface.OnKeyListener() {
@@ -944,7 +944,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                             }
                             CameraPrintProgress.mEpsonService.confirmContinueable(true);
                             CameraPrintProgress.curError = 0;
-                            boolean unused = CameraPrintProgress.this.mError = false;
+                            boolean unused = CameraPrintProgress.mError = false;
                         } catch (RemoteException e) {
                             e.printStackTrace();
                         }
@@ -961,10 +961,10 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                         } catch (RemoteException e) {
                             e.printStackTrace();
                         }
-                        boolean unused2 = CameraPrintProgress.this.mWaitEpsonServiceForFinish = true;
-                        boolean unused3 = CameraPrintProgress.this.mError = true;
+                        boolean unused2 = CameraPrintProgress.mWaitEpsonServiceForFinish = true;
+                        boolean unused3 = CameraPrintProgress.mError = true;
                         EPLog.m305d("PrintProgress", "cont/cancel dialog. cancel clicked");
-                        CameraPrintProgress.this.mHandler.sendEmptyMessage(5);
+                        CameraPrintProgress.mHandler.sendEmptyMessage(5);
                     }
                 });
                 negativeButton2.setOnKeyListener(new DialogInterface.OnKeyListener() {
@@ -979,7 +979,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 }
                 AlertDialog.Builder negativeButton3 = new AlertDialog.Builder(this).setTitle((CharSequence) null).setCancelable(false).setMessage(getString(R.string.str_msg_scan_cancel)).setPositiveButton(getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        CameraPrintProgress.this.mHandler.removeMessages(1);
+                        CameraPrintProgress.mHandler.removeMessages(1);
                         try {
                             EPLog.m307e("Epson", "user choice cancel print from GUI");
                             if ((CameraPrintProgress.mEpsonService != null ? CameraPrintProgress.mEpsonService.confirmCancel(true) : 0) == 0) {
@@ -994,9 +994,9 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                         CameraPrintProgress cameraPrintProgress = CameraPrintProgress.this;
                         cameraPrintProgress.mCanceled = true;
                         cameraPrintProgress.mCancelButton.setVisibility(4);
-                        CameraPrintProgress.this.mCancelButton.setEnabled(false);
+                        CameraPrintProgress.mCancelButton.setEnabled(false);
                         if (CameraPrintProgress.this.bSearching) {
-                            CameraPrintProgress.this.mHandler.sendEmptyMessage(5);
+                            CameraPrintProgress.mHandler.sendEmptyMessage(5);
                             boolean unused = CameraPrintProgress.this.bSearching = false;
                         }
                     }
@@ -1021,10 +1021,10 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         if (i == 1) {
             switch (i2) {
                 case -1:
-                    this.mHandler.sendEmptyMessage(10);
+                    mHandler.sendEmptyMessage(10);
                     return;
                 case 0:
-                    this.mHandler.sendEmptyMessage(5);
+                    mHandler.sendEmptyMessage(5);
                     return;
                 default:
                     return;
@@ -1060,7 +1060,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         new CustomTitleAlertDialogBuilder(this).setCancelable(false).setTitle(str).setMessage(str2).setNegativeButton(getString(R.string.ok_button), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 dialogInterface.cancel();
-                CameraPrintProgress.this.mHandler.sendEmptyMessage(5);
+                CameraPrintProgress.mHandler.sendEmptyMessage(5);
             }
         }).create().show();
     }

+ 93 - 93
app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintSettingActivity.java

@@ -156,19 +156,19 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         public void onServiceDisconnected(ComponentName componentName) {
             EPLog.m316v("SettingScr", "onServiceDisconnected");
             try {
-                CameraPrintSettingActivity.this.mEpsonService.unregisterCallback(CameraPrintSettingActivity.this.mCallback);
+                CameraPrintSettingActivity.mEpsonService.unregisterCallback(CameraPrintSettingActivity.mCallback);
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
-            IEpsonService unused = CameraPrintSettingActivity.this.mEpsonService = null;
+            IEpsonService unused = CameraPrintSettingActivity.mEpsonService = null;
         }
 
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
-            IEpsonService unused = CameraPrintSettingActivity.this.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
+            IEpsonService unused = CameraPrintSettingActivity.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
             EPLog.m316v("SettingScr", "onServiceConnected");
-            if (CameraPrintSettingActivity.this.mEpsonService != null) {
+            if (CameraPrintSettingActivity.mEpsonService != null) {
                 try {
-                    CameraPrintSettingActivity.this.mEpsonService.registerCallback(CameraPrintSettingActivity.this.mCallback);
+                    CameraPrintSettingActivity.mEpsonService.registerCallback(CameraPrintSettingActivity.mCallback);
                 } catch (RemoteException e) {
                     e.printStackTrace();
                 }
@@ -1681,16 +1681,16 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         setContentView((int) R.layout.setting_layout);
         setActionBar((int) R.string.str_btn_printer_settings, true);
         bindEpsonService();
-        this.mContext = this;
-        this.mRemoteSrcType = 2;
+        mContext = this;
+        mRemoteSrcType = 2;
         this.isDocumentSetting = getIntent().getBooleanExtra(PrintProgress.PARAM_DOCUMENT_MODE, false);
         if (this.isDocumentSetting) {
             this.sheets = getIntent().getIntExtra("SHEETS", 1);
             this.disablePrintArea = getIntent().getBooleanExtra("PRINTAREA", false);
-            this.mRemoteSrcType = 1;
+            mRemoteSrcType = 1;
         }
         this.sheets = 1;
-        this.mRemoteSrcType = 2;
+        mRemoteSrcType = 2;
         this.printerName = (TextView) findViewById(R.id.printer_name);
         this.paperSizeInfo = (TextView) findViewById(R.id.paper_size_info);
         this.paperTypeInfo = (TextView) findViewById(R.id.paper_type_info);
@@ -1723,12 +1723,12 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         if (this.printerId != null) {
             this.undoFlag = false;
             if (loadSupportedMediaFile()) {
-                this.mHandler.sendEmptyMessage(1);
+                mHandler.sendEmptyMessage(1);
             } else {
-                this.mHandler.sendEmptyMessage(17);
+                mHandler.sendEmptyMessage(17);
             }
         } else {
-            this.mHandler.sendEmptyMessage(1);
+            mHandler.sendEmptyMessage(1);
         }
     }
 
@@ -1797,32 +1797,32 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         this.autoConnectSsid = WiFiDirectManager.getConnectInfo(this, WiFiDirectManager.DEVICE_TYPE_PRINTER);
         PrintSetting printSetting = new PrintSetting(this, PrintSetting.Kind.cameracopy);
         printSetting.loadSettings();
-        this.mLookupTable = new MediaInfo.PaperSize();
+        mLookupTable = new MediaInfo.PaperSize();
         this.paperSize = printSetting.paperSizeValue;
-        this.paperSizeInfo.setText(getString(this.mLookupTable.getStringId(this.paperSize)));
-        this.mLookupTable.destructor();
-        this.mLookupTable = new MediaInfo.PaperType();
+        this.paperSizeInfo.setText(getString(mLookupTable.getStringId(this.paperSize)));
+        mLookupTable.destructor();
+        mLookupTable = new MediaInfo.PaperType();
         this.paperType = printSetting.paperTypeValue;
-        this.paperTypeInfo.setText(getString(this.mLookupTable.getStringId(this.paperType)));
-        this.mLookupTable.destructor();
-        this.mPaperSizeType = printSetting.loadPaperSizeTypePear();
-        this.mPaperSizeType.putID(this.paperSize, this.paperType);
-        this.mLookupTable = new MediaInfo.Layout();
+        this.paperTypeInfo.setText(getString(mLookupTable.getStringId(this.paperType)));
+        mLookupTable.destructor();
+        mPaperSizeType = printSetting.loadPaperSizeTypePear();
+        mPaperSizeType.putID(this.paperSize, this.paperType);
+        mLookupTable = new MediaInfo.Layout();
         this.layout = printSetting.layoutValue;
-        this.layoutInfo.setText(getString(this.mLookupTable.getStringId(this.layout)));
-        this.mLookupTable.destructor();
-        this.mLookupTable = new MediaInfo.Quality();
+        this.layoutInfo.setText(getString(mLookupTable.getStringId(this.layout)));
+        mLookupTable.destructor();
+        mLookupTable = new MediaInfo.Quality();
         this.quality = printSetting.qualityValue;
-        this.qualityInfo.setText(getString(this.mLookupTable.getStringId(this.quality)));
-        this.mLookupTable.destructor();
-        this.mLookupTable = new MediaInfo.PaperSource();
+        this.qualityInfo.setText(getString(mLookupTable.getStringId(this.quality)));
+        mLookupTable.destructor();
+        mLookupTable = new MediaInfo.PaperSource();
         this.paperSource = printSetting.paperSourceValue;
-        this.paperSourceInfo.setText(getString(this.mLookupTable.getStringId(this.paperSource)));
-        this.mLookupTable.destructor();
-        this.mLookupTable = new MediaInfo.Color();
+        this.paperSourceInfo.setText(getString(mLookupTable.getStringId(this.paperSource)));
+        mLookupTable.destructor();
+        mLookupTable = new MediaInfo.Color();
         this.color = printSetting.colorValue;
-        this.colorInfo.setText(getString(this.mLookupTable.getStringId(this.color)));
-        this.mLookupTable.destructor();
+        this.colorInfo.setText(getString(mLookupTable.getStringId(this.color)));
+        mLookupTable.destructor();
         this.copiesValue = printSetting.copiesValue;
         this.copies.setText(String.valueOf(this.copiesValue));
         this.copiesMinus.setEnabled(this.copiesValue != 1);
@@ -1834,14 +1834,14 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         this.brightnessValue = printSetting.brightnessValue;
         this.contrastValue = printSetting.contrastValue;
         this.saturationValue = printSetting.saturationValue;
-        this.mLookupTable = new MediaInfo.Duplex();
+        mLookupTable = new MediaInfo.Duplex();
         this.duplex = printSetting.duplexValue;
-        this.duplexInfo.setText(getString(this.mLookupTable.getStringId(this.duplex)));
-        this.mLookupTable.destructor();
-        this.mLookupTable = new MediaInfo.FeedDirection();
+        this.duplexInfo.setText(getString(mLookupTable.getStringId(this.duplex)));
+        mLookupTable.destructor();
+        mLookupTable = new MediaInfo.FeedDirection();
         this.feedDirection = printSetting.feedDirectionValue;
-        this.feedDirectionInfo.setText(getString(this.mLookupTable.getStringId(this.feedDirection)));
-        this.mLookupTable.destructor();
+        this.feedDirectionInfo.setText(getString(mLookupTable.getStringId(this.feedDirection)));
+        mLookupTable.destructor();
         this.lang = curPrinter.getLang();
         if (this.isDocumentSetting) {
             this.printAll = printSetting.printAll;
@@ -1850,10 +1850,10 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
             ((TextView) findViewById(R.id.page_range_value)).setText(this.startValue + ".." + this.endValue);
             return;
         }
-        this.mLookupTable = new MediaInfo.PrintDate();
+        mLookupTable = new MediaInfo.PrintDate();
         this.printdate = printSetting.printdate;
-        this.printDateInfo.setText(getString(this.mLookupTable.getStringId(this.printdate)));
-        this.mLookupTable.destructor();
+        this.printDateInfo.setText(getString(mLookupTable.getStringId(this.printdate)));
+        mLookupTable.destructor();
     }
 
     private boolean loadSupportedMediaFile() {
@@ -2000,7 +2000,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
             printSetting.printdate = this.printdate;
         }
         printSetting.saveSettings();
-        printSetting.savePaperSizeTypePear((MediaInfo.PaperSizeType) this.mPaperSizeType);
+        printSetting.savePaperSizeTypePear((MediaInfo.PaperSizeType) mPaperSizeType);
         saveSupportedMediaFile();
         String str = this.autoConnectSsid;
         if (str == null || str.length() <= 0) {
@@ -2008,10 +2008,10 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         } else {
             WiFiDirectManager.setConnectInfo(this, this.autoConnectSsid, WiFiDirectManager.DEVICE_TYPE_PRINTER, myPrinter.getName());
         }
-        EPPrinterManager ePPrinterManager = new EPPrinterManager(this.mContext);
+        EPPrinterManager ePPrinterManager = new EPPrinterManager(mContext);
         ePPrinterManager.commitIPPrinterInfo();
         ePPrinterManager.commitRemotePrinterInfo();
-        if (this.mPrinterSelectDone) {
+        if (mPrinterSelectDone) {
             new InkRplnRepository(false).savePermanently(this);
         }
     }
@@ -2020,24 +2020,24 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         super.onDestroy();
         unbindEpsonService();
         EPLog.m313i("SettingScr", "onDestroy");
-        this.mPaperSizeType.destructor();
+        mPaperSizeType.destructor();
     }
 
     private void bindEpsonService() {
         EPLog.m316v("SettingScr", "bindEpsonService");
-        if (this.mEpsonService == null) {
-            bindService(new Intent(this, EpsonService.class), this.mEpsonConnection, 1);
+        if (mEpsonService == null) {
+            bindService(new Intent(this, EpsonService.class), mEpsonConnection, 1);
         }
     }
 
     private void unbindEpsonService() {
         EPLog.m316v("SettingScr", "unbindEpsonService");
-        IEpsonService iEpsonService = this.mEpsonService;
+        IEpsonService iEpsonService = mEpsonService;
         if (iEpsonService != null) {
             try {
-                iEpsonService.unregisterCallback(this.mCallback);
-                unbindService(this.mEpsonConnection);
-                this.mEpsonService = null;
+                iEpsonService.unregisterCallback(mCallback);
+                unbindService(mEpsonConnection);
+                mEpsonService = null;
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
@@ -2046,7 +2046,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
 
     public void onClick(View view) {
         if (this.progressGetOption.getVisibility() == 8) {
-            IEpsonService iEpsonService = this.mEpsonService;
+            IEpsonService iEpsonService = mEpsonService;
             if (iEpsonService != null) {
                 try {
                     iEpsonService.cancelSearchPrinter();
@@ -2265,72 +2265,72 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                         int i3 = intent.getExtras().getInt("curValue");
                         switch (intent.getExtras().getInt("ID")) {
                             case R.id.color /*2131230930*/:
-                                this.mLookupTable = new MediaInfo.Color();
-                                this.colorInfo.setText(getString(this.mLookupTable.getStringId(i3)));
-                                this.mLookupTable.destructor();
+                                mLookupTable = new MediaInfo.Color();
+                                this.colorInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                mLookupTable.destructor();
                                 this.color = i3;
                                 break;
                             case R.id.duplex /*2131231005*/:
-                                this.mLookupTable = new MediaInfo.Duplex();
-                                this.duplexInfo.setText(getString(this.mLookupTable.getStringId(i3)));
-                                this.mLookupTable.destructor();
+                                mLookupTable = new MediaInfo.Duplex();
+                                this.duplexInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                mLookupTable.destructor();
                                 this.duplex = i3;
                                 break;
                             case R.id.feed_direction /*2131231037*/:
-                                this.mLookupTable = new MediaInfo.FeedDirection();
-                                this.feedDirectionInfo.setText(getString(this.mLookupTable.getStringId(i3)));
-                                this.mLookupTable.destructor();
+                                mLookupTable = new MediaInfo.FeedDirection();
+                                this.feedDirectionInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                mLookupTable.destructor();
                                 this.feedDirection = i3;
                                 break;
                             case R.id.layout /*2131231158*/:
-                                this.mLookupTable = new MediaInfo.Layout();
-                                this.layoutInfo.setText(getString(this.mLookupTable.getStringId(i3)));
-                                this.mLookupTable.destructor();
+                                mLookupTable = new MediaInfo.Layout();
+                                this.layoutInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                mLookupTable.destructor();
                                 this.layout = i3;
                                 this.undoFlag = false;
-                                this.mHandler.sendEmptyMessage(32);
+                                mHandler.sendEmptyMessage(32);
                                 break;
                             case R.id.paper_size /*2131231306*/:
                                 this.sizeIndex = intent.getExtras().getInt("INDEX");
-                                this.mLookupTable = new MediaInfo.PaperSize();
-                                this.paperSizeInfo.setText(getString(this.mLookupTable.getStringId(i3)));
-                                this.mLookupTable.destructor();
+                                mLookupTable = new MediaInfo.PaperSize();
+                                this.paperSizeInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                mLookupTable.destructor();
                                 this.paperSize = i3;
-                                this.paperType = this.mPaperSizeType.getID(this.paperSize);
+                                this.paperType = mPaperSizeType.getID(this.paperSize);
                                 this.undoFlag = false;
-                                this.mHandler.sendEmptyMessage(2);
+                                mHandler.sendEmptyMessage(2);
                                 break;
                             case R.id.paper_source /*2131231311*/:
-                                this.mLookupTable = new MediaInfo.PaperSource();
-                                this.paperSourceInfo.setText(getString(this.mLookupTable.getStringId(i3)));
-                                this.mLookupTable.destructor();
+                                mLookupTable = new MediaInfo.PaperSource();
+                                this.paperSourceInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                mLookupTable.destructor();
                                 int[] iArr = this.paper_source_info;
                                 if (iArr != null && iArr.length > 1) {
                                     this.paperSource = i3;
                                 }
                                 this.undoFlag = false;
-                                this.mHandler.sendEmptyMessage(32);
+                                mHandler.sendEmptyMessage(32);
                                 break;
                             case R.id.paper_type /*2131231314*/:
                                 this.typeIndex = intent.getExtras().getInt("INDEX");
-                                this.mLookupTable = new MediaInfo.PaperType();
-                                this.paperTypeInfo.setText(getString(this.mLookupTable.getStringId(i3)));
-                                this.mLookupTable.destructor();
+                                mLookupTable = new MediaInfo.PaperType();
+                                this.paperTypeInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                mLookupTable.destructor();
                                 this.paperType = i3;
-                                this.mPaperSizeType.putID(this.paperSize, this.paperType);
+                                mPaperSizeType.putID(this.paperSize, this.paperType);
                                 this.undoFlag = false;
-                                this.mHandler.sendEmptyMessage(3);
+                                mHandler.sendEmptyMessage(3);
                                 break;
                             case R.id.printdate /*2131231355*/:
-                                this.mLookupTable = new MediaInfo.PrintDate();
-                                this.printDateInfo.setText(getString(this.mLookupTable.getStringId(i3)));
-                                this.mLookupTable.destructor();
+                                mLookupTable = new MediaInfo.PrintDate();
+                                this.printDateInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                mLookupTable.destructor();
                                 this.printdate = i3;
                                 break;
                             case R.id.quality /*2131231392*/:
-                                this.mLookupTable = new MediaInfo.Quality();
-                                this.qualityInfo.setText(getString(this.mLookupTable.getStringId(i3)));
-                                this.mLookupTable.destructor();
+                                mLookupTable = new MediaInfo.Quality();
+                                this.qualityInfo.setText(getString(mLookupTable.getStringId(i3)));
+                                mLookupTable.destructor();
                                 this.quality = i3;
                                 break;
                         }
@@ -2339,7 +2339,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     this.printAll = intent.getExtras().getBoolean("printAll");
                     this.startValue = intent.getExtras().getInt("startValue");
                     this.endValue = intent.getExtras().getInt("endValue");
-                    this.mHandler.sendEmptyMessage(64);
+                    mHandler.sendEmptyMessage(64);
                 }
             } else {
                 endInkReplAndGoProbePrinter();
@@ -2492,9 +2492,9 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     }
 
     private void endInkReplAndGoProbePrinter() {
-        this.mWaiteInkReplenProgress = false;
+        mWaiteInkReplenProgress = false;
         bindEpsonService();
-        this.mHandler.sendEmptyMessageDelayed(17, 100);
+        mHandler.sendEmptyMessageDelayed(17, 100);
     }
 
     private void updateSettingView() {
@@ -2531,7 +2531,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     private int getPrinterLang() {
         int i;
         IEpsonService iEpsonService;
-        if (!(this.printerLocation == 2 || (iEpsonService = this.mEpsonService) == null)) {
+        if (!(this.printerLocation == 2 || (iEpsonService = mEpsonService) == null)) {
             try {
                 i = iEpsonService.getLang();
             } catch (RemoteException e) {
@@ -2589,7 +2589,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
 
     public void onBackPressed() {
         super.onBackPressed();
-        IEpsonService iEpsonService = this.mEpsonService;
+        IEpsonService iEpsonService = mEpsonService;
         if (iEpsonService != null) {
             try {
                 iEpsonService.cancelSearchPrinter();
@@ -2598,7 +2598,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
             }
         }
         loadSupportedMediaFile();
-        EPPrinterManager ePPrinterManager = new EPPrinterManager(this.mContext);
+        EPPrinterManager ePPrinterManager = new EPPrinterManager(mContext);
         ePPrinterManager.rollbackRemotePrinterInfo();
         ePPrinterManager.rollbackIPPrinterInfo();
         new InkRplnRepository(false).deleteTemporaryData(this);
@@ -2638,9 +2638,9 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         if (this.printerId != null && this.printerLocation == 1 && this.isRetryAfterConnectSimpleAp) {
             this.undoFlag = false;
             if (loadSupportedMediaFile()) {
-                this.mHandler.sendEmptyMessage(1);
+                mHandler.sendEmptyMessage(1);
             } else {
-                this.mHandler.sendEmptyMessage(17);
+                mHandler.sendEmptyMessage(17);
             }
         }
     }

File diff suppressed because it is too large
+ 327 - 327
app/src/main/java/com/epson/cameracopy/p006ui/CropImageActivity.java


+ 8 - 8
app/src/main/java/com/epson/cameracopy/p006ui/CurrentFolderName.java

@@ -12,28 +12,28 @@ class CurrentFolderName {
     TextView mFolderSelectText = null;
 
     CurrentFolderName(LinearLayout linearLayout, TextView textView) {
-        this.mFolderSelectCurrent = linearLayout;
-        this.mFolderSelectText = textView;
+        mFolderSelectCurrent = linearLayout;
+        mFolderSelectText = textView;
     }
 
     public void SetText(String str) {
-        this.mFolderSelectText.setText(str);
+        mFolderSelectText.setText(str);
     }
 
     public void SetFile(File file) {
-        this.mFolderSelectFile = file;
-        this.mFolderSelectText.setText(this.mFolderSelectFile.getName());
+        mFolderSelectFile = file;
+        mFolderSelectText.setText(mFolderSelectFile.getName());
     }
 
     public void Show(boolean z) {
         if (z) {
-            this.mFolderSelectCurrent.setVisibility(0);
+            mFolderSelectCurrent.setVisibility(0);
         } else {
-            this.mFolderSelectCurrent.setVisibility(8);
+            mFolderSelectCurrent.setVisibility(8);
         }
     }
 
     public File GetFile() {
-        return this.mFolderSelectFile;
+        return mFolderSelectFile;
     }
 }

+ 126 - 126
app/src/main/java/com/epson/cameracopy/p006ui/DocumentSizeEditActivity.java

@@ -42,22 +42,22 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
         super.onCreate(bundle);
         setContentView((int) R.layout.activity_document_size_edit);
         setActionBar((int) R.string.document_size_edit_title, true);
-        this.mScale = (RadioGroup) findViewById(R.id.document_size_scale);
-        this.mScale.setOnCheckedChangeListener(this);
-        this.mWidthText = (TextView) findViewById(R.id.width);
-        this.mWidthDec = (Button) findViewById(R.id.width_dec_button);
-        this.mWidthDec.setOnClickListener(this);
-        this.mWidthInc = (Button) findViewById(R.id.width_inc_button);
-        this.mWidthInc.setOnClickListener(this);
-        this.mHeightText = (TextView) findViewById(R.id.height);
-        this.mHeightDec = (Button) findViewById(R.id.height_dec_button);
-        this.mHeightDec.setOnClickListener(this);
-        this.mHeightInc = (Button) findViewById(R.id.height_inc_button);
-        this.mHeightInc.setOnClickListener(this);
-        LongTapRepeatAdapter.bless(this.mWidthDec);
-        LongTapRepeatAdapter.bless(this.mWidthInc);
-        LongTapRepeatAdapter.bless(this.mHeightDec);
-        LongTapRepeatAdapter.bless(this.mHeightInc);
+        mScale = (RadioGroup) findViewById(R.id.document_size_scale);
+        mScale.setOnCheckedChangeListener(this);
+        mWidthText = (TextView) findViewById(R.id.width);
+        mWidthDec = (Button) findViewById(R.id.width_dec_button);
+        mWidthDec.setOnClickListener(this);
+        mWidthInc = (Button) findViewById(R.id.width_inc_button);
+        mWidthInc.setOnClickListener(this);
+        mHeightText = (TextView) findViewById(R.id.height);
+        mHeightDec = (Button) findViewById(R.id.height_dec_button);
+        mHeightDec.setOnClickListener(this);
+        mHeightInc = (Button) findViewById(R.id.height_inc_button);
+        mHeightInc.setOnClickListener(this);
+        LongTapRepeatAdapter.bless(mWidthDec);
+        LongTapRepeatAdapter.bless(mWidthInc);
+        LongTapRepeatAdapter.bless(mHeightDec);
+        LongTapRepeatAdapter.bless(mHeightInc);
         setDocumentSize();
     }
 
@@ -90,10 +90,10 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
     public void onCheckedChanged(RadioGroup radioGroup, int i) {
         if (i != -1) {
             if (i == R.id.inch_button) {
-                this.mInch = true;
+                mInch = true;
                 convertDocumentSize();
             } else if (i == R.id.mm_button) {
-                this.mInch = false;
+                mInch = false;
                 convertDocumentSize();
             }
         }
@@ -101,158 +101,158 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
     }
 
     private void setDocumentSize() {
-        this.mDocumentSizeInfo = (DocumentSizeInfo) getIntent().getParcelableExtra("DocumentSize");
-        this.mPosition = getIntent().getIntExtra("DocumentSizePos", -1);
-        ((EditText) findViewById(R.id.et_document_size)).setText(this.mDocumentSizeInfo.getDocSizeName(this));
-        this.mInch = this.mDocumentSizeInfo.getScaleId() == 2;
-        if (this.mInch) {
-            this.mScale.check(R.id.inch_button);
-            this.mWidth = this.mDocumentSizeInfo.getWidth();
-            double roundDownValue = getRoundDownValue(this.mWidth, 1);
-            TextView textView = this.mWidthText;
+        mDocumentSizeInfo = (DocumentSizeInfo) getIntent().getParcelableExtra("DocumentSize");
+        mPosition = getIntent().getIntExtra("DocumentSizePos", -1);
+        ((EditText) findViewById(R.id.et_document_size)).setText(mDocumentSizeInfo.getDocSizeName(this));
+        mInch = mDocumentSizeInfo.getScaleId() == 2;
+        if (mInch) {
+            mScale.check(R.id.inch_button);
+            mWidth = mDocumentSizeInfo.getWidth();
+            double roundDownValue = getRoundDownValue(mWidth, 1);
+            TextView textView = mWidthText;
             textView.setText(String.valueOf(roundDownValue) + " in");
-            this.mHeight = this.mDocumentSizeInfo.getHeight();
-            double roundDownValue2 = getRoundDownValue(this.mHeight, 1);
-            TextView textView2 = this.mHeightText;
+            mHeight = mDocumentSizeInfo.getHeight();
+            double roundDownValue2 = getRoundDownValue(mHeight, 1);
+            TextView textView2 = mHeightText;
             textView2.setText(String.valueOf(roundDownValue2) + " in");
             return;
         }
-        this.mScale.check(R.id.mm_button);
-        this.mWidth = this.mDocumentSizeInfo.getWidth();
-        TextView textView3 = this.mWidthText;
-        textView3.setText(String.valueOf((int) getRoundDownValue(this.mWidth, 0)) + " mm");
-        this.mHeight = this.mDocumentSizeInfo.getHeight();
-        TextView textView4 = this.mHeightText;
-        textView4.setText(String.valueOf((int) getRoundDownValue(this.mHeight, 0)) + " mm");
+        mScale.check(R.id.mm_button);
+        mWidth = mDocumentSizeInfo.getWidth();
+        TextView textView3 = mWidthText;
+        textView3.setText(String.valueOf((int) getRoundDownValue(mWidth, 0)) + " mm");
+        mHeight = mDocumentSizeInfo.getHeight();
+        TextView textView4 = mHeightText;
+        textView4.setText(String.valueOf((int) getRoundDownValue(mHeight, 0)) + " mm");
     }
 
     private void decWidth() {
-        if (this.mInch) {
-            this.mWidth = decDouble(this.mWidth, 0.1d);
-            if (this.mWidth < 0.1d) {
-                this.mWidth = 0.1d;
+        if (mInch) {
+            mWidth = decDouble(mWidth, 0.1d);
+            if (mWidth < 0.1d) {
+                mWidth = 0.1d;
             }
-            double roundDownValue = getRoundDownValue(this.mWidth, 1);
-            TextView textView = this.mWidthText;
+            double roundDownValue = getRoundDownValue(mWidth, 1);
+            TextView textView = mWidthText;
             textView.setText(String.valueOf(roundDownValue) + " in");
-            this.mWidth = roundDownValue;
+            mWidth = roundDownValue;
             return;
         }
-        this.mWidth = decDouble(this.mWidth, 1.0d);
-        if (this.mWidth < 1.0d) {
-            this.mWidth = 1.0d;
+        mWidth = decDouble(mWidth, 1.0d);
+        if (mWidth < 1.0d) {
+            mWidth = 1.0d;
         }
-        int roundDownValue2 = (int) getRoundDownValue(this.mWidth, 0);
-        TextView textView2 = this.mWidthText;
+        int roundDownValue2 = (int) getRoundDownValue(mWidth, 0);
+        TextView textView2 = mWidthText;
         textView2.setText(String.valueOf(roundDownValue2) + " mm");
-        this.mWidth = (double) roundDownValue2;
+        mWidth = (double) roundDownValue2;
     }
 
     private void incWidth() {
-        if (this.mInch) {
-            this.mWidth = incDouble(this.mWidth, 0.1d);
-            if (this.mWidth > 39.37d) {
-                this.mWidth = 39.37d;
+        if (mInch) {
+            mWidth = incDouble(mWidth, 0.1d);
+            if (mWidth > 39.37d) {
+                mWidth = 39.37d;
             }
-            double roundDownValue = getRoundDownValue(this.mWidth, 1);
-            TextView textView = this.mWidthText;
+            double roundDownValue = getRoundDownValue(mWidth, 1);
+            TextView textView = mWidthText;
             textView.setText(String.valueOf(roundDownValue) + " in");
-            this.mWidth = roundDownValue;
+            mWidth = roundDownValue;
             return;
         }
-        this.mWidth = incDouble(this.mWidth, 1.0d);
-        if (this.mWidth > 1000.0d) {
-            this.mWidth = 1000.0d;
+        mWidth = incDouble(mWidth, 1.0d);
+        if (mWidth > 1000.0d) {
+            mWidth = 1000.0d;
         }
-        int roundDownValue2 = (int) getRoundDownValue(this.mWidth, 0);
-        TextView textView2 = this.mWidthText;
+        int roundDownValue2 = (int) getRoundDownValue(mWidth, 0);
+        TextView textView2 = mWidthText;
         textView2.setText(String.valueOf(roundDownValue2) + " mm");
-        this.mWidth = (double) roundDownValue2;
+        mWidth = (double) roundDownValue2;
     }
 
     private void decHeight() {
-        if (this.mInch) {
-            this.mHeight = decDouble(this.mHeight, 0.1d);
-            if (this.mHeight < 0.1d) {
-                this.mHeight = 0.1d;
+        if (mInch) {
+            mHeight = decDouble(mHeight, 0.1d);
+            if (mHeight < 0.1d) {
+                mHeight = 0.1d;
             }
-            double roundDownValue = getRoundDownValue(this.mHeight, 1);
-            TextView textView = this.mHeightText;
+            double roundDownValue = getRoundDownValue(mHeight, 1);
+            TextView textView = mHeightText;
             textView.setText(String.valueOf(roundDownValue) + " in");
             return;
         }
-        this.mHeight = decDouble(this.mHeight, 1.0d);
-        if (this.mHeight < 1.0d) {
-            this.mHeight = 1.0d;
+        mHeight = decDouble(mHeight, 1.0d);
+        if (mHeight < 1.0d) {
+            mHeight = 1.0d;
         }
-        int roundDownValue2 = (int) getRoundDownValue(this.mHeight, 0);
-        TextView textView2 = this.mHeightText;
+        int roundDownValue2 = (int) getRoundDownValue(mHeight, 0);
+        TextView textView2 = mHeightText;
         textView2.setText(String.valueOf(roundDownValue2) + " mm");
-        this.mHeight = (double) roundDownValue2;
+        mHeight = (double) roundDownValue2;
     }
 
     private void incHeight() {
-        if (this.mInch) {
-            this.mHeight = incDouble(this.mHeight, 0.1d);
-            if (this.mHeight > 39.37d) {
-                this.mHeight = 39.37d;
+        if (mInch) {
+            mHeight = incDouble(mHeight, 0.1d);
+            if (mHeight > 39.37d) {
+                mHeight = 39.37d;
             }
-            double roundDownValue = getRoundDownValue(this.mHeight, 1);
-            TextView textView = this.mHeightText;
+            double roundDownValue = getRoundDownValue(mHeight, 1);
+            TextView textView = mHeightText;
             textView.setText(String.valueOf(roundDownValue) + " in");
-            this.mHeight = roundDownValue;
+            mHeight = roundDownValue;
             return;
         }
-        this.mHeight = incDouble(this.mHeight, 1.0d);
-        if (this.mHeight > 1000.0d) {
-            this.mHeight = 1000.0d;
+        mHeight = incDouble(mHeight, 1.0d);
+        if (mHeight > 1000.0d) {
+            mHeight = 1000.0d;
         }
-        int roundDownValue2 = (int) getRoundDownValue(this.mHeight, 0);
-        TextView textView2 = this.mHeightText;
+        int roundDownValue2 = (int) getRoundDownValue(mHeight, 0);
+        TextView textView2 = mHeightText;
         textView2.setText(String.valueOf(roundDownValue2) + " mm");
-        this.mHeight = (double) roundDownValue2;
+        mHeight = (double) roundDownValue2;
     }
 
     private void convertDocumentSize() {
-        if (this.mInch) {
-            this.mWidth /= 25.4d;
-            double d = this.mWidth;
+        if (mInch) {
+            mWidth /= 25.4d;
+            double d = mWidth;
             if (d < 0.1d) {
                 d = 0.1d;
             }
-            this.mWidth = d;
-            double roundDownValue = getRoundDownValue(this.mWidth, 1);
-            this.mWidthText.setText(String.valueOf(roundDownValue) + " in");
-            this.mWidth = roundDownValue;
-            this.mHeight = this.mHeight / 25.4d;
-            double d2 = this.mHeight;
+            mWidth = d;
+            double roundDownValue = getRoundDownValue(mWidth, 1);
+            mWidthText.setText(String.valueOf(roundDownValue) + " in");
+            mWidth = roundDownValue;
+            mHeight = mHeight / 25.4d;
+            double d2 = mHeight;
             if (d2 < 0.1d) {
                 d2 = 0.1d;
             }
-            this.mHeight = d2;
-            double roundDownValue2 = getRoundDownValue(this.mHeight, 1);
-            this.mHeightText.setText(String.valueOf(roundDownValue2) + " in");
-            this.mHeight = roundDownValue2;
+            mHeight = d2;
+            double roundDownValue2 = getRoundDownValue(mHeight, 1);
+            mHeightText.setText(String.valueOf(roundDownValue2) + " in");
+            mHeight = roundDownValue2;
             return;
         }
-        this.mWidth *= 25.4d;
-        double d3 = this.mWidth;
+        mWidth *= 25.4d;
+        double d3 = mWidth;
         if (d3 > 1000.0d) {
             d3 = 1000.0d;
         }
-        this.mWidth = d3;
-        int roundDownValue3 = (int) getRoundDownValue(this.mWidth, 0);
-        this.mWidthText.setText(String.valueOf(roundDownValue3) + " mm");
-        this.mWidth = (double) roundDownValue3;
-        this.mHeight = this.mHeight * 25.4d;
-        double d4 = this.mHeight;
+        mWidth = d3;
+        int roundDownValue3 = (int) getRoundDownValue(mWidth, 0);
+        mWidthText.setText(String.valueOf(roundDownValue3) + " mm");
+        mWidth = (double) roundDownValue3;
+        mHeight = mHeight * 25.4d;
+        double d4 = mHeight;
         if (d4 > 1000.0d) {
             d4 = 1000.0d;
         }
-        this.mHeight = d4;
-        int roundDownValue4 = (int) getRoundDownValue(this.mHeight, 0);
-        this.mHeightText.setText(String.valueOf(roundDownValue4) + " mm");
-        this.mHeight = (double) roundDownValue4;
+        mHeight = d4;
+        int roundDownValue4 = (int) getRoundDownValue(mHeight, 0);
+        mHeightText.setText(String.valueOf(roundDownValue4) + " mm");
+        mHeight = (double) roundDownValue4;
     }
 
     private double getRoundDownValue(double d, int i) {
@@ -265,22 +265,22 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
             SimpleMessageDialogFragment.newInstance(R.string.no_name_documentsize_message).show(getSupportFragmentManager(), "error-dialog");
             return;
         }
-        this.mDocumentSizeInfo.setDocSizeName(obj);
-        this.mDocumentSizeInfo.setScaleId(this.mInch ? 2 : 1);
-        this.mDocumentSizeInfo.setWidth(getRoundDownValue(this.mWidth, 1));
-        this.mDocumentSizeInfo.setHeight(getRoundDownValue(this.mHeight, 1));
+        mDocumentSizeInfo.setDocSizeName(obj);
+        mDocumentSizeInfo.setScaleId(mInch ? 2 : 1);
+        mDocumentSizeInfo.setWidth(getRoundDownValue(mWidth, 1));
+        mDocumentSizeInfo.setHeight(getRoundDownValue(mHeight, 1));
         RegistedDocumentSizeList instance = RegistedDocumentSizeList.getInstance(this);
-        if (instance.isExistDocumentSizeName(obj, this.mPosition)) {
+        if (instance.isExistDocumentSizeName(obj, mPosition)) {
             SimpleMessageDialogFragment.newInstance(R.string.exist_documentsize_message).show(getSupportFragmentManager(), "error-dialog");
             return;
         }
-        int i = this.mPosition;
+        int i = mPosition;
         if (i < 0) {
-            instance.add(this.mDocumentSizeInfo);
+            instance.add(mDocumentSizeInfo);
             finish();
             return;
         }
-        instance.update(this.mDocumentSizeInfo, i);
+        instance.update(mDocumentSizeInfo, i);
         finish();
     }
 
@@ -293,7 +293,7 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
-        if (this.mDocumentSizeInfo.getPaperId() == -2) {
+        if (mDocumentSizeInfo.getPaperId() == -2) {
             getMenuInflater().inflate(R.C2138menu.menu_done, menu);
         }
         return super.onCreateOptionsMenu(menu);
@@ -309,10 +309,10 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
 
     protected void deleteLongTapMessage() {
         MotionEvent obtain = MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis() + 10, 1, 0.0f, 0.0f, 0);
-        this.mWidthDec.dispatchTouchEvent(obtain);
-        this.mWidthInc.dispatchTouchEvent(obtain);
-        this.mHeightDec.dispatchTouchEvent(obtain);
-        this.mHeightInc.dispatchTouchEvent(obtain);
+        mWidthDec.dispatchTouchEvent(obtain);
+        mWidthInc.dispatchTouchEvent(obtain);
+        mHeightDec.dispatchTouchEvent(obtain);
+        mHeightInc.dispatchTouchEvent(obtain);
     }
 
     public void onConfigurationChanged(Configuration configuration) {

+ 33 - 33
app/src/main/java/com/epson/cameracopy/p006ui/DocumentSizeSettingActivity.java

@@ -40,30 +40,30 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
         super.onCreate(bundle);
         setContentView((int) R.layout.activity_document_size_setting);
         setActionBar((int) R.string.document_size_title, true);
-        this.mListView = (ListView) findViewById(R.id.docsize_list);
-        this.mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+        mListView = (ListView) findViewById(R.id.docsize_list);
+        mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
                 DocumentSizeSettingActivity documentSizeSettingActivity = DocumentSizeSettingActivity.this;
                 documentSizeSettingActivity.onSelectDocsizeList(documentSizeSettingActivity.mSelectListAdapter.getItem(i), view, i);
             }
         });
-        this.mSelectListAdapter = new SelectListAdapter();
-        this.mListView.setAdapter(this.mSelectListAdapter);
-        this.mSelect = (Button) findViewById(R.id.select_button);
-        this.mSelect.setOnClickListener(this);
-        this.mEdit = (Button) findViewById(R.id.edit_button);
-        this.mEdit.setOnClickListener(this);
-        this.mDelete = (Button) findViewById(R.id.delete_button);
-        this.mDelete.setOnClickListener(this);
-        this.mAdd = (Button) findViewById(R.id.add_button);
-        this.mAdd.setOnClickListener(this);
-        this.mClear = (Button) findViewById(R.id.clear_button);
-        this.mClear.setOnClickListener(this);
+        mSelectListAdapter = new SelectListAdapter();
+        mListView.setAdapter(mSelectListAdapter);
+        mSelect = (Button) findViewById(R.id.select_button);
+        mSelect.setOnClickListener(this);
+        mEdit = (Button) findViewById(R.id.edit_button);
+        mEdit.setOnClickListener(this);
+        mDelete = (Button) findViewById(R.id.delete_button);
+        mDelete.setOnClickListener(this);
+        mAdd = (Button) findViewById(R.id.add_button);
+        mAdd.setOnClickListener(this);
+        mClear = (Button) findViewById(R.id.clear_button);
+        mClear.setOnClickListener(this);
     }
 
     protected void onStart() {
         super.onStart();
-        this.mSelectListAdapter.reload();
+        mSelectListAdapter.reload();
     }
 
     public void onClick(View view) {
@@ -78,26 +78,26 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
                 deleteDocumentSize();
                 break;
             case R.id.edit_button /*2131231009*/:
-                editDocumentSize(this.mSelectPos);
+                editDocumentSize(mSelectPos);
                 break;
             case R.id.select_button /*2131231472*/:
-                selectDocumentSize(this.mSelectPos);
+                selectDocumentSize(mSelectPos);
                 break;
         }
         findViewById(R.id.document_size_menu).setVisibility(4);
     }
 
     public void onSelectDocsizeList(Object obj, View view, int i) {
-        this.mSelectPos = i;
+        mSelectPos = i;
         if (findViewById(R.id.document_size_menu).getVisibility() != 0) {
             DocumentSizeInfo documentSizeInfo = (DocumentSizeInfo) obj;
             ((TextView) findViewById(R.id.menu_text)).setText(documentSizeInfo.getDocSizeName(this));
             boolean z = true;
-            this.mEdit.setEnabled(documentSizeInfo.getPaperId() == -2);
+            mEdit.setEnabled(documentSizeInfo.getPaperId() == -2);
             if (documentSizeInfo.getPaperId() == -1) {
                 z = false;
             }
-            this.mDelete.setEnabled(z);
+            mDelete.setEnabled(z);
             findViewById(R.id.document_size_menu).setVisibility(0);
             return;
         }
@@ -129,13 +129,13 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
     }
 
     private void selectDocumentSize(int i) {
-        this.mSelectListAdapter.select(i);
+        mSelectListAdapter.select(i);
         finish();
     }
 
     private void editDocumentSize(int i) {
         Intent intent = new Intent(this, DocumentSizeEditActivity.class);
-        intent.putExtra("DocumentSize", (DocumentSizeInfo) this.mSelectListAdapter.getItem(i));
+        intent.putExtra("DocumentSize", (DocumentSizeInfo) mSelectListAdapter.getItem(i));
         intent.putExtra("DocumentSizePos", i);
         startActivity(intent);
     }
@@ -171,17 +171,17 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
         }
 
         public void reload() {
-            this.mRegistedDocumentSizeList = RegistedDocumentSizeList.getInstance(DocumentSizeSettingActivity.this);
+            mRegistedDocumentSizeList = RegistedDocumentSizeList.getInstance(DocumentSizeSettingActivity.this);
             notifyDataSetChanged();
         }
 
         public void select(int i) {
-            this.mRegistedDocumentSizeList.select(i);
+            mRegistedDocumentSizeList.select(i);
             notifyDataSetChanged();
         }
 
         public int getCount() {
-            RegistedDocumentSizeList registedDocumentSizeList = this.mRegistedDocumentSizeList;
+            RegistedDocumentSizeList registedDocumentSizeList = mRegistedDocumentSizeList;
             if (registedDocumentSizeList == null) {
                 return 0;
             }
@@ -189,7 +189,7 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
         }
 
         public Object getItem(int i) {
-            RegistedDocumentSizeList registedDocumentSizeList = this.mRegistedDocumentSizeList;
+            RegistedDocumentSizeList registedDocumentSizeList = mRegistedDocumentSizeList;
             if (registedDocumentSizeList == null) {
                 return null;
             }
@@ -200,14 +200,14 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
             if (view == null) {
                 view = DocumentSizeSettingActivity.this.getLayoutInflater().inflate(R.layout.select_list_row, viewGroup, false);
             }
-            RegistedDocumentSizeList registedDocumentSizeList = this.mRegistedDocumentSizeList;
+            RegistedDocumentSizeList registedDocumentSizeList = mRegistedDocumentSizeList;
             if (registedDocumentSizeList == null) {
                 return view;
             }
             DocumentSizeInfo item = registedDocumentSizeList.getItem(i);
             ((TextView) view.findViewById(R.id.docsize_name)).setText(item.getDocSizeName(DocumentSizeSettingActivity.this));
             ImageView imageView = (ImageView) view.findViewById(R.id.current_docsize_image);
-            if (this.mRegistedDocumentSizeList.isSelected(item)) {
+            if (mRegistedDocumentSizeList.isSelected(item)) {
                 imageView.setVisibility(0);
             } else {
                 imageView.setVisibility(4);
@@ -216,12 +216,12 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
         }
 
         public void delete(DocumentSizeInfo documentSizeInfo, int i) {
-            this.mRegistedDocumentSizeList.delete(documentSizeInfo, i);
+            mRegistedDocumentSizeList.delete(documentSizeInfo, i);
             notifyDataSetChanged();
         }
 
         public void reset() {
-            this.mRegistedDocumentSizeList.reset();
+            mRegistedDocumentSizeList.reset();
             notifyDataSetChanged();
         }
     }
@@ -252,10 +252,10 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
 
     public void doPositiveClick(int i) {
         if (i == this.ID_DIALOG_RESET) {
-            this.mSelectListAdapter.reset();
+            mSelectListAdapter.reset();
         } else if (i == this.ID_DIALOG_DELETE) {
-            this.mSelectListAdapter.delete((DocumentSizeInfo) this.mSelectListAdapter.getItem(this.mSelectPos), this.mSelectPos);
-            this.mSelectPos--;
+            mSelectListAdapter.delete((DocumentSizeInfo) mSelectListAdapter.getItem(mSelectPos), mSelectPos);
+            mSelectPos--;
         }
     }
 }

+ 36 - 36
app/src/main/java/com/epson/cameracopy/p006ui/FolderInformation.java

@@ -27,12 +27,12 @@ class FolderInformation {
     }
 
     private void init(String str, int i, ItemDataAdapter itemDataAdapter, ArrayList<ItemData> arrayList, CurrentFolderName currentFolderName, MenuControl menuControl) {
-        this.mCurrentFolder = new File(str);
-        this.mItemDataList = arrayList;
-        this.mItemDataAdapter = itemDataAdapter;
-        this.mLevel = i;
-        this.mCurrentFolderName = currentFolderName;
-        this.mMenuControl = menuControl;
+        mCurrentFolder = new File(str);
+        mItemDataList = arrayList;
+        mItemDataAdapter = itemDataAdapter;
+        mLevel = i;
+        mCurrentFolderName = currentFolderName;
+        mMenuControl = menuControl;
     }
 
     public void UpdateFolder() {
@@ -45,74 +45,74 @@ class FolderInformation {
         } else {
             UpdateFolder(i, DIRECTION_REVERS);
         }
-        this.mItemDataAdapter.notifyDataSetInvalidated();
-        return this.mLevel;
+        mItemDataAdapter.notifyDataSetInvalidated();
+        return mLevel;
     }
 
     public boolean IsFolder(int i) {
-        return i != 0 || this.mLevel == 0;
+        return i != 0 || mLevel == 0;
     }
 
     public void SetSelectedPosition(int i) {
-        this.mSelectedPosition = i;
+        mSelectedPosition = i;
     }
 
     public boolean IsFolder() {
-        return this.mSelectedPosition != 0 || this.mLevel == 0;
+        return mSelectedPosition != 0 || mLevel == 0;
     }
 
     public File GetCurrentFolder() {
-        return this.mCurrentFolder;
+        return mCurrentFolder;
     }
 
     private void UpdateFolder(int i, int i2) {
         if (i2 == DIRECTION_REVERS) {
-            this.mLevel--;
-            GetFolder(this.mFolderArray.get(i).getParentFile());
+            mLevel--;
+            GetFolder(mFolderArray.get(i).getParentFile());
         } else if (i2 == DIRECTION_FORWARD) {
-            this.mLevel++;
-            GetFolder(this.mFolderArray.get(i));
+            mLevel++;
+            GetFolder(mFolderArray.get(i));
         } else {
-            GetFolder(this.mCurrentFolder);
+            GetFolder(mCurrentFolder);
         }
     }
 
     private void GetFolder(File file) {
-        this.mItemDataList.clear();
-        this.mCurrentFolder = file;
-        this.mFolderArray = new ArrayList<>();
-        if (this.mLevel != 0) {
-            this.mItemDataList.add(new ItemData((String) null));
-            this.mFolderArray.add(this.mCurrentFolder);
+        mItemDataList.clear();
+        mCurrentFolder = file;
+        mFolderArray = new ArrayList<>();
+        if (mLevel != 0) {
+            mItemDataList.add(new ItemData((String) null));
+            mFolderArray.add(mCurrentFolder);
         }
-        this.mFileList = this.mCurrentFolder.listFiles(new DirectoryFileFilter());
-        Arrays.sort(this.mFileList, new FileNameSort());
-        if (this.mFileList != null) {
+        mFileList = mCurrentFolder.listFiles(new DirectoryFileFilter());
+        Arrays.sort(mFileList, new FileNameSort());
+        if (mFileList != null) {
             int i = 0;
             while (true) {
-                File[] fileArr = this.mFileList;
+                File[] fileArr = mFileList;
                 if (i >= fileArr.length) {
                     break;
                 }
-                this.mItemDataList.add(new ItemData(fileArr[i].getName()));
-                this.mFolderArray.add(this.mFileList[i]);
+                mItemDataList.add(new ItemData(fileArr[i].getName()));
+                mFolderArray.add(mFileList[i]);
                 i++;
             }
         }
-        CurrentFolderName currentFolderName = this.mCurrentFolderName;
+        CurrentFolderName currentFolderName = mCurrentFolderName;
         if (currentFolderName != null) {
-            currentFolderName.SetFile(this.mCurrentFolder);
-            if (this.mLevel != 0) {
-                this.mCurrentFolderName.Show(true);
+            currentFolderName.SetFile(mCurrentFolder);
+            if (mLevel != 0) {
+                mCurrentFolderName.Show(true);
             } else {
-                this.mCurrentFolderName.Show(false);
+                mCurrentFolderName.Show(false);
             }
         }
-        MenuControl menuControl = this.mMenuControl;
+        MenuControl menuControl = mMenuControl;
         if (menuControl == null) {
             return;
         }
-        if (this.mLevel != 0) {
+        if (mLevel != 0) {
             menuControl.ChangeMenu(1);
         } else {
             menuControl.ChangeMenu(0);

+ 20 - 20
app/src/main/java/com/epson/cameracopy/p006ui/FolderSelectActivity.java

@@ -37,7 +37,7 @@ public class FolderSelectActivity extends ActivityIACommon implements View.OnCli
     };
     AdapterView.OnItemClickListener listViewListener = new AdapterView.OnItemClickListener() {
         public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
-            FolderSelectActivity.this.mFolderInformation.UpdateFolder(i);
+            FolderSelectActivity.mFolderInformation.UpdateFolder(i);
             FolderSelectActivity.mHandler.sendEmptyMessage(FolderSelectActivity.MSG_UPDATE_LIST_VIEW);
         }
     };
@@ -63,13 +63,13 @@ public class FolderSelectActivity extends ActivityIACommon implements View.OnCli
         setActionBar((int) R.string.folder_selector_title, true);
         mActivity = new WeakReference<>(this);
         mFolderSelectActivity = (FolderSelectActivity) mActivity.get();
-        this.mFolderSelectBase = (LinearLayout) findViewById(R.id.folder_select_base);
-        this.mFolderSelectCurrent = (LinearLayout) findViewById(R.id.folder_select_current);
-        this.mFolderSelectText = (TextView) findViewById(R.id.folder_select_text);
-        this.mMenuControl = new MenuControl(this, 1);
-        this.mRootFolder = Environment.getExternalStorageDirectory().getAbsolutePath();
-        this.mItemDataList = new ArrayList<>();
-        this.mItemDataAdapter = new ItemDataAdapter(this, 0, this.mItemDataList);
+        mFolderSelectBase = (LinearLayout) findViewById(R.id.folder_select_base);
+        mFolderSelectCurrent = (LinearLayout) findViewById(R.id.folder_select_current);
+        mFolderSelectText = (TextView) findViewById(R.id.folder_select_text);
+        mMenuControl = new MenuControl(this, 1);
+        mRootFolder = Environment.getExternalStorageDirectory().getAbsolutePath();
+        mItemDataList = new ArrayList<>();
+        mItemDataAdapter = new ItemDataAdapter(this, 0, mItemDataList);
         updateListView();
         if (ActivityRequestPermissions.isRuntimePermissionSupported()) {
             String[] strArr = {"android.permission.WRITE_EXTERNAL_STORAGE"};
@@ -84,8 +84,8 @@ public class FolderSelectActivity extends ActivityIACommon implements View.OnCli
 
     private void initFolder() {
         try {
-            this.mFolderInformation = new FolderInformation(this.mRootFolder, 0, this.mItemDataAdapter, this.mItemDataList, new CurrentFolderName(this.mFolderSelectCurrent, this.mFolderSelectText), this.mMenuControl);
-            this.mFolderInformation.UpdateFolder();
+            mFolderInformation = new FolderInformation(mRootFolder, 0, mItemDataAdapter, mItemDataList, new CurrentFolderName(mFolderSelectCurrent, mFolderSelectText), mMenuControl);
+            mFolderInformation.UpdateFolder();
         } catch (NullPointerException unused) {
             setResult(1, (Intent) null);
             finish();
@@ -113,23 +113,23 @@ public class FolderSelectActivity extends ActivityIACommon implements View.OnCli
     private void updateListView() {
         int i = 0;
         while (true) {
-            if (i >= this.mFolderSelectBase.getChildCount()) {
+            if (i >= mFolderSelectBase.getChildCount()) {
                 break;
-            } else if (this.mFolderSelectBase.getChildAt(i).equals(this.mListView)) {
-                this.mFolderSelectBase.removeView(this.mListView);
+            } else if (mFolderSelectBase.getChildAt(i).equals(mListView)) {
+                mFolderSelectBase.removeView(mListView);
                 break;
             } else {
                 i++;
             }
         }
-        this.mListView = new ListView(this);
-        this.mListView.setAdapter(this.mItemDataAdapter);
-        this.mListView.setOnItemClickListener(this.listViewListener);
-        this.mFolderSelectBase.addView(this.mListView);
+        mListView = new ListView(this);
+        mListView.setAdapter(mItemDataAdapter);
+        mListView.setOnItemClickListener(this.listViewListener);
+        mFolderSelectBase.addView(mListView);
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
-        this.mMenuControl.CreateMenu(menu);
+        mMenuControl.CreateMenu(menu);
         return true;
     }
 
@@ -142,7 +142,7 @@ public class FolderSelectActivity extends ActivityIACommon implements View.OnCli
     }
 
     public void onActionbarMenuidOkClicked(View view) {
-        File GetCurrentFolder = this.mFolderInformation.GetCurrentFolder();
+        File GetCurrentFolder = mFolderInformation.GetCurrentFolder();
         Intent intent = new Intent();
         intent.putExtra("SELECT_Folder", GetCurrentFolder.getAbsolutePath());
         setResult(-1, intent);
@@ -152,7 +152,7 @@ public class FolderSelectActivity extends ActivityIACommon implements View.OnCli
     public void onCreateContextMenu(ContextMenu contextMenu, View view, ContextMenu.ContextMenuInfo contextMenuInfo) {
         super.onCreateContextMenu(contextMenu, view, contextMenuInfo);
         ListView listView = (ListView) view;
-        if (this.mFolderInformation.IsFolder()) {
+        if (mFolderInformation.IsFolder()) {
             contextMenu.add(0, 0, 0, "選択");
             contextMenu.add(0, 1, 0, "削除");
         }

File diff suppressed because it is too large
+ 328 - 328
app/src/main/java/com/epson/cameracopy/p006ui/ImageCollectView.java


+ 13 - 13
app/src/main/java/com/epson/cameracopy/p006ui/ImageFolderFile.java

@@ -26,7 +26,7 @@ class ImageFolderFile implements ImagePreviewFile, Serializable {
     }
 
     public ImageFolderFile(String str) {
-        this.mImageFolderFileName = str;
+        mImageFolderFileName = str;
     }
 
     public String getImageProcFileName(Context context) {
@@ -38,20 +38,20 @@ class ImageFolderFile implements ImagePreviewFile, Serializable {
                 return null;
             }
         }
-        this.mTemporaryFileName = newTemporaryJpegFile.toString();
-        return this.mTemporaryFileName;
+        mTemporaryFileName = newTemporaryJpegFile.toString();
+        return mTemporaryFileName;
     }
 
     public String getPrintFileName() {
-        String str = this.mConvertFilename;
-        return str != null ? str : this.mImageFolderFileName;
+        String str = mConvertFilename;
+        return str != null ? str : mImageFolderFileName;
     }
 
     public void deleteTemporaryFile() {
-        localDeleteFile(this.mTemporaryFileName);
-        this.mTemporaryFileName = null;
+        localDeleteFile(mTemporaryFileName);
+        mTemporaryFileName = null;
         localDeleteFile(getHeifToJpegFile(IprintApplication.getInstance()).getPath());
-        this.mConvertFilename = null;
+        mConvertFilename = null;
     }
 
     private void localDeleteFile(@Nullable String str) {
@@ -64,21 +64,21 @@ class ImageFolderFile implements ImagePreviewFile, Serializable {
     }
 
     private boolean prepareImage(@NonNull Context context) {
-        this.mConvertFilename = null;
+        mConvertFilename = null;
         deleteTemporaryFile();
-        if (!ImageUtil.isHEIFFormat(this.mImageFolderFileName)) {
+        if (!ImageUtil.isHEIFFormat(mImageFolderFileName)) {
             return true;
         }
         String path = getHeifToJpegFile(context).getPath();
-        if (!ImageUtil.convertHEIFtoJPEG(this.mImageFolderFileName, path)) {
+        if (!ImageUtil.convertHEIFtoJPEG(mImageFolderFileName, path)) {
             return false;
         }
-        this.mConvertFilename = path;
+        mConvertFilename = path;
         return true;
     }
 
     public boolean needsConvert(@NonNull Context context) {
-        return ImageUtil.isHEIFFormat(this.mImageFolderFileName);
+        return ImageUtil.isHEIFFormat(mImageFolderFileName);
     }
 
     @NonNull

+ 5 - 5
app/src/main/java/com/epson/cameracopy/p006ui/ImageFolderFileViewModel.java

@@ -13,15 +13,15 @@ public class ImageFolderFileViewModel extends AndroidViewModel {
 
     public ImageFolderFileViewModel(@NonNull Application application) {
         super(application);
-        this.mApplication = application;
+        mApplication = application;
     }
 
     public void setOriginalData(@NonNull ImageFolderFile imageFolderFile) {
-        this.mImageFolderFileLiveData.setImageFolderFile(imageFolderFile);
+        mImageFolderFileLiveData.setImageFolderFile(imageFolderFile);
     }
 
     public ImageFolderFileLiveData getData() {
-        return this.mImageFolderFileLiveData;
+        return mImageFolderFileLiveData;
     }
 
     /* renamed from: com.epson.cameracopy.ui.ImageFolderFileViewModel$ImageFolderFileLiveData */
@@ -32,7 +32,7 @@ public class ImageFolderFileViewModel extends AndroidViewModel {
         public void setImageFolderFile(@NonNull final ImageFolderFile imageFolderFile) {
             new AsyncTask<Void, Void, ImageFolderFile>() {
                 protected void onPostExecute(ImageFolderFile imageFolderFile) {
-                    ImageFolderFileViewModel.this.mImageFolderFileLiveData.setValue(imageFolderFile);
+                    ImageFolderFileViewModel.mImageFolderFileLiveData.setValue(imageFolderFile);
                 }
 
                 protected ImageFolderFile doInBackground(Void... voidArr) {
@@ -40,7 +40,7 @@ public class ImageFolderFileViewModel extends AndroidViewModel {
                     if (imageFolderFile == null) {
                         return null;
                     }
-                    imageFolderFile.prepareImage(ImageFolderFileViewModel.this.mApplication);
+                    imageFolderFile.prepareImage(ImageFolderFileViewModel.mApplication);
                     return imageFolderFile;
                 }
             }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);

+ 39 - 39
app/src/main/java/com/epson/cameracopy/p006ui/ImagePreviewActivity.java

@@ -75,8 +75,8 @@ public class ImagePreviewActivity extends ActivityIACommon {
             if (extras.containsKey(PARAM_PICTURE_FILENAME) && extras.containsKey(PARAM_CAMERA_FILE)) {
                 finish();
             } else if (cameraFile == null || new File(cameraFile.getValidFileName()).exists()) {
-                this.mFragment = PlaceholderFragment.getInstance(stringExtra, cameraFile);
-                getSupportFragmentManager().beginTransaction().add((int) R.id.container, (Fragment) this.mFragment).commit();
+                mFragment = PlaceholderFragment.getInstance(stringExtra, cameraFile);
+                getSupportFragmentManager().beginTransaction().add((int) R.id.container, (Fragment) mFragment).commit();
             } else {
                 finish();
             }
@@ -104,7 +104,7 @@ public class ImagePreviewActivity extends ActivityIACommon {
     }
 
     public void onBackPressed() {
-        PlaceholderFragment placeholderFragment = this.mFragment;
+        PlaceholderFragment placeholderFragment = mFragment;
         if (placeholderFragment == null || !placeholderFragment.checkProgress()) {
             backCameraPreviewActivity();
         }
@@ -160,21 +160,21 @@ public class ImagePreviewActivity extends ActivityIACommon {
         }
 
         public void setPreview() {
-            String printFileName = this.mImagePreviewFile.getPrintFileName();
+            String printFileName = mImagePreviewFile.getPrintFileName();
             if (printFileName != null) {
-                setPreview(this.mImageView, printFileName);
+                setPreview(mImageView, printFileName);
             }
         }
 
         public void restorePreview() {
-            ScalableImageView scalableImageView = this.mImageView;
-            if (scalableImageView != null && this.mImagePreviewFile != null && scalableImageView.getBitmap() == null) {
+            ScalableImageView scalableImageView = mImageView;
+            if (scalableImageView != null && mImagePreviewFile != null && scalableImageView.getBitmap() == null) {
                 setPreview();
             }
         }
 
         public void releasePreviewBitmap() {
-            ScalableImageView scalableImageView = this.mImageView;
+            ScalableImageView scalableImageView = mImageView;
             if (scalableImageView != null) {
                 scalableImageView.SetImageBitmap((Bitmap) null, (Resources) null);
             }
@@ -183,27 +183,27 @@ public class ImagePreviewActivity extends ActivityIACommon {
         public void onCreate(Bundle bundle) {
             super.onCreate(bundle);
             if (bundle != null) {
-                this.mImagePreviewFile = (ImagePreviewFile) bundle.getSerializable(KEY_PREVIEW_FILE);
+                mImagePreviewFile = (ImagePreviewFile) bundle.getSerializable(KEY_PREVIEW_FILE);
                 return;
             }
             Bundle arguments = getArguments();
             if (arguments != null) {
                 CameraFile cameraFile = (CameraFile) arguments.getSerializable("camera-file");
                 if (cameraFile != null) {
-                    this.mShowSetDisplaySizeMessageOnPrintPreview = false;
-                    this.mImagePreviewFile = new CameraFileAdapter(cameraFile);
+                    mShowSetDisplaySizeMessageOnPrintPreview = false;
+                    mImagePreviewFile = new CameraFileAdapter(cameraFile);
                     return;
                 }
-                this.mShowSetDisplaySizeMessageOnPrintPreview = true;
+                mShowSetDisplaySizeMessageOnPrintPreview = true;
             }
         }
 
         public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
             View inflate = layoutInflater.inflate(R.layout.fragment_image_preview_view, viewGroup, false);
-            this.mImageView = (ScalableImageView) inflate.findViewById(R.id.preview_view);
-            this.mProgressBar = (ProgressBar) inflate.findViewById(R.id.progressBar);
-            this.mSaveButton = (Button) inflate.findViewById(R.id.save_button);
-            this.mSaveButton.setOnClickListener(new View.OnClickListener() {
+            mImageView = (ScalableImageView) inflate.findViewById(R.id.preview_view);
+            mProgressBar = (ProgressBar) inflate.findViewById(R.id.progressBar);
+            mSaveButton = (Button) inflate.findViewById(R.id.save_button);
+            mSaveButton.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     if (!PlaceholderFragment.this.checkProgress()) {
                         if (ActivityRequestPermissions.isRuntimePermissionSupported()) {
@@ -235,12 +235,12 @@ public class ImagePreviewActivity extends ActivityIACommon {
                     }
                 }
             });
-            if (this.mImagePreviewFile != null) {
-                this.mProgressBar.setVisibility(8);
+            if (mImagePreviewFile != null) {
+                mProgressBar.setVisibility(8);
                 setPreview();
-                UiCommon.setButtonEnabled(this.mSaveButton, this.mImagePreviewFile.needSaveButton());
+                UiCommon.setButtonEnabled(mSaveButton, mImagePreviewFile.needSaveButton());
             } else {
-                this.mProgressBar.setVisibility(0);
+                mProgressBar.setVisibility(0);
                 observeImageConvertFromArgument();
             }
             return inflate;
@@ -282,13 +282,13 @@ public class ImagePreviewActivity extends ActivityIACommon {
         }
 
         private boolean checkProgress() {
-            return this.mProgressBar.getVisibility() == 0;
+            return mProgressBar.getVisibility() == 0;
         }
 
         private void localFolderFileViewModelPrepared(@Nullable ImageFolderFile imageFolderFile) {
-            this.mProgressBar.setVisibility(8);
-            this.mImagePreviewFile = imageFolderFile;
-            UiCommon.setButtonEnabled(this.mSaveButton, this.mImagePreviewFile.needSaveButton());
+            mProgressBar.setVisibility(8);
+            mImagePreviewFile = imageFolderFile;
+            UiCommon.setButtonEnabled(mSaveButton, mImagePreviewFile.needSaveButton());
             restorePreview();
         }
 
@@ -300,7 +300,7 @@ public class ImagePreviewActivity extends ActivityIACommon {
         public void onPause() {
             if (getActivity().isFinishing()) {
                 releasePreviewBitmap();
-                this.mImagePreviewFile.deleteTemporaryFile();
+                mImagePreviewFile.deleteTemporaryFile();
             }
             super.onPause();
         }
@@ -312,29 +312,29 @@ public class ImagePreviewActivity extends ActivityIACommon {
 
         public void onSaveInstanceState(Bundle bundle) {
             super.onSaveInstanceState(bundle);
-            bundle.putSerializable(KEY_PREVIEW_FILE, (Serializable) this.mImagePreviewFile);
+            bundle.putSerializable(KEY_PREVIEW_FILE, (Serializable) mImagePreviewFile);
         }
 
         public void saveImage() {
-            UiCommon.setButtonEnabled(this.mSaveButton, false);
-            if (!this.mImagePreviewFile.doSave(CameraPreviewControl.getInstance(getActivity()).getSaveDirecotry())) {
-                UiCommon.setButtonEnabled(this.mSaveButton, true);
+            UiCommon.setButtonEnabled(mSaveButton, false);
+            if (!mImagePreviewFile.doSave(CameraPreviewControl.getInstance(getActivity()).getSaveDirecotry())) {
+                UiCommon.setButtonEnabled(mSaveButton, true);
                 SimpleMessageDialogFragment.newInstance(R.string.file_save_error_message).show(getFragmentManager(), "error-dialog");
                 return;
             }
-            File file = new File(this.mImagePreviewFile.getPrintFileName());
+            File file = new File(mImagePreviewFile.getPrintFileName());
             ImageUtil.galleryAddPic(getActivity(), file);
             FileSaveDialogFragment.newInstance(1, file.getParentFile().getName()).show(getFragmentManager(), "ok-dialog");
         }
 
         public void startPrintPreviewActivity() {
-            String printFileName = this.mImagePreviewFile.getPrintFileName();
+            String printFileName = mImagePreviewFile.getPrintFileName();
             if (printFileName != null) {
                 Intent intent = new Intent(getActivity(), PrintPreviewActivity.class);
                 ArrayList arrayList = new ArrayList(1);
                 arrayList.add(printFileName);
                 intent.putExtra("imageList", arrayList);
-                if (this.mShowSetDisplaySizeMessageOnPrintPreview) {
+                if (mShowSetDisplaySizeMessageOnPrintPreview) {
                     intent.putExtra(PrintPreviewActivity.PARAM_DISPLAY_SIZE_SET_MESSAGE, true);
                 }
                 startActivity(intent);
@@ -342,7 +342,7 @@ public class ImagePreviewActivity extends ActivityIACommon {
         }
 
         public void startImageCollectActivity() {
-            String imageProcFileName = this.mImagePreviewFile.getImageProcFileName(getActivity());
+            String imageProcFileName = mImagePreviewFile.getImageProcFileName(getActivity());
             if (imageProcFileName != null) {
                 Intent intent = new Intent(getActivity(), CropImageActivity.class);
                 intent.putExtra(CropImageActivity.IMAGE_FILE_NAME, imageProcFileName);
@@ -355,11 +355,11 @@ public class ImagePreviewActivity extends ActivityIACommon {
             switch (i) {
                 case 1:
                     if (i2 == -1 && (stringExtra = intent.getStringExtra(CropImageActivity.RESULT_COLLECTED_FILE_NAME)) != null) {
-                        this.mImagePreviewFile.deleteTemporaryFile();
-                        this.mImagePreviewFile = new CameraFileAdapter(new CameraFile(new Date(), stringExtra));
+                        mImagePreviewFile.deleteTemporaryFile();
+                        mImagePreviewFile = new CameraFileAdapter(new CameraFile(new Date(), stringExtra));
                         setPreview();
-                        UiCommon.setButtonEnabled(this.mSaveButton, this.mImagePreviewFile.needSaveButton());
-                        this.mShowSetDisplaySizeMessageOnPrintPreview = false;
+                        UiCommon.setButtonEnabled(mSaveButton, mImagePreviewFile.needSaveButton());
+                        mShowSetDisplaySizeMessageOnPrintPreview = false;
                         startPrintPreviewActivity();
                         return;
                     }
@@ -407,12 +407,12 @@ public class ImagePreviewActivity extends ActivityIACommon {
             super.onCreate(bundle);
             Bundle arguments = getArguments();
             arguments.getInt("type");
-            this.mFileName = arguments.getString(PARAM_FILENAME);
+            mFileName = arguments.getString(PARAM_FILENAME);
         }
 
         public Dialog onCreateDialog(Bundle bundle) {
             super.onCreateDialog(bundle);
-            return new AlertDialog.Builder(getActivity()).setMessage(getResources().getString(R.string.image_save_message, new Object[]{this.mFileName})).setPositiveButton(R.string.ok_button, new DialogInterface.OnClickListener() {
+            return new AlertDialog.Builder(getActivity()).setMessage(getResources().getString(R.string.image_save_message, new Object[]{mFileName})).setPositiveButton(R.string.ok_button, new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
                 }
             }).create();

+ 3 - 3
app/src/main/java/com/epson/cameracopy/p006ui/ItemData.java

@@ -13,16 +13,16 @@ class ItemData {
 
     ItemData(String str) {
         if (str != null) {
-            this.mFileName = new String(str);
+            mFileName = new String(str);
         }
     }
 
     public void DrawItem(int i, View view, ViewGroup viewGroup) {
         ImageView imageView = (ImageView) view.findViewById(R.id.file_item_image);
         TextView textView = (TextView) view.findViewById(R.id.file_item_text);
-        if (this.mFileName != null) {
+        if (mFileName != null) {
             imageView.setImageResource(R.C2136drawable.folder);
-            textView.setText(this.mFileName);
+            textView.setText(mFileName);
             return;
         }
         imageView.setImageResource(R.C2136drawable.parent_folder);

+ 3 - 3
app/src/main/java/com/epson/cameracopy/p006ui/ItemDataAdapter.java

@@ -12,16 +12,16 @@ import java.util.List;
 /* compiled from: FolderSelectActivity */
 class ItemDataAdapter extends ArrayAdapter<ItemData> {
     private final Context mContext;
-    private final LayoutInflater mLayoutInflater = ((LayoutInflater) this.mContext.getSystemService("layout_inflater"));
+    private final LayoutInflater mLayoutInflater = ((LayoutInflater) mContext.getSystemService("layout_inflater"));
 
     public ItemDataAdapter(Context context, int i, List<ItemData> list) {
         super(context, i, list);
-        this.mContext = context;
+        mContext = context;
     }
 
     public View getView(int i, View view, ViewGroup viewGroup) {
         if (view == null) {
-            view = this.mLayoutInflater.inflate(R.layout.file_select_row, (ViewGroup) null);
+            view = mLayoutInflater.inflate(R.layout.file_select_row, (ViewGroup) null);
         }
         ItemData itemData = (ItemData) getItem(i);
         if (itemData != null) {

+ 8 - 8
app/src/main/java/com/epson/cameracopy/p006ui/MenuControl.java

@@ -17,21 +17,21 @@ class MenuControl {
     private int mMenuMode = -1;
 
     MenuControl(FolderSelectActivity folderSelectActivity, int i) {
-        this.mActivity = folderSelectActivity;
-        this.mMenuInflater = this.mActivity.getMenuInflater();
-        this.mMenuMode = i;
+        mActivity = folderSelectActivity;
+        mMenuInflater = mActivity.getMenuInflater();
+        mMenuMode = i;
     }
 
     public void CreateMenu(Menu menu) {
-        if (this.mMenuMode != 0) {
-            this.mMenuInflater.inflate(R.C2138menu.menu_ok, menu);
+        if (mMenuMode != 0) {
+            mMenuInflater.inflate(R.C2138menu.menu_ok, menu);
         }
     }
 
     public void ChangeMenu(int i) {
-        if (this.mMenuMode != i) {
-            this.mMenuMode = i;
-            this.mActivity.invalidateOptionsMenu();
+        if (mMenuMode != i) {
+            mMenuMode = i;
+            mActivity.invalidateOptionsMenu();
         }
     }
 }

+ 6 - 6
app/src/main/java/com/epson/cameracopy/p006ui/PictureResolutionDialogFragment.java

@@ -109,7 +109,7 @@ public class PictureResolutionDialogFragment extends DialogFragment {
 
     private int getListPoisition(int i, Point point, List<Point> list) {
         int indexOf;
-        if (i != 1 || point == null || (indexOf = this.mSizeList.indexOf(point)) < 0) {
+        if (i != 1 || point == null || (indexOf = mSizeList.indexOf(point)) < 0) {
             return 0;
         }
         return indexOf + 1;
@@ -131,7 +131,7 @@ public class PictureResolutionDialogFragment extends DialogFragment {
 
     private void selectListItem(int i) {
         OnItemSelectedListener onItemSelectedListener = (OnItemSelectedListener) getActivity();
-        List<Point> list = this.mSizeList;
+        List<Point> list = mSizeList;
         if (list == null) {
             onItemSelectedListener.onItemSelected(false, -1, (Point) null);
         } else if (i == 0) {
@@ -151,17 +151,17 @@ public class PictureResolutionDialogFragment extends DialogFragment {
 
         public MyAdapter(Context context, int i, CharSequence[] charSequenceArr, int i2) {
             super(context, i, charSequenceArr);
-            this.mLayoutInflater = (LayoutInflater) context.getSystemService("layout_inflater");
-            this.mSelectNumber = i2;
+            mLayoutInflater = (LayoutInflater) context.getSystemService("layout_inflater");
+            mSelectNumber = i2;
         }
 
         public View getView(int i, View view, ViewGroup viewGroup) {
             if (view == null) {
-                view = this.mLayoutInflater.inflate(R.layout.select_list_row, viewGroup, false);
+                view = mLayoutInflater.inflate(R.layout.select_list_row, viewGroup, false);
             }
             ((TextView) view.findViewById(R.id.docsize_name)).setText((CharSequence) getItem(i));
             ImageView imageView = (ImageView) view.findViewById(R.id.current_docsize_image);
-            if (i != this.mSelectNumber) {
+            if (i != mSelectNumber) {
                 imageView.setVisibility(4);
             } else {
                 imageView.setVisibility(0);

+ 86 - 86
app/src/main/java/com/epson/cameracopy/p006ui/PrintPreviewActivity.java

@@ -113,18 +113,18 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     private final ServiceConnection mEpsonConnection = new ServiceConnection() {
         public void onServiceDisconnected(ComponentName componentName) {
             try {
-                PrintPreviewActivity.this.mEpsonService.unregisterCallback(PrintPreviewActivity.this.mCallback);
+                PrintPreviewActivity.mEpsonService.unregisterCallback(PrintPreviewActivity.mCallback);
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
-            IEpsonService unused = PrintPreviewActivity.this.mEpsonService = null;
+            IEpsonService unused = PrintPreviewActivity.mEpsonService = null;
         }
 
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
-            IEpsonService unused = PrintPreviewActivity.this.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
-            if (PrintPreviewActivity.this.mEpsonService != null) {
+            IEpsonService unused = PrintPreviewActivity.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
+            if (PrintPreviewActivity.mEpsonService != null) {
                 try {
-                    PrintPreviewActivity.this.mEpsonService.registerCallback(PrintPreviewActivity.this.mCallback);
+                    PrintPreviewActivity.mEpsonService.registerCallback(PrintPreviewActivity.mCallback);
                 } catch (RemoteException e) {
                     e.printStackTrace();
                 }
@@ -157,7 +157,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                     default:
                         switch (i) {
                             case 7:
-                                if (PrintPreviewActivity.this.mImageList.size() <= 0) {
+                                if (PrintPreviewActivity.mImageList.size() <= 0) {
                                     PrintPreviewActivity.this.disablePrintButton();
                                 }
                                 PrintPreviewActivity printPreviewActivity = PrintPreviewActivity.this;
@@ -196,14 +196,14 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView((int) R.layout.activity_camera_print_preview);
-        this.mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
-        this.mModelDialog.getDialogJob().observe(this, new Observer() {
+        mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
+        mModelDialog.getDialogJob().observe(this, new Observer() {
             public final void onChanged(Object obj) {
                 PrintPreviewActivity.lambda$onCreate$0(PrintPreviewActivity.this, (Deque) obj);
             }
         });
-        this.mReviewInvitationViewModel = (ReviewInvitationViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(ReviewInvitationViewModel.class);
-        this.mReviewInvitationViewModel.getShowInvitationLiveData().observe(this, new Observer<Boolean>() {
+        mReviewInvitationViewModel = (ReviewInvitationViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(ReviewInvitationViewModel.class);
+        mReviewInvitationViewModel.getShowInvitationLiveData().observe(this, new Observer<Boolean>() {
             public void onChanged(@Nullable Boolean bool) {
                 if (bool.booleanValue()) {
                     PrintPreviewActivity.this.showStoreDialog();
@@ -213,22 +213,22 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         setActionBar((int) R.string.print_title, true);
         ExternalFileUtils.getInstance(this).initPrintDir();
         getImageListFromIntent();
-        EPImageList ePImageList = this.mImageList;
+        EPImageList ePImageList = mImageList;
         if (ePImageList == null || ePImageList.size() != 1) {
             finish();
             return;
         }
-        this.mPreviewView = (PreviewView) findViewById(R.id.previewImageView);
+        mPreviewView = (PreviewView) findViewById(R.id.previewImageView);
         this.papersizeTextView = (TextView) findViewById(R.id.paper_size_text);
         this.papersizeTextView.setOnClickListener(this);
-        this.mPrintTargetSizeText = (TextView) findViewById(R.id.printtarget_size_text);
-        this.mPrintTargetSizeText.setOnClickListener(this);
-        this.mScaleText = (TextView) findViewById(R.id.scale_text);
-        this.mScaleText.setOnClickListener(this);
+        mPrintTargetSizeText = (TextView) findViewById(R.id.printtarget_size_text);
+        mPrintTargetSizeText.setOnClickListener(this);
+        mScaleText = (TextView) findViewById(R.id.scale_text);
+        mScaleText.setOnClickListener(this);
         this.paperMissmath = (ImageView) findViewById(R.id.icon_papermissmatch);
         this.paperMissmath.setOnClickListener(this);
-        this.mOriginalImageSizeButton = (Button) findViewById(R.id.paper_size_button);
-        this.mOriginalImageSizeButton.setOnClickListener(new View.OnClickListener() {
+        mOriginalImageSizeButton = (Button) findViewById(R.id.paper_size_button);
+        mOriginalImageSizeButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 PrintPreviewActivity.this.startOrgImageSizeActivity();
             }
@@ -237,17 +237,17 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         this.rotateButton.setOnClickListener(this);
         this.printButton = (Button) findViewById(R.id.print_button);
         this.printButton.setOnClickListener(this);
-        this.mPreviewView.setImage(this.mImageList.get(0).loadImageFileName);
+        mPreviewView.setImage(mImageList.get(0).loadImageFileName);
         loadPrinterSettingAndChangeView(true);
         updateManuscriptScaleText(1.0d);
-        this.mPreviewView.setPrttargetScaleChangeListener(this);
+        mPreviewView.setPrttargetScaleChangeListener(this);
         this.enableShowWarning = getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).getBoolean(Constants.ENABLE_SHOW_WARNING, true);
         this.paperSourceInfo = PaperSourceInfo.getInstance(this);
-        if (this.mEpsonService == null) {
-            bindService(new Intent(this, EpsonService.class), this.mEpsonConnection, 1);
+        if (mEpsonService == null) {
+            bindService(new Intent(this, EpsonService.class), mEpsonConnection, 1);
         }
         if (bundle == null) {
-            this.mHandler.sendEmptyMessageDelayed(3, 300);
+            mHandler.sendEmptyMessageDelayed(3, 300);
             checkSizeSetMessage();
         }
     }
@@ -284,7 +284,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     }
 
     private void getImageListFromIntent() {
-        this.mImageList.clear();
+        mImageList.clear();
         Intent intent = getIntent();
         if (intent == null) {
             finish();
@@ -296,11 +296,11 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             return;
         }
         for (int i = 0; i < stringArrayListExtra.size(); i++) {
-            this.mImageList.add(stringArrayListExtra.get(i));
+            mImageList.add(stringArrayListExtra.get(i));
         }
-        for (int i2 = 0; i2 < this.mImageList.size(); i2++) {
-            if (!checkEPImage(this.mImageList.get(i2))) {
-                this.mImageList.clear();
+        for (int i2 = 0; i2 < mImageList.size(); i2++) {
+            if (!checkEPImage(mImageList.get(i2))) {
+                mImageList.clear();
                 finish();
                 return;
             }
@@ -318,21 +318,21 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     }
 
     private boolean updateManuscriptSize() {
-        ManuscriptSize manuscriptSize = this.mManuscriptSize;
-        this.mManuscriptSize = ManuscriptSize.load(this, this.mImageList.get(0).loadImageFileName);
-        boolean z = manuscriptSize == null || !manuscriptSize.equals(this.mManuscriptSize);
-        if (this.mManuscriptSize.displayLength()) {
-            PointF documentSize = this.mManuscriptSize.getDocumentSize(this);
-            this.mPrintTargetSizeText.setText(String.format(Locale.US, this.mManuscriptSize.getUnitType(this) == 2 ? "%s: %s (%.1f x %.1f %s)" : "%s: %s (%.0f x %.0f %s)", new Object[]{getString(R.string.document_size), this.mManuscriptSize.getSizeName(this), Float.valueOf(documentSize.x), Float.valueOf(documentSize.y), this.mManuscriptSize.getUnitStr(this)}));
+        ManuscriptSize manuscriptSize = mManuscriptSize;
+        mManuscriptSize = ManuscriptSize.load(this, mImageList.get(0).loadImageFileName);
+        boolean z = manuscriptSize == null || !manuscriptSize.equals(mManuscriptSize);
+        if (mManuscriptSize.displayLength()) {
+            PointF documentSize = mManuscriptSize.getDocumentSize(this);
+            mPrintTargetSizeText.setText(String.format(Locale.US, mManuscriptSize.getUnitType(this) == 2 ? "%s: %s (%.1f x %.1f %s)" : "%s: %s (%.0f x %.0f %s)", new Object[]{getString(R.string.document_size), mManuscriptSize.getSizeName(this), Float.valueOf(documentSize.x), Float.valueOf(documentSize.y), mManuscriptSize.getUnitStr(this)}));
         } else {
-            this.mPrintTargetSizeText.setText(String.format(Locale.US, "%s: %s", new Object[]{getString(R.string.document_size), this.mManuscriptSize.getSizeName(this)}));
+            mPrintTargetSizeText.setText(String.format(Locale.US, "%s: %s", new Object[]{getString(R.string.document_size), mManuscriptSize.getSizeName(this)}));
         }
         return z;
     }
 
     private void updateManuscriptScaleText(double d) {
-        PointF physicalSize = this.mManuscriptSize.getPhysicalSize(this);
-        this.mScaleText.setText(String.format(Locale.US, this.mManuscriptSize.getUnitType(this) == 2 ? "%s: %.0f%% (%.1f x %.1f %s)" : "%s: %.0f%% (%.0f x %.0f %s)", new Object[]{getString(R.string.magnification), Double.valueOf(100.0d * d), Double.valueOf(((double) physicalSize.x) * d), Double.valueOf(((double) physicalSize.y) * d), this.mManuscriptSize.getUnitStr(this)}));
+        PointF physicalSize = mManuscriptSize.getPhysicalSize(this);
+        mScaleText.setText(String.format(Locale.US, mManuscriptSize.getUnitType(this) == 2 ? "%s: %.0f%% (%.1f x %.1f %s)" : "%s: %.0f%% (%.0f x %.0f %s)", new Object[]{getString(R.string.magnification), Double.valueOf(100.0d * d), Double.valueOf(((double) physicalSize.x) * d), Double.valueOf(((double) physicalSize.y) * d), mManuscriptSize.getUnitStr(this)}));
     }
 
     private void loadPrinterSettingAndChangeView(boolean z) {
@@ -348,8 +348,8 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             printSetting.loadSettings();
             this.printerId = sharedPreferences.getString(Constants.PRINTER_ID, (String) null);
             boolean z5 = true;
-            if (z || this.mIsRemotePrinter != isRemotePrinter) {
-                this.mIsRemotePrinter = isRemotePrinter;
+            if (z || mIsRemotePrinter != isRemotePrinter) {
+                mIsRemotePrinter = isRemotePrinter;
                 z3 = true;
                 z2 = true;
             } else {
@@ -363,7 +363,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             }
             if (z || this.currentPaperSize != printSetting.paperSizeValue) {
                 this.currentPaperSize = printSetting.paperSizeValue;
-                PreviewView previewView2 = this.mPreviewView;
+                PreviewView previewView2 = mPreviewView;
                 if (previewView2 != null) {
                     previewView2.setPaperSize(this.currentPaperSize);
                 }
@@ -372,18 +372,18 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             }
             if (z || this.currentLayout != printSetting.layoutValue) {
                 this.currentLayout = printSetting.layoutValue;
-                if (this.mPreviewView != null) {
+                if (mPreviewView != null) {
                     if (this.currentLayout == 1) {
                         z4 = true;
                     }
-                    this.mPreviewView.setBorderless(z4);
+                    mPreviewView.setBorderless(z4);
                 }
                 z3 = true;
                 z2 = true;
             }
             if (z || this.currentColor != printSetting.colorValue) {
                 this.currentColor = printSetting.colorValue;
-                PreviewView previewView3 = this.mPreviewView;
+                PreviewView previewView3 = mPreviewView;
                 if (previewView3 != null) {
                     previewView3.setColor(this.currentColor);
                 }
@@ -392,18 +392,18 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             }
             if (z3) {
                 updateManuscriptSize();
-                PreviewView previewView4 = this.mPreviewView;
+                PreviewView previewView4 = mPreviewView;
                 if (previewView4 != null) {
                     previewView4.printPostionResetRequest();
-                    this.mPreviewView.setPrintTargetSize(this.mManuscriptSize.getPixelWidth(), this.mManuscriptSize.getPixelHeight());
-                    this.mPreviewView.update();
+                    mPreviewView.setPrintTargetSize(mManuscriptSize.getPixelWidth(), mManuscriptSize.getPixelHeight());
+                    mPreviewView.update();
                 }
                 updateParaSizeText();
-            } else if (z5 && (previewView = this.mPreviewView) != null) {
+            } else if (z5 && (previewView = mPreviewView) != null) {
                 previewView.update();
             }
-        } else if (this.mIsRemotePrinter != isRemotePrinter) {
-            this.mIsRemotePrinter = isRemotePrinter;
+        } else if (mIsRemotePrinter != isRemotePrinter) {
+            mIsRemotePrinter = isRemotePrinter;
         }
     }
 
@@ -457,7 +457,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             case 1:
                 enablePrintButton();
                 ExternalFileUtils.getInstance(this).initPrintDir();
-                this.mReviewInvitationViewModel.onPrintEnd(CameraPrintProgress.isPrintSuccess(i2));
+                mReviewInvitationViewModel.onPrintEnd(CameraPrintProgress.isPrintSuccess(i2));
                 return;
             case 2:
                 if (i2 == 3) {
@@ -474,8 +474,8 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                 return;
             case 3:
                 if (updateManuscriptSize()) {
-                    this.mPreviewView.setPrintTargetSize(this.mManuscriptSize.getPixelWidth(), this.mManuscriptSize.getPixelHeight());
-                    this.mPreviewView.update();
+                    mPreviewView.setPrintTargetSize(mManuscriptSize.getPixelWidth(), mManuscriptSize.getPixelHeight());
+                    mPreviewView.update();
                     return;
                 }
                 return;
@@ -495,7 +495,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
 
     protected void onRestart() {
         super.onRestart();
-        PreviewView previewView = this.mPreviewView;
+        PreviewView previewView = mPreviewView;
         if (previewView != null) {
             previewView.restoreBitmap();
         }
@@ -505,7 +505,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         super.onResume();
         NfcTagUtils.enableForegroundDispatch(this, (IntentFilter[]) null, (String[][]) null);
         this.paperMissmath.setVisibility(4);
-        this.paperSourceInfo.start(this, this.mHandler);
+        this.paperSourceInfo.start(this, mHandler);
     }
 
     protected void onNewIntent(Intent intent) {
@@ -525,12 +525,12 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     protected void onDestroy() {
         EPLog.m316v("ActivityImageViewSelect", "onDestroy");
         super.onDestroy();
-        IEpsonService iEpsonService = this.mEpsonService;
+        IEpsonService iEpsonService = mEpsonService;
         if (iEpsonService != null) {
             try {
                 iEpsonService.cancelSearchPrinter();
-                this.mEpsonService.unregisterCallback(this.mCallback);
-                unbindService(this.mEpsonConnection);
+                mEpsonService.unregisterCallback(mCallback);
+                unbindService(mEpsonConnection);
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
@@ -546,14 +546,14 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                 allReloadTask.cancel(false);
             }
             dismissProgressDialog();
-            this.mHandler.removeMessages(3);
-            this.mHandler.removeMessages(5);
-            this.mHandler.removeMessages(0);
-            this.mHandler.removeMessages(1);
-            this.mHandler.removeMessages(100);
-            this.mHandler.removeMessages(8);
-            this.mPreviewView.setPrttargetScaleChangeListener((PreviewView.PrttargetScaleChangeListener) null);
-            this.mPreviewView = null;
+            mHandler.removeMessages(3);
+            mHandler.removeMessages(5);
+            mHandler.removeMessages(0);
+            mHandler.removeMessages(1);
+            mHandler.removeMessages(100);
+            mHandler.removeMessages(8);
+            mPreviewView.setPrttargetScaleChangeListener((PreviewView.PrttargetScaleChangeListener) null);
+            mPreviewView = null;
         }
         NfcTagUtils.disableForegroundDispatch(this);
         this.paperSourceInfo.stop();
@@ -567,7 +567,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     }
 
     private void check3GAndStartPrint() {
-        this.mHandler.sendEmptyMessage(5);
+        mHandler.sendEmptyMessage(5);
     }
 
     private void startLoadtask() {
@@ -576,17 +576,17 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     }
 
     private void showProgressDialog() {
-        this.mModelDialog.doShow(DIALOG_PROGRESS);
+        mModelDialog.doShow(DIALOG_PROGRESS);
     }
 
     private void dismissProgressDialog() {
-        this.mModelDialog.doDismiss(DIALOG_PROGRESS);
+        mModelDialog.doDismiss(DIALOG_PROGRESS);
     }
 
     private void startPrint() {
         ExternalFileUtils.getInstance(this).initPrintDir();
-        ImageAndLayout imageAndLayout = this.mPreviewView.getImageAndLayout();
-        imageAndLayout.setOrgFileName(this.mImageList.get(0).loadImageFileName);
+        ImageAndLayout imageAndLayout = mPreviewView.getImageAndLayout();
+        imageAndLayout.setOrgFileName(mImageList.get(0).loadImageFileName);
         ArrayList arrayList = new ArrayList();
         arrayList.add(imageAndLayout);
         Intent intent = new Intent(this, CameraPrintProgress.class);
@@ -598,8 +598,8 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         this.aPaperSourceSetting = message.getData().getParcelableArrayList(PaperSourceInfo.KEY_PAPERSOURCEINFO);
         if (this.aPaperSourceSetting != null) {
             this.papersizeTextView.setTextColor(getResources().getColor(R.color.epson_blue));
-            this.mPrintTargetSizeText.setTextColor(getResources().getColor(R.color.epson_blue));
-            this.mScaleText.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, this.aPaperSourceSetting)) {
@@ -614,8 +614,8 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
 
     private void setPaperSizeDisplayForNoPapaerInfoPrinter() {
         this.papersizeTextView.setTextColor(getResources().getColor(R.color.all_black));
-        this.mPrintTargetSizeText.setTextColor(getResources().getColor(R.color.all_black));
-        this.mScaleText.setTextColor(getResources().getColor(R.color.all_black));
+        mPrintTargetSizeText.setTextColor(getResources().getColor(R.color.all_black));
+        mScaleText.setTextColor(getResources().getColor(R.color.all_black));
         this.paperMissmath.setVisibility(4);
     }
 
@@ -652,8 +652,8 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                 callPrintSetting();
                 return;
             case R.id.print_button /*2131231336*/:
-                this.mIsRemotePrinter = isRemotePrinter();
-                if (this.mIsRemotePrinter && this.enableShowWarning) {
+                mIsRemotePrinter = isRemotePrinter();
+                if (mIsRemotePrinter && this.enableShowWarning) {
                     AlertDialog.Builder cancelable = new AlertDialog.Builder(this).setCancelable(false);
                     cancelable.setMessage(getString(R.string.epsonconnect_str_remote_print_warning) + "\n\n" + getString(R.string.epsonconnect_str_remote_print_warning2)).setPositiveButton(getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
@@ -675,8 +675,8 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                     return;
                 }
             case R.id.rotate_button /*2131231420*/:
-                this.mPreviewView.rotateImageR90();
-                this.mPreviewView.update();
+                mPreviewView.rotateImageR90();
+                mPreviewView.update();
                 return;
             default:
                 return;
@@ -727,20 +727,20 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
 
     protected void onRestoreInstanceState(Bundle bundle) {
         super.onRestoreInstanceState(bundle);
-        this.mPreviewView.restoreInstanceState(bundle, KEY_PREVIEW_VIEW);
+        mPreviewView.restoreInstanceState(bundle, KEY_PREVIEW_VIEW);
     }
 
     protected void onSaveInstanceState(Bundle bundle) {
-        this.mPreviewView.saveInstanceState(bundle, KEY_PREVIEW_VIEW);
+        mPreviewView.saveInstanceState(bundle, KEY_PREVIEW_VIEW);
         super.onSaveInstanceState(bundle);
     }
 
     public void onPrttargetScaleChange(double d) {
-        this.mHandler.sendMessage(this.mHandler.obtainMessage(8, Double.valueOf(d)));
+        mHandler.sendMessage(mHandler.obtainMessage(8, Double.valueOf(d)));
     }
 
     public void invitationDialogClicked(boolean z) {
-        this.mReviewInvitationViewModel.setStartStoreEnd();
+        mReviewInvitationViewModel.setStartStoreEnd();
     }
 
     /* renamed from: com.epson.cameracopy.ui.PrintPreviewActivity$AllReloadTask */
@@ -757,7 +757,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             int i = 0;
             do {
                 try {
-                    if (PrintPreviewActivity.this.mEpsonService != null) {
+                    if (PrintPreviewActivity.mEpsonService != null) {
                         break;
                     } else if (isCancelled()) {
                         return false;
@@ -774,11 +774,11 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             if (isCancelled()) {
                 return false;
             }
-            if (PrintPreviewActivity.this.mEpsonService != null) {
+            if (PrintPreviewActivity.mEpsonService != null) {
                 if (PrintPreviewActivity.this.isRemotePrinter()) {
-                    PrintPreviewActivity.this.mEpsonService.EpsonConnectUpdatePrinterSettings(PrintSetting.Kind.cameracopy.name());
+                    PrintPreviewActivity.mEpsonService.EpsonConnectUpdatePrinterSettings(PrintSetting.Kind.cameracopy.name());
                 } else {
-                    PrintPreviewActivity.this.mEpsonService.updatePrinterSettings(PrintSetting.Kind.cameracopy.name());
+                    PrintPreviewActivity.mEpsonService.updatePrinterSettings(PrintSetting.Kind.cameracopy.name());
                 }
             }
             return true;

+ 2 - 2
app/src/main/java/com/epson/cameracopy/p006ui/SimpleMessageDialogFragment.java

@@ -22,12 +22,12 @@ public class SimpleMessageDialogFragment extends DialogFragment {
 
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        this.mResourceId = getArguments().getInt(PARAM_MESSAGE_RESOURCE_ID);
+        mResourceId = getArguments().getInt(PARAM_MESSAGE_RESOURCE_ID);
     }
 
     public Dialog onCreateDialog(Bundle bundle) {
         super.onCreateDialog(bundle);
-        AlertDialog create = new AlertDialog.Builder(getActivity()).setMessage(getResources().getString(this.mResourceId)).setPositiveButton(R.string.ok_button, new DialogInterface.OnClickListener() {
+        AlertDialog create = new AlertDialog.Builder(getActivity()).setMessage(getResources().getString(mResourceId)).setPositiveButton(R.string.ok_button, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
             }
         }).create();

+ 11 - 11
app/src/main/java/com/epson/cameracopy/printlayout/CustomManuscriptSize.java

@@ -17,30 +17,30 @@ class CustomManuscriptSize implements ManuscriptSize.ManuscriptTypeAdapter {
     }
 
     public CustomManuscriptSize(DocumentSizeInfo documentSizeInfo) {
-        this.mDocumentSizeInfo = documentSizeInfo;
-        this.mWidth = documentSizeInfo.getWidth();
-        this.mHeight = documentSizeInfo.getHeight();
-        this.mScale = documentSizeInfo.getScaleId();
+        mDocumentSizeInfo = documentSizeInfo;
+        mWidth = documentSizeInfo.getWidth();
+        mHeight = documentSizeInfo.getHeight();
+        mScale = documentSizeInfo.getScaleId();
     }
 
     public Point getBasePixelSize(int i) {
-        return new Point(lengthToPixel(this.mWidth, i), lengthToPixel(this.mHeight, i));
+        return new Point(lengthToPixel(mWidth, i), lengthToPixel(mHeight, i));
     }
 
     public String getSizeName(Context context) {
-        return this.mDocumentSizeInfo.getDocSizeName(context);
+        return mDocumentSizeInfo.getDocSizeName(context);
     }
 
     public int getUnitType(Context context) {
-        return this.mDocumentSizeInfo.getScaleId() == 2 ? 2 : 1;
+        return mDocumentSizeInfo.getScaleId() == 2 ? 2 : 1;
     }
 
     public PointF getCustomDocumentSize(Context context) {
-        return new PointF((float) this.mWidth, (float) this.mHeight);
+        return new PointF((float) mWidth, (float) mHeight);
     }
 
     protected int lengthToPixel(double d, int i) {
-        switch (this.mDocumentSizeInfo.getScaleId()) {
+        switch (mDocumentSizeInfo.getScaleId()) {
             case 1:
                 return (int) (((d * ((double) i)) / 25.4d) + 0.5d);
             case 2:
@@ -58,7 +58,7 @@ class CustomManuscriptSize implements ManuscriptSize.ManuscriptTypeAdapter {
             return false;
         }
         CustomManuscriptSize customManuscriptSize = (CustomManuscriptSize) obj;
-        DocumentSizeInfo documentSizeInfo = this.mDocumentSizeInfo;
+        DocumentSizeInfo documentSizeInfo = mDocumentSizeInfo;
         if (documentSizeInfo == null) {
             if (customManuscriptSize.mDocumentSizeInfo != null) {
                 return false;
@@ -66,6 +66,6 @@ class CustomManuscriptSize implements ManuscriptSize.ManuscriptTypeAdapter {
         } else if (!documentSizeInfo.equals(customManuscriptSize.mDocumentSizeInfo)) {
             return false;
         }
-        return Double.doubleToLongBits(this.mHeight) == Double.doubleToLongBits(customManuscriptSize.mHeight) && this.mScale == customManuscriptSize.mScale && Double.doubleToLongBits(this.mWidth) == Double.doubleToLongBits(customManuscriptSize.mWidth);
+        return Double.doubleToLongBits(mHeight) == Double.doubleToLongBits(customManuscriptSize.mHeight) && mScale == customManuscriptSize.mScale && Double.doubleToLongBits(mWidth) == Double.doubleToLongBits(customManuscriptSize.mWidth);
     }
 }

+ 32 - 32
app/src/main/java/com/epson/cameracopy/printlayout/DocumentSizeInfo.java

@@ -46,70 +46,70 @@ public class DocumentSizeInfo implements Parcelable, Serializable {
     }
 
     public String getDocSizeName() {
-        return this.mDocSizeName;
+        return mDocSizeName;
     }
 
     public String getDocSizeName(Context context) {
-        int i = this.mDocSizeNameId;
+        int i = mDocSizeNameId;
         if (i > 0) {
             int[] iArr = DOCUMENT_SIZE_NAME;
             if (i <= iArr.length - 1) {
                 return context.getString(iArr[i]);
             }
         }
-        return this.mDocSizeName;
+        return mDocSizeName;
     }
 
     public void setDocSizeName(String str) {
-        this.mDocSizeName = str;
+        mDocSizeName = str;
     }
 
     public int getScaleId() {
-        return this.mScaleId;
+        return mScaleId;
     }
 
     public void setScaleId(int i) {
-        this.mScaleId = i;
+        mScaleId = i;
     }
 
     public double getWidth() {
-        return this.mWidth;
+        return mWidth;
     }
 
     public void setWidth(double d) {
-        this.mWidth = d;
+        mWidth = d;
     }
 
     public double getHeight() {
-        return this.mHeight;
+        return mHeight;
     }
 
     public void setHeight(double d) {
-        this.mHeight = d;
+        mHeight = d;
     }
 
     public int getPaperId() {
-        return this.mPaperId;
+        return mPaperId;
     }
 
     public void setPaperId(int i) {
-        this.mPaperId = i;
+        mPaperId = i;
     }
 
     public int getDocSizeNameId() {
-        return this.mDocSizeNameId;
+        return mDocSizeNameId;
     }
 
     public void setDocSizeNameId(int i) {
-        this.mDocSizeNameId = i;
+        mDocSizeNameId = i;
     }
 
     public void update(DocumentSizeInfo documentSizeInfo) {
-        this.mDocSizeName = documentSizeInfo.mDocSizeName;
-        this.mScaleId = documentSizeInfo.mScaleId;
-        this.mWidth = documentSizeInfo.mWidth;
-        this.mHeight = documentSizeInfo.mHeight;
-        this.mDocSizeNameId = documentSizeInfo.mDocSizeNameId;
+        mDocSizeName = documentSizeInfo.mDocSizeName;
+        mScaleId = documentSizeInfo.mScaleId;
+        mWidth = documentSizeInfo.mWidth;
+        mHeight = documentSizeInfo.mHeight;
+        mDocSizeNameId = documentSizeInfo.mDocSizeNameId;
     }
 
     public boolean equals(Object obj) {
@@ -120,7 +120,7 @@ public class DocumentSizeInfo implements Parcelable, Serializable {
             return false;
         }
         DocumentSizeInfo documentSizeInfo = (DocumentSizeInfo) obj;
-        String str = this.mDocSizeName;
+        String str = mDocSizeName;
         if (str == null) {
             if (documentSizeInfo.mDocSizeName != null) {
                 return false;
@@ -132,21 +132,21 @@ public class DocumentSizeInfo implements Parcelable, Serializable {
     }
 
     public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeString(this.mDocSizeName);
-        parcel.writeInt(this.mScaleId);
-        parcel.writeDouble(this.mWidth);
-        parcel.writeDouble(this.mHeight);
-        parcel.writeInt(this.mPaperId);
-        parcel.writeInt(this.mDocSizeNameId);
+        parcel.writeString(mDocSizeName);
+        parcel.writeInt(mScaleId);
+        parcel.writeDouble(mWidth);
+        parcel.writeDouble(mHeight);
+        parcel.writeInt(mPaperId);
+        parcel.writeInt(mDocSizeNameId);
     }
 
     private DocumentSizeInfo(Parcel parcel) {
-        this.mDocSizeName = parcel.readString();
-        this.mScaleId = parcel.readInt();
-        this.mWidth = parcel.readDouble();
-        this.mHeight = parcel.readDouble();
-        this.mPaperId = parcel.readInt();
-        this.mDocSizeNameId = parcel.readInt();
+        mDocSizeName = parcel.readString();
+        mScaleId = parcel.readInt();
+        mWidth = parcel.readDouble();
+        mHeight = parcel.readDouble();
+        mPaperId = parcel.readInt();
+        mDocSizeNameId = parcel.readInt();
     }
 
     public static LinkedList<DocumentSizeInfo> getDocumentSizeInfoList(JSONObject jSONObject) throws JSONException {

+ 6 - 6
app/src/main/java/com/epson/cameracopy/printlayout/IdManuscriptSize.java

@@ -17,7 +17,7 @@ class IdManuscriptSize implements ManuscriptSize.ManuscriptTypeAdapter {
     }
 
     public IdManuscriptSize(DocumentSizeInfo documentSizeInfo) {
-        this.mDocumentSizeInfo = documentSizeInfo;
+        mDocumentSizeInfo = documentSizeInfo;
     }
 
     public static Point get360DpiPaperSizeById(int i) {
@@ -43,14 +43,14 @@ class IdManuscriptSize implements ManuscriptSize.ManuscriptTypeAdapter {
     }
 
     public Point getBasePixelSize(int i) {
-        return getDpiPaperSizeById(this.mDocumentSizeInfo.getPaperId(), i);
+        return getDpiPaperSizeById(mDocumentSizeInfo.getPaperId(), i);
     }
 
     public String getSizeName(Context context) {
-        if (this.mDocumentSizeInfo.getDocSizeName(context).equalsIgnoreCase(context.getString(R.string.papersize_passport))) {
-            return this.mDocumentSizeInfo.getDocSizeName(context);
+        if (mDocumentSizeInfo.getDocSizeName(context).equalsIgnoreCase(context.getString(R.string.papersize_passport))) {
+            return mDocumentSizeInfo.getDocSizeName(context);
         }
-        return context.getString(new MediaInfo.PaperSize().getStringId(this.mDocumentSizeInfo.getPaperId()));
+        return context.getString(new MediaInfo.PaperSize().getStringId(mDocumentSizeInfo.getPaperId()));
     }
 
     public int getUnitType(Context context) {
@@ -65,7 +65,7 @@ class IdManuscriptSize implements ManuscriptSize.ManuscriptTypeAdapter {
             return false;
         }
         IdManuscriptSize idManuscriptSize = (IdManuscriptSize) obj;
-        DocumentSizeInfo documentSizeInfo = this.mDocumentSizeInfo;
+        DocumentSizeInfo documentSizeInfo = mDocumentSizeInfo;
         if (documentSizeInfo == null) {
             if (idManuscriptSize.mDocumentSizeInfo != null) {
                 return false;

+ 51 - 51
app/src/main/java/com/epson/cameracopy/printlayout/ImageAndLayout.java

@@ -55,77 +55,77 @@ public class ImageAndLayout implements Parcelable {
     }
 
     public ImageAndLayout() {
-        this.mInterpolation = 2;
-        this.mIsPaperLandscape = true;
-        this.mOpenCvExifRotationCancel = true;
+        mInterpolation = 2;
+        mIsPaperLandscape = true;
+        mOpenCvExifRotationCancel = true;
     }
 
     public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeInt(this.mPrintableAreaWidth);
-        parcel.writeInt(this.mPrintableAreaHeight);
-        parcel.writeString(this.mOrgFilename);
-        parcel.writeDouble(this.mPrintTargetWidth);
-        parcel.writeDouble(this.mPrintTargetHeight);
-        parcel.writeDouble(this.mOffsetX);
-        parcel.writeDouble(this.mOffsetY);
-        parcel.writeInt(this.mRotation);
-        parcel.writeBooleanArray(new boolean[]{this.mIsPaperLandscape});
+        parcel.writeInt(mPrintableAreaWidth);
+        parcel.writeInt(mPrintableAreaHeight);
+        parcel.writeString(mOrgFilename);
+        parcel.writeDouble(mPrintTargetWidth);
+        parcel.writeDouble(mPrintTargetHeight);
+        parcel.writeDouble(mOffsetX);
+        parcel.writeDouble(mOffsetY);
+        parcel.writeInt(mRotation);
+        parcel.writeBooleanArray(new boolean[]{mIsPaperLandscape});
     }
 
     private ImageAndLayout(Parcel parcel) {
-        this.mInterpolation = 2;
-        this.mPrintableAreaWidth = parcel.readInt();
-        this.mPrintableAreaHeight = parcel.readInt();
-        this.mOrgFilename = parcel.readString();
-        this.mPrintTargetWidth = parcel.readDouble();
-        this.mPrintTargetHeight = parcel.readDouble();
-        this.mOffsetX = parcel.readDouble();
-        this.mOffsetY = parcel.readDouble();
-        this.mRotation = parcel.readInt();
+        mInterpolation = 2;
+        mPrintableAreaWidth = parcel.readInt();
+        mPrintableAreaHeight = parcel.readInt();
+        mOrgFilename = parcel.readString();
+        mPrintTargetWidth = parcel.readDouble();
+        mPrintTargetHeight = parcel.readDouble();
+        mOffsetX = parcel.readDouble();
+        mOffsetY = parcel.readDouble();
+        mRotation = parcel.readInt();
         boolean[] zArr = new boolean[1];
         parcel.readBooleanArray(zArr);
-        this.mIsPaperLandscape = zArr[0];
-        this.mOpenCvExifRotationCancel = true;
+        mIsPaperLandscape = zArr[0];
+        mOpenCvExifRotationCancel = true;
     }
 
     public void setOpenCvExifRotationCancel(boolean z) {
-        this.mOpenCvExifRotationCancel = z;
+        mOpenCvExifRotationCancel = z;
     }
 
     public void setLayoutAreaSize(int i, int i2) {
-        this.mPrintableAreaWidth = i;
-        this.mPrintableAreaHeight = i2;
+        mPrintableAreaWidth = i;
+        mPrintableAreaHeight = i2;
     }
 
     public void setLayout(double d, double d2, double d3, double d4, int i) {
-        this.mPrintTargetWidth = d;
-        this.mPrintTargetHeight = d2;
-        this.mOffsetX = d3;
-        this.mOffsetY = d4;
-        this.mRotation = i;
+        mPrintTargetWidth = d;
+        mPrintTargetHeight = d2;
+        mOffsetX = d3;
+        mOffsetY = d4;
+        mRotation = i;
     }
 
     public void setPaperIsLandscape(boolean z) {
-        this.mIsPaperLandscape = z;
+        mIsPaperLandscape = z;
     }
 
     public boolean isPaperLandscape() {
-        return this.mIsPaperLandscape;
+        return mIsPaperLandscape;
     }
 
     public void setOrgFileName(String str) {
-        this.mOrgFilename = str;
+        mOrgFilename = str;
     }
 
     public String getOrgFileName() {
-        return this.mOrgFilename;
+        return mOrgFilename;
     }
 
     private double[] getExRate(int[] iArr) {
         int i;
         int i2;
         double[] dArr = {1.0d, 1.0d};
-        if (iArr == null || iArr.length < 2 || (i = this.mPrintableAreaWidth) <= 0 || (i2 = this.mPrintableAreaHeight) <= 0) {
+        if (iArr == null || iArr.length < 2 || (i = mPrintableAreaWidth) <= 0 || (i2 = mPrintableAreaHeight) <= 0) {
             return dArr;
         }
         dArr[0] = ((double) iArr[0]) / ((double) i);
@@ -251,7 +251,7 @@ public class ImageAndLayout implements Parcelable {
     }
 
     private Size getPrintImageSize(double[] dArr) {
-        return new Size(this.mPrintTargetWidth * dArr[0], this.mPrintTargetHeight * dArr[1]);
+        return new Size(mPrintTargetWidth * dArr[0], mPrintTargetHeight * dArr[1]);
     }
 
     private Mat getPrintMat(int[] iArr, int i, Mat mat) {
@@ -291,7 +291,7 @@ public class ImageAndLayout implements Parcelable {
     public Mat makePrintImageMat(Mat mat, int i, int[] iArr) {
         Mat transMat = getTransMat(mat, i, iArr);
         Mat mat2 = new Mat(iArr[1], iArr[0], mat.type());
-        Imgproc.warpAffine(mat, mat2, transMat, mat2.size(), this.mInterpolation, 0, new Scalar(255.0d, 255.0d, 255.0d, 255.0d));
+        Imgproc.warpAffine(mat, mat2, transMat, mat2.size(), mInterpolation, 0, new Scalar(255.0d, 255.0d, 255.0d, 255.0d));
         transMat.release();
         return mat2;
     }
@@ -307,9 +307,9 @@ public class ImageAndLayout implements Parcelable {
         }
         double[] exRate = getExRate(iArr2);
         Size printImageSize = getPrintImageSize(exRate);
-        double d = this.mOffsetX * exRate[0];
-        double d2 = this.mOffsetY;
-        int imageRotation = getImageRotation(this.mRotation);
+        double d = mOffsetX * exRate[0];
+        double d2 = mOffsetY;
+        int imageRotation = getImageRotation(mRotation);
         Mat transformMat = getTransformMat(printImageSize, mat.size(), d, exRate[1] * d2, imageRotation);
         Mat printMat = getPrintMat(iArr, i, transformMat);
         transformMat.release();
@@ -323,7 +323,7 @@ public class ImageAndLayout implements Parcelable {
         clone.put(1, 2, clone.get(1, 2)[0] - ((double) i3));
         Mat mat4 = null;
         try {
-            Imgproc.warpAffine(mat, mat3, clone, size, this.mInterpolation, 0, new Scalar(255.0d, 255.0d, 255.0d, 255.0d));
+            Imgproc.warpAffine(mat, mat3, clone, size, mInterpolation, 0, new Scalar(255.0d, 255.0d, 255.0d, 255.0d));
             if (mat.type() == CvType.CV_8UC1) {
                 mat4 = make24BitMatFromGrayMat(mat3);
                 if (!Imgcodecs.imwrite(file.toString(), mat4)) {
@@ -408,8 +408,8 @@ public class ImageAndLayout implements Parcelable {
     public boolean createPrintData(String str, boolean z, int[] iArr, int i) {
         Mat mat = null;
         try {
-            setOpenCvJpegRotation(this.mOrgFilename);
-            Mat imread = Imgcodecs.imread(this.mOrgFilename, -1);
+            setOpenCvJpegRotation(mOrgFilename);
+            Mat imread = Imgcodecs.imread(mOrgFilename, -1);
             mat = imread.channels() == 4 ? convertRgbaToRgbTrWhite(imread) : imread;
             if (z) {
                 int channels = mat.channels();
@@ -550,18 +550,18 @@ public class ImageAndLayout implements Parcelable {
     }
 
     private void setOpenCvJpegRotation(String str) {
-        this.mOpenCvExifRotation = 0;
+        mOpenCvExifRotation = 0;
         if (OpenCvHelper.doseImreadRotateWithExifTag()) {
-            this.mOpenCvExifRotation = ImageFileUtil.getExifRotationDegree(str);
-            if (this.mOpenCvExifRotation < 0) {
-                this.mOpenCvExifRotation = 0;
+            mOpenCvExifRotation = ImageFileUtil.getExifRotationDegree(str);
+            if (mOpenCvExifRotation < 0) {
+                mOpenCvExifRotation = 0;
             }
         }
     }
 
     private int getImageRotation(int i) {
-        if (this.mOpenCvExifRotationCancel) {
-            i -= this.mOpenCvExifRotation;
+        if (mOpenCvExifRotationCancel) {
+            i -= mOpenCvExifRotation;
         }
         if (i < 0) {
             i += (((-i) / 4) + 1) * 4;
@@ -570,6 +570,6 @@ public class ImageAndLayout implements Parcelable {
     }
 
     private void setInterpolation(int i) {
-        this.mInterpolation = i;
+        mInterpolation = i;
     }
 }

+ 20 - 20
app/src/main/java/com/epson/cameracopy/printlayout/ManuscriptSize.java

@@ -32,37 +32,37 @@ public class ManuscriptSize {
     }
 
     public ManuscriptSize(DocumentSizeInfo documentSizeInfo, String str, int i) {
-        this.mBaseDpi = i;
+        mBaseDpi = i;
         switch (documentSizeInfo.getPaperId()) {
             case -2:
-                this.mManuscriptTypeAdapter = new CustomManuscriptSize(documentSizeInfo);
+                mManuscriptTypeAdapter = new CustomManuscriptSize(documentSizeInfo);
                 break;
             case -1:
-                this.mManuscriptTypeAdapter = new AutoManuscriptSize(documentSizeInfo);
+                mManuscriptTypeAdapter = new AutoManuscriptSize(documentSizeInfo);
                 break;
             default:
-                this.mManuscriptTypeAdapter = new IdManuscriptSize(documentSizeInfo);
+                mManuscriptTypeAdapter = new IdManuscriptSize(documentSizeInfo);
                 break;
         }
         setManuscriptPixlSize(str);
-        this.mManuscriptFileName = str;
+        mManuscriptFileName = str;
     }
 
     public int getPixelWidth() {
-        return this.mManuscriptPixelSize.x;
+        return mManuscriptPixelSize.x;
     }
 
     public int getPixelHeight() {
-        return this.mManuscriptPixelSize.y;
+        return mManuscriptPixelSize.y;
     }
 
     public PointF getPhysicalSize(Context context) {
-        double pixelToPhysicalSizeScale = getPixelToPhysicalSizeScale(this.mBaseDpi, this.mManuscriptTypeAdapter.getUnitType(context));
-        return new PointF((float) (((double) this.mManuscriptPixelSize.x) * pixelToPhysicalSizeScale), (float) (((double) this.mManuscriptPixelSize.y) * pixelToPhysicalSizeScale));
+        double pixelToPhysicalSizeScale = getPixelToPhysicalSizeScale(mBaseDpi, mManuscriptTypeAdapter.getUnitType(context));
+        return new PointF((float) (((double) mManuscriptPixelSize.x) * pixelToPhysicalSizeScale), (float) (((double) mManuscriptPixelSize.y) * pixelToPhysicalSizeScale));
     }
 
     public PointF getDocumentSize(Context context) {
-        ManuscriptTypeAdapter manuscriptTypeAdapter = this.mManuscriptTypeAdapter;
+        ManuscriptTypeAdapter manuscriptTypeAdapter = mManuscriptTypeAdapter;
         if (manuscriptTypeAdapter instanceof CustomManuscriptSize) {
             return ((CustomManuscriptSize) manuscriptTypeAdapter).getCustomDocumentSize(context);
         }
@@ -70,15 +70,15 @@ public class ManuscriptSize {
     }
 
     public String getSizeName(Context context) {
-        return this.mManuscriptTypeAdapter.getSizeName(context);
+        return mManuscriptTypeAdapter.getSizeName(context);
     }
 
     public boolean displayLength() {
-        return this.mManuscriptTypeAdapter.displayLength();
+        return mManuscriptTypeAdapter.displayLength();
     }
 
     public int getUnitType(Context context) {
-        return this.mManuscriptTypeAdapter.getUnitType(context);
+        return mManuscriptTypeAdapter.getUnitType(context);
     }
 
     public static double calcRate(int i, int i2, int i3, int i4) {
@@ -98,9 +98,9 @@ public class ManuscriptSize {
 
     private void setManuscriptPixlSize(String str) {
         Point basePixelSize;
-        this.mManuscriptPixelSize = new Point();
+        mManuscriptPixelSize = new Point();
         Point imageSize = ImageUtil.getImageSize(str);
-        if (imageSize != null && (basePixelSize = this.mManuscriptTypeAdapter.getBasePixelSize(this.mBaseDpi)) != null) {
+        if (imageSize != null && (basePixelSize = mManuscriptTypeAdapter.getBasePixelSize(mBaseDpi)) != null) {
             int i = imageSize.x;
             int i2 = imageSize.y;
             if ((i2 - i) * (basePixelSize.y - basePixelSize.x) >= 0) {
@@ -109,7 +109,7 @@ public class ManuscriptSize {
                 i2 = i3;
             }
             double calcRate = calcRate(basePixelSize.x, basePixelSize.y, i2, i);
-            Point point = this.mManuscriptPixelSize;
+            Point point = mManuscriptPixelSize;
             point.x = (int) (((double) i2) * calcRate);
             point.y = (int) (calcRate * ((double) i));
         }
@@ -123,10 +123,10 @@ public class ManuscriptSize {
             return false;
         }
         ManuscriptSize manuscriptSize = (ManuscriptSize) obj;
-        if (this.mBaseDpi != manuscriptSize.mBaseDpi) {
+        if (mBaseDpi != manuscriptSize.mBaseDpi) {
             return false;
         }
-        String str = this.mManuscriptFileName;
+        String str = mManuscriptFileName;
         if (str == null) {
             if (manuscriptSize.mManuscriptFileName != null) {
                 return false;
@@ -134,7 +134,7 @@ public class ManuscriptSize {
         } else if (!str.equals(manuscriptSize.mManuscriptFileName)) {
             return false;
         }
-        Point point = this.mManuscriptPixelSize;
+        Point point = mManuscriptPixelSize;
         if (point == null) {
             if (manuscriptSize.mManuscriptPixelSize != null) {
                 return false;
@@ -142,7 +142,7 @@ public class ManuscriptSize {
         } else if (!point.equals(manuscriptSize.mManuscriptPixelSize)) {
             return false;
         }
-        ManuscriptTypeAdapter manuscriptTypeAdapter = this.mManuscriptTypeAdapter;
+        ManuscriptTypeAdapter manuscriptTypeAdapter = mManuscriptTypeAdapter;
         if (manuscriptTypeAdapter == null) {
             if (manuscriptSize.mManuscriptTypeAdapter != null) {
                 return false;

+ 150 - 150
app/src/main/java/com/epson/cameracopy/printlayout/PreviewPosition.java

@@ -41,57 +41,57 @@ class PreviewPosition implements Serializable {
     }
 
     public PreviewPosition(double d) {
-        this.mPreviewPaperRate = d;
+        mPreviewPaperRate = d;
     }
 
     public void setPrtimageActualSize(int i, int i2) {
-        this.mPrtimageActualWidth = i;
-        this.mPrtimageActualHeight = i2;
+        mPrtimageActualWidth = i;
+        mPrtimageActualHeight = i2;
     }
 
     public int[] getPrtImageActualSIze() {
-        return new int[]{this.mPrtimageActualWidth, this.mPrtimageActualHeight};
+        return new int[]{mPrtimageActualWidth, mPrtimageActualHeight};
     }
 
     public void setScreenSize(int i, int i2) {
-        this.mScreenWidth = i;
-        this.mScreenHeight = i2;
+        mScreenWidth = i;
+        mScreenHeight = i2;
     }
 
     public void changeScreenSize(int i, int i2) {
-        if (this.mActualPreviewRate <= 0.0d || i <= 0 || i2 <= 0) {
+        if (mActualPreviewRate <= 0.0d || i <= 0 || i2 <= 0) {
             return;
         }
-        if (this.mScreenWidth != i || this.mScreenHeight != i2) {
-            this.mScreenWidth = i;
-            this.mScreenHeight = i2;
-            double left = ((double) (this.mPrtimagePreviewPosition.getLeft() - this.mPreviewPaperRect.left)) / this.mActualPreviewRate;
-            double top = ((double) (this.mPrtimagePreviewPosition.getTop() - this.mPreviewPaperRect.top)) / this.mActualPreviewRate;
+        if (mScreenWidth != i || mScreenHeight != i2) {
+            mScreenWidth = i;
+            mScreenHeight = i2;
+            double left = ((double) (mPrtimagePreviewPosition.getLeft() - mPreviewPaperRect.left)) / mActualPreviewRate;
+            double top = ((double) (mPrtimagePreviewPosition.getTop() - mPreviewPaperRect.top)) / mActualPreviewRate;
             calcPreviewPaperSize();
-            double d = this.mActualPreviewRate;
-            this.mPrtimagePreviewPosition.setX1Size((int) (((double) this.mPrtimageActualWidth) * d), (int) (((double) this.mPrtimageActualHeight) * d));
-            this.mPrtimagePreviewPosition.setLeft(this.mPreviewPaperRect.left + ((int) (left * this.mActualPreviewRate)));
-            this.mPrtimagePreviewPosition.setTop(this.mPreviewPaperRect.top + ((int) (top * this.mActualPreviewRate)));
+            double d = mActualPreviewRate;
+            mPrtimagePreviewPosition.setX1Size((int) (((double) mPrtimageActualWidth) * d), (int) (((double) mPrtimageActualHeight) * d));
+            mPrtimagePreviewPosition.setLeft(mPreviewPaperRect.left + ((int) (left * mActualPreviewRate)));
+            mPrtimagePreviewPosition.setTop(mPreviewPaperRect.top + ((int) (top * mActualPreviewRate)));
             setMovableArea();
         }
     }
 
     public void setPaperSize(int i, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10) {
-        this.mPaperActualWidth = i;
-        this.mPaperActualHeight = i2;
-        this.mPaperTo3mActualLeftMargin = i3;
-        this.mPaperTo3mActualTopMargin = i4;
-        this.m3mPrintAreaActualWidth = i5;
-        this.m3mPrintAreaActualHeight = i6;
-        this.mBorderlessLeftMargin = i7;
-        this.mBorderlessTopMargin = i8;
-        this.mBorderlessDataWidth = i9;
-        this.mBorderlessDataHeight = i10;
+        mPaperActualWidth = i;
+        mPaperActualHeight = i2;
+        mPaperTo3mActualLeftMargin = i3;
+        mPaperTo3mActualTopMargin = i4;
+        m3mPrintAreaActualWidth = i5;
+        m3mPrintAreaActualHeight = i6;
+        mBorderlessLeftMargin = i7;
+        mBorderlessTopMargin = i8;
+        mBorderlessDataWidth = i9;
+        mBorderlessDataHeight = i10;
     }
 
     public int[] getPaperMaginAnd3mPrintableArea() {
-        double d = this.mActualPreviewRate;
-        return new int[]{(int) (((double) this.mPaperTo3mActualLeftMargin) * d), (int) (((double) this.mPaperTo3mActualTopMargin) * d), (int) (((double) this.m3mPrintAreaActualWidth) * d), (int) (((double) this.m3mPrintAreaActualHeight) * d)};
+        double d = mActualPreviewRate;
+        return new int[]{(int) (((double) mPaperTo3mActualLeftMargin) * d), (int) (((double) mPaperTo3mActualTopMargin) * d), (int) (((double) m3mPrintAreaActualWidth) * d), (int) (((double) m3mPrintAreaActualHeight) * d)};
     }
 
     public void calcSizeAndPositionOnScreen() {
@@ -101,29 +101,29 @@ class PreviewPosition implements Serializable {
     }
 
     private void setMovableArea() {
-        this.mPreviewMovableArea[0] = this.mPreviewPaperRect.left + 10;
-        this.mPreviewMovableArea[1] = this.mPreviewPaperRect.top + 10;
-        this.mPreviewMovableArea[2] = this.mPreviewPaperRect.right - 10;
-        this.mPreviewMovableArea[3] = this.mPreviewPaperRect.bottom - 10;
-        if (!this.mBorderlessMode) {
+        mPreviewMovableArea[0] = mPreviewPaperRect.left + 10;
+        mPreviewMovableArea[1] = mPreviewPaperRect.top + 10;
+        mPreviewMovableArea[2] = mPreviewPaperRect.right - 10;
+        mPreviewMovableArea[3] = mPreviewPaperRect.bottom - 10;
+        if (!mBorderlessMode) {
             int[] paperMaginAnd3mPrintableArea = getPaperMaginAnd3mPrintableArea();
-            int[] iArr = this.mPreviewMovableArea;
+            int[] iArr = mPreviewMovableArea;
             iArr[0] = iArr[0] + paperMaginAnd3mPrintableArea[0];
             iArr[1] = iArr[1] + paperMaginAnd3mPrintableArea[1];
-            iArr[2] = ((this.mPreviewPaperRect.left + paperMaginAnd3mPrintableArea[0]) + paperMaginAnd3mPrintableArea[2]) - 10;
-            this.mPreviewMovableArea[3] = ((this.mPreviewPaperRect.top + paperMaginAnd3mPrintableArea[1]) + paperMaginAnd3mPrintableArea[3]) - 10;
+            iArr[2] = ((mPreviewPaperRect.left + paperMaginAnd3mPrintableArea[0]) + paperMaginAnd3mPrintableArea[2]) - 10;
+            mPreviewMovableArea[3] = ((mPreviewPaperRect.top + paperMaginAnd3mPrintableArea[1]) + paperMaginAnd3mPrintableArea[3]) - 10;
         }
     }
 
     private void initPreviewPrtimageRect() {
-        if (this.mPreviewPaperRect.right > 0 && this.mPreviewPaperRect.width() > 0 && this.mPrtimageActualWidth > 0 && this.mPrtimageActualHeight > 0) {
-            this.mFitSizeMode = false;
-            this.mPrtimagePreviewPosition.setScale(1.0d);
-            this.mPrtimagePreviewPosition.resetRotate();
-            double d = this.mActualPreviewRate;
-            this.mPrtimagePreviewPosition.setX1Size((int) ((((double) this.mPrtimageActualWidth) * d) + 0.5d), (int) ((((double) this.mPrtimageActualHeight) * d) + 0.5d));
-            this.mPrtimagePreviewPosition.setLeft(this.mPreviewPaperRect.left);
-            this.mPrtimagePreviewPosition.setTop(this.mPreviewPaperRect.top);
+        if (mPreviewPaperRect.right > 0 && mPreviewPaperRect.width() > 0 && mPrtimageActualWidth > 0 && mPrtimageActualHeight > 0) {
+            mFitSizeMode = false;
+            mPrtimagePreviewPosition.setScale(1.0d);
+            mPrtimagePreviewPosition.resetRotate();
+            double d = mActualPreviewRate;
+            mPrtimagePreviewPosition.setX1Size((int) ((((double) mPrtimageActualWidth) * d) + 0.5d), (int) ((((double) mPrtimageActualHeight) * d) + 0.5d));
+            mPrtimagePreviewPosition.setLeft(mPreviewPaperRect.left);
+            mPrtimagePreviewPosition.setTop(mPreviewPaperRect.top);
         }
     }
 
@@ -131,57 +131,57 @@ class PreviewPosition implements Serializable {
         int i;
         int i2;
         int i3;
-        int i4 = this.mScreenWidth;
-        if (i4 > 0 && (i = this.mScreenHeight) > 0 && (i2 = this.mPaperActualWidth) > 0 && (i3 = this.mPaperActualHeight) > 0) {
-            this.mFitSizeMode = false;
-            double d = this.mPreviewPaperRate;
-            this.mActualPreviewRate = Math.min((((double) i4) * d) / ((double) i2), (((double) i) * d) / ((double) i3));
-            this.mPreviewPaperRect.setEmpty();
-            Rect rect = this.mPreviewPaperRect;
-            double d2 = this.mActualPreviewRate;
-            rect.right = (int) (((double) this.mPaperActualWidth) * d2);
-            rect.bottom = (int) (((double) this.mPaperActualHeight) * d2);
-            this.mPreviewPaperRect.offsetTo((this.mScreenWidth - rect.right) / 2, (this.mScreenHeight - this.mPreviewPaperRect.bottom) / 2);
+        int i4 = mScreenWidth;
+        if (i4 > 0 && (i = mScreenHeight) > 0 && (i2 = mPaperActualWidth) > 0 && (i3 = mPaperActualHeight) > 0) {
+            mFitSizeMode = false;
+            double d = mPreviewPaperRate;
+            mActualPreviewRate = Math.min((((double) i4) * d) / ((double) i2), (((double) i) * d) / ((double) i3));
+            mPreviewPaperRect.setEmpty();
+            Rect rect = mPreviewPaperRect;
+            double d2 = mActualPreviewRate;
+            rect.right = (int) (((double) mPaperActualWidth) * d2);
+            rect.bottom = (int) (((double) mPaperActualHeight) * d2);
+            mPreviewPaperRect.offsetTo((mScreenWidth - rect.right) / 2, (mScreenHeight - mPreviewPaperRect.bottom) / 2);
         }
     }
 
     public void move(int i, int i2) {
-        this.mPrtimagePreviewPosition.move(i, i2);
+        mPrtimagePreviewPosition.move(i, i2);
         adjustPrtimagePosition();
     }
 
     public Rect getPreviewPaperRect() {
-        return this.mPreviewPaperRect;
+        return mPreviewPaperRect;
     }
 
     public Rect getPreviewPrtimageRect() {
-        this.mScaledPrtimagePreviewRect.left = this.mPrtimagePreviewPosition.getLeft();
-        this.mScaledPrtimagePreviewRect.right = this.mPrtimagePreviewPosition.getRight();
-        this.mScaledPrtimagePreviewRect.top = this.mPrtimagePreviewPosition.getTop();
-        this.mScaledPrtimagePreviewRect.bottom = this.mPrtimagePreviewPosition.getBottom();
-        return this.mScaledPrtimagePreviewRect;
+        mScaledPrtimagePreviewRect.left = mPrtimagePreviewPosition.getLeft();
+        mScaledPrtimagePreviewRect.right = mPrtimagePreviewPosition.getRight();
+        mScaledPrtimagePreviewRect.top = mPrtimagePreviewPosition.getTop();
+        mScaledPrtimagePreviewRect.bottom = mPrtimagePreviewPosition.getBottom();
+        return mScaledPrtimagePreviewRect;
     }
 
     public int getPrtimageRotation() {
-        return (this.mPrtimagePreviewPosition.getRotation() + this.mPrintTargetAddRotation) & 3;
+        return (mPrtimagePreviewPosition.getRotation() + mPrintTargetAddRotation) & 3;
     }
 
     public void rotateRight90() {
-        this.mPrtimagePreviewPosition.rotateRight90();
+        mPrtimagePreviewPosition.rotateRight90();
         adjustPrtimagePosition();
     }
 
     public void resetRotation() {
-        this.mPrtimagePreviewPosition.resetRotate();
+        mPrtimagePreviewPosition.resetRotate();
         adjustPrtimagePosition();
     }
 
     public void setPrintTargetAddRotation(int i) {
-        this.mPrintTargetAddRotation = i;
+        mPrintTargetAddRotation = i;
     }
 
     public double getCurrentPrttargetScale() {
-        return this.mPrtimagePreviewPosition.getScale();
+        return mPrtimagePreviewPosition.getScale();
     }
 
     public void setScaleFactor(double d) {
@@ -190,32 +190,32 @@ class PreviewPosition implements Serializable {
         } else if (d > 4.0d) {
             d = 4.0d;
         }
-        this.mPrtimagePreviewPosition.setScale(d);
+        mPrtimagePreviewPosition.setScale(d);
         adjustPrtimagePosition();
     }
 
     private void adjustPrtimagePosition() {
-        int right = this.mPrtimagePreviewPosition.getRight();
-        int[] iArr = this.mPreviewMovableArea;
+        int right = mPrtimagePreviewPosition.getRight();
+        int[] iArr = mPreviewMovableArea;
         if (right < iArr[0]) {
-            this.mPrtimagePreviewPosition.setRight(iArr[0]);
+            mPrtimagePreviewPosition.setRight(iArr[0]);
         }
-        int bottom = this.mPrtimagePreviewPosition.getBottom();
-        int[] iArr2 = this.mPreviewMovableArea;
+        int bottom = mPrtimagePreviewPosition.getBottom();
+        int[] iArr2 = mPreviewMovableArea;
         if (bottom < iArr2[1]) {
-            this.mPrtimagePreviewPosition.setBottom(iArr2[1]);
+            mPrtimagePreviewPosition.setBottom(iArr2[1]);
         }
-        int left = this.mPrtimagePreviewPosition.getLeft();
-        int[] iArr3 = this.mPreviewMovableArea;
+        int left = mPrtimagePreviewPosition.getLeft();
+        int[] iArr3 = mPreviewMovableArea;
         if (left > iArr3[2]) {
-            this.mPrtimagePreviewPosition.setLeft(iArr3[2]);
+            mPrtimagePreviewPosition.setLeft(iArr3[2]);
         }
-        int top = this.mPrtimagePreviewPosition.getTop();
-        int[] iArr4 = this.mPreviewMovableArea;
+        int top = mPrtimagePreviewPosition.getTop();
+        int[] iArr4 = mPreviewMovableArea;
         if (top > iArr4[3]) {
-            this.mPrtimagePreviewPosition.setTop(iArr4[3]);
+            mPrtimagePreviewPosition.setTop(iArr4[3]);
         }
-        this.mFitSizeMode = false;
+        mFitSizeMode = false;
     }
 
     public void resetPrtimagePosition() {
@@ -223,43 +223,43 @@ class PreviewPosition implements Serializable {
     }
 
     public PreviewView.SizeAndPosition getPrintSizeAndPosition() {
-        if (this.mActualPreviewRate <= 0.0d) {
+        if (mActualPreviewRate <= 0.0d) {
             return null;
         }
-        return new PreviewView.SizeAndPosition((int) (((double) this.mPrtimagePreviewPosition.getWidth()) / this.mActualPreviewRate), (int) (((double) this.mPrtimagePreviewPosition.getHeight()) / this.mActualPreviewRate), (int) (((double) (this.mPrtimagePreviewPosition.getLeft() - this.mPreviewPaperRect.left)) / this.mActualPreviewRate), (int) (((double) (this.mPrtimagePreviewPosition.getTop() - this.mPreviewPaperRect.top)) / this.mActualPreviewRate), getPrtimageRotation());
+        return new PreviewView.SizeAndPosition((int) (((double) mPrtimagePreviewPosition.getWidth()) / mActualPreviewRate), (int) (((double) mPrtimagePreviewPosition.getHeight()) / mActualPreviewRate), (int) (((double) (mPrtimagePreviewPosition.getLeft() - mPreviewPaperRect.left)) / mActualPreviewRate), (int) (((double) (mPrtimagePreviewPosition.getTop() - mPreviewPaperRect.top)) / mActualPreviewRate), getPrtimageRotation());
     }
 
     public ImageAndLayout getImageAndLayout(boolean z) {
         double d;
         double d2;
-        if (this.mActualPreviewRate <= 0.0d) {
+        if (mActualPreviewRate <= 0.0d) {
             return null;
         }
         ImageAndLayout imageAndLayout = new ImageAndLayout();
         if (z) {
-            imageAndLayout.setLayoutAreaSize(this.mBorderlessDataWidth, this.mBorderlessDataHeight);
-            d2 = (((double) (this.mPrtimagePreviewPosition.getLeft() - this.mPreviewPaperRect.left)) / this.mActualPreviewRate) + ((double) this.mBorderlessLeftMargin);
-            d = (((double) (this.mPrtimagePreviewPosition.getTop() - this.mPreviewPaperRect.top)) / this.mActualPreviewRate) + ((double) this.mBorderlessTopMargin);
+            imageAndLayout.setLayoutAreaSize(mBorderlessDataWidth, mBorderlessDataHeight);
+            d2 = (((double) (mPrtimagePreviewPosition.getLeft() - mPreviewPaperRect.left)) / mActualPreviewRate) + ((double) mBorderlessLeftMargin);
+            d = (((double) (mPrtimagePreviewPosition.getTop() - mPreviewPaperRect.top)) / mActualPreviewRate) + ((double) mBorderlessTopMargin);
         } else {
-            imageAndLayout.setLayoutAreaSize(this.m3mPrintAreaActualWidth, this.m3mPrintAreaActualHeight);
-            d2 = (((double) (this.mPrtimagePreviewPosition.getLeft() - this.mPreviewPaperRect.left)) / this.mActualPreviewRate) - ((double) this.mPaperTo3mActualLeftMargin);
-            d = (((double) (this.mPrtimagePreviewPosition.getTop() - this.mPreviewPaperRect.top)) / this.mActualPreviewRate) - ((double) this.mPaperTo3mActualTopMargin);
+            imageAndLayout.setLayoutAreaSize(m3mPrintAreaActualWidth, m3mPrintAreaActualHeight);
+            d2 = (((double) (mPrtimagePreviewPosition.getLeft() - mPreviewPaperRect.left)) / mActualPreviewRate) - ((double) mPaperTo3mActualLeftMargin);
+            d = (((double) (mPrtimagePreviewPosition.getTop() - mPreviewPaperRect.top)) / mActualPreviewRate) - ((double) mPaperTo3mActualTopMargin);
         }
-        imageAndLayout.setLayout(((double) this.mPrtimagePreviewPosition.getWidth()) / this.mActualPreviewRate, ((double) this.mPrtimagePreviewPosition.getHeight()) / this.mActualPreviewRate, d2, d, getPrtimageRotation());
+        imageAndLayout.setLayout(((double) mPrtimagePreviewPosition.getWidth()) / mActualPreviewRate, ((double) mPrtimagePreviewPosition.getHeight()) / mActualPreviewRate, d2, d, getPrtimageRotation());
         return imageAndLayout;
     }
 
     public void fitSize() {
         int i;
-        int i2 = this.mPrtimageActualWidth;
-        if (i2 > 0 && (i = this.mPrtimageActualHeight) > 0) {
-            if ((this.mPrtimagePreviewPosition.getRotation() & 1) != 0) {
+        int i2 = mPrtimageActualWidth;
+        if (i2 > 0 && (i = mPrtimageActualHeight) > 0) {
+            if ((mPrtimagePreviewPosition.getRotation() & 1) != 0) {
                 int i3 = i;
                 i = i2;
                 i2 = i3;
             }
-            double d = ((double) this.mPaperActualWidth) / ((double) i2);
-            double d2 = ((double) this.mPaperActualHeight) / ((double) i);
+            double d = ((double) mPaperActualWidth) / ((double) i2);
+            double d2 = ((double) mPaperActualHeight) / ((double) i);
             if (d <= d2) {
                 d2 = d;
             }
@@ -269,45 +269,45 @@ class PreviewPosition implements Serializable {
             if (d2 < 0.25d) {
                 d2 = 0.25d;
             }
-            this.mPrtimagePreviewPosition.setScale(d2);
-            this.mPrtimagePreviewPosition.setLeft(this.mPreviewPaperRect.left);
-            this.mPrtimagePreviewPosition.setTop(this.mPreviewPaperRect.top);
-            this.mFitSizeMode = true;
+            mPrtimagePreviewPosition.setScale(d2);
+            mPrtimagePreviewPosition.setLeft(mPreviewPaperRect.left);
+            mPrtimagePreviewPosition.setTop(mPreviewPaperRect.top);
+            mFitSizeMode = true;
         }
     }
 
     public boolean isFitSize() {
-        return this.mFitSizeMode;
+        return mFitSizeMode;
     }
 
     public void setBorderless(boolean z) {
-        this.mBorderlessMode = z;
+        mBorderlessMode = z;
     }
 
     private void writeObject(ObjectOutputStream objectOutputStream) throws IOException {
         objectOutputStream.defaultWriteObject();
-        objectOutputStream.writeInt(this.mPreviewPaperRect.left);
-        objectOutputStream.writeInt(this.mPreviewPaperRect.right);
-        objectOutputStream.writeInt(this.mPreviewPaperRect.top);
-        objectOutputStream.writeInt(this.mPreviewPaperRect.bottom);
-        objectOutputStream.writeInt(this.mScaledPrtimagePreviewRect.left);
-        objectOutputStream.writeInt(this.mScaledPrtimagePreviewRect.right);
-        objectOutputStream.writeInt(this.mScaledPrtimagePreviewRect.top);
-        objectOutputStream.writeInt(this.mScaledPrtimagePreviewRect.bottom);
+        objectOutputStream.writeInt(mPreviewPaperRect.left);
+        objectOutputStream.writeInt(mPreviewPaperRect.right);
+        objectOutputStream.writeInt(mPreviewPaperRect.top);
+        objectOutputStream.writeInt(mPreviewPaperRect.bottom);
+        objectOutputStream.writeInt(mScaledPrtimagePreviewRect.left);
+        objectOutputStream.writeInt(mScaledPrtimagePreviewRect.right);
+        objectOutputStream.writeInt(mScaledPrtimagePreviewRect.top);
+        objectOutputStream.writeInt(mScaledPrtimagePreviewRect.bottom);
     }
 
     private void readObject(ObjectInputStream objectInputStream) throws IOException, ClassNotFoundException {
         objectInputStream.defaultReadObject();
-        this.mPreviewPaperRect = new Rect();
-        this.mPreviewPaperRect.left = objectInputStream.readInt();
-        this.mPreviewPaperRect.right = objectInputStream.readInt();
-        this.mPreviewPaperRect.top = objectInputStream.readInt();
-        this.mPreviewPaperRect.bottom = objectInputStream.readInt();
-        this.mScaledPrtimagePreviewRect = new Rect();
-        this.mScaledPrtimagePreviewRect.left = objectInputStream.readInt();
-        this.mScaledPrtimagePreviewRect.right = objectInputStream.readInt();
-        this.mScaledPrtimagePreviewRect.top = objectInputStream.readInt();
-        this.mScaledPrtimagePreviewRect.bottom = objectInputStream.readInt();
+        mPreviewPaperRect = new Rect();
+        mPreviewPaperRect.left = objectInputStream.readInt();
+        mPreviewPaperRect.right = objectInputStream.readInt();
+        mPreviewPaperRect.top = objectInputStream.readInt();
+        mPreviewPaperRect.bottom = objectInputStream.readInt();
+        mScaledPrtimagePreviewRect = new Rect();
+        mScaledPrtimagePreviewRect.left = objectInputStream.readInt();
+        mScaledPrtimagePreviewRect.right = objectInputStream.readInt();
+        mScaledPrtimagePreviewRect.top = objectInputStream.readInt();
+        mScaledPrtimagePreviewRect.bottom = objectInputStream.readInt();
     }
 
     static class PreviewRect implements Serializable {
@@ -325,86 +325,86 @@ class PreviewPosition implements Serializable {
         }
 
         public final void setX1Size(int i, int i2) {
-            this.mX1Width = i;
-            this.mX1Height = i2;
-            setScale(this.mScale);
+            mX1Width = i;
+            mX1Height = i2;
+            setScale(mScale);
         }
 
         public final void setLeft(int i) {
-            this.mCx = (this.mScaledWidth / 2) + i;
+            mCx = (mScaledWidth / 2) + i;
         }
 
         public final void setRight(int i) {
-            setLeft(i - this.mScaledWidth);
+            setLeft(i - mScaledWidth);
         }
 
         public final void setTop(int i) {
-            this.mCy = (this.mScaledHeight / 2) + i;
+            mCy = (mScaledHeight / 2) + i;
         }
 
         public final void setBottom(int i) {
-            setTop(i - this.mScaledHeight);
+            setTop(i - mScaledHeight);
         }
 
         public int getLeft() {
-            return this.mCx - (this.mScaledWidth / 2);
+            return mCx - (mScaledWidth / 2);
         }
 
         public int getRight() {
-            return getLeft() + this.mScaledWidth;
+            return getLeft() + mScaledWidth;
         }
 
         public int getTop() {
-            return this.mCy - (this.mScaledHeight / 2);
+            return mCy - (mScaledHeight / 2);
         }
 
         public int getBottom() {
-            return getTop() + this.mScaledHeight;
+            return getTop() + mScaledHeight;
         }
 
         public int getWidth() {
-            return this.mScaledWidth;
+            return mScaledWidth;
         }
 
         public int getHeight() {
-            return this.mScaledHeight;
+            return mScaledHeight;
         }
 
         public void setScale(double d) {
-            this.mScale = d;
-            this.mScaledWidth = (int) (((double) this.mX1Width) * d);
-            this.mScaledHeight = (int) (((double) this.mX1Height) * d);
-            if ((this.mRotation & 1) != 0) {
-                int i = this.mScaledWidth;
-                this.mScaledWidth = this.mScaledHeight;
-                this.mScaledHeight = i;
+            mScale = d;
+            mScaledWidth = (int) (((double) mX1Width) * d);
+            mScaledHeight = (int) (((double) mX1Height) * d);
+            if ((mRotation & 1) != 0) {
+                int i = mScaledWidth;
+                mScaledWidth = mScaledHeight;
+                mScaledHeight = i;
             }
         }
 
         public double getScale() {
-            return this.mScale;
+            return mScale;
         }
 
         public void move(int i, int i2) {
-            this.mCx += i;
-            this.mCy += i2;
+            mCx += i;
+            mCy += i2;
         }
 
         public int getRotation() {
-            return this.mRotation;
+            return mRotation;
         }
 
         public void rotateRight90() {
-            this.mRotation++;
-            if (this.mRotation >= 4) {
-                this.mRotation = 0;
+            mRotation++;
+            if (mRotation >= 4) {
+                mRotation = 0;
             }
-            setScale(this.mScale);
+            setScale(mScale);
         }
 
         public void resetRotate() {
-            this.mRotation = 0;
-            setScale(this.mScale);
+            mRotation = 0;
+            setScale(mScale);
         }
     }
 }

+ 110 - 110
app/src/main/java/com/epson/cameracopy/printlayout/PreviewView.java

@@ -70,16 +70,16 @@ public class PreviewView extends View {
 
     public PreviewView(Context context, AttributeSet attributeSet, int i) {
         super(context, attributeSet, i);
-        this.mBitmapPaint = new Paint();
-        this.mMatrix = new Matrix();
-        this.mPapaerSizeId = -1;
-        this.mGestureDetector = new GestureDetectorCompat(context, new MyGestureListener(this));
-        this.mGestureDetector.setIsLongpressEnabled(false);
-        this.mScaleGestureDetector = new ScaleGestureDetector(context, new MyScaledGestureListener(this));
-        this.mPaint = new Paint();
-        this.mLinePoints = new float[16];
-        this.mPreviewPosition = new PreviewPosition();
-        this.mDpToPixelScale = context.getResources().getDisplayMetrics().density;
+        mBitmapPaint = new Paint();
+        mMatrix = new Matrix();
+        mPapaerSizeId = -1;
+        mGestureDetector = new GestureDetectorCompat(context, new MyGestureListener(this));
+        mGestureDetector.setIsLongpressEnabled(false);
+        mScaleGestureDetector = new ScaleGestureDetector(context, new MyScaledGestureListener(this));
+        mPaint = new Paint();
+        mLinePoints = new float[16];
+        mPreviewPosition = new PreviewPosition();
+        mDpToPixelScale = context.getResources().getDisplayMetrics().density;
     }
 
     public PreviewView(Context context, AttributeSet attributeSet) {
@@ -91,7 +91,7 @@ public class PreviewView extends View {
     }
 
     public boolean onTouchEvent(MotionEvent motionEvent) {
-        boolean z = this.mGestureDetector.onTouchEvent(motionEvent) || this.mScaleGestureDetector.onTouchEvent(motionEvent);
+        boolean z = mGestureDetector.onTouchEvent(motionEvent) || mScaleGestureDetector.onTouchEvent(motionEvent);
         if (motionEvent.getActionMasked() == 1) {
             setMoving(false);
             invalidate();
@@ -103,15 +103,15 @@ public class PreviewView extends View {
     }
 
     protected void onDraw(Canvas canvas) {
-        Rect previewPaperRect = this.mPreviewPosition.getPreviewPaperRect();
+        Rect previewPaperRect = mPreviewPosition.getPreviewPaperRect();
         if (previewPaperRect != null) {
-            this.mPaint.setColor(-1);
-            canvas.drawRect(previewPaperRect, this.mPaint);
+            mPaint.setColor(-1);
+            canvas.drawRect(previewPaperRect, mPaint);
         }
         drawPrintTargetPreview(canvas);
         drawOutsidePaperArea(canvas, previewPaperRect);
-        if (!this.mBorderlessMode && previewPaperRect != null) {
-            drawNonPrintableArea(canvas, previewPaperRect, this.mPreviewPosition.getPaperMaginAnd3mPrintableArea());
+        if (!mBorderlessMode && previewPaperRect != null) {
+            drawNonPrintableArea(canvas, previewPaperRect, mPreviewPosition.getPaperMaginAnd3mPrintableArea());
         }
     }
 
@@ -120,19 +120,19 @@ public class PreviewView extends View {
         double d2;
         int i;
         int i2;
-        Rect previewPrtimageRect = this.mPreviewPosition.getPreviewPrtimageRect();
-        if (previewPrtimageRect != null && this.mBitmap != null) {
-            int prtimageRotation = this.mPreviewPosition.getPrtimageRotation();
-            this.mMatrix.reset();
-            this.mMatrix.setRotate(((float) prtimageRotation) * 90.0f);
+        Rect previewPrtimageRect = mPreviewPosition.getPreviewPrtimageRect();
+        if (previewPrtimageRect != null && mBitmap != null) {
+            int prtimageRotation = mPreviewPosition.getPrtimageRotation();
+            mMatrix.reset();
+            mMatrix.setRotate(((float) prtimageRotation) * 90.0f);
             if ((prtimageRotation & 1) != 0) {
-                d2 = ((double) previewPrtimageRect.width()) / ((double) this.mBitmap.getHeight());
-                d = ((double) previewPrtimageRect.height()) / ((double) this.mBitmap.getWidth());
+                d2 = ((double) previewPrtimageRect.width()) / ((double) mBitmap.getHeight());
+                d = ((double) previewPrtimageRect.height()) / ((double) mBitmap.getWidth());
             } else {
-                d2 = ((double) previewPrtimageRect.width()) / ((double) this.mBitmap.getWidth());
-                d = ((double) previewPrtimageRect.height()) / ((double) this.mBitmap.getHeight());
+                d2 = ((double) previewPrtimageRect.width()) / ((double) mBitmap.getWidth());
+                d = ((double) previewPrtimageRect.height()) / ((double) mBitmap.getHeight());
             }
-            this.mMatrix.postScale((float) d2, (float) d);
+            mMatrix.postScale((float) d2, (float) d);
             switch (prtimageRotation) {
                 case 1:
                     i2 = previewPrtimageRect.width();
@@ -151,21 +151,21 @@ public class PreviewView extends View {
                     i = 0;
                     break;
             }
-            this.mMatrix.postTranslate((float) (previewPrtimageRect.left + i2), (float) (previewPrtimageRect.top + i));
-            canvas.drawBitmap(this.mBitmap, this.mMatrix, this.mBitmapPaint);
-            this.mPaint.setColor(MANUSCRIPT_FRAME_COLOR);
-            float f = this.mDpToPixelScale * MANUSCRIPT_FRAME_BORDER_SIZE_DP;
-            this.mPaint.setStrokeWidth(f);
+            mMatrix.postTranslate((float) (previewPrtimageRect.left + i2), (float) (previewPrtimageRect.top + i));
+            canvas.drawBitmap(mBitmap, mMatrix, mBitmapPaint);
+            mPaint.setColor(MANUSCRIPT_FRAME_COLOR);
+            float f = mDpToPixelScale * MANUSCRIPT_FRAME_BORDER_SIZE_DP;
+            mPaint.setStrokeWidth(f);
             float f2 = f / 2.0f;
             float f3 = ((float) previewPrtimageRect.bottom) - f2;
             float f4 = ((float) previewPrtimageRect.right) - f2;
-            this.mLinePoints[0] = (float) previewPrtimageRect.left;
-            this.mLinePoints[1] = (float) previewPrtimageRect.top;
-            this.mLinePoints[2] = (float) previewPrtimageRect.left;
-            float[] fArr = this.mLinePoints;
+            mLinePoints[0] = (float) previewPrtimageRect.left;
+            mLinePoints[1] = (float) previewPrtimageRect.top;
+            mLinePoints[2] = (float) previewPrtimageRect.left;
+            float[] fArr = mLinePoints;
             fArr[3] = f3;
             fArr[4] = (float) previewPrtimageRect.left;
-            float[] fArr2 = this.mLinePoints;
+            float[] fArr2 = mLinePoints;
             fArr2[5] = f3;
             fArr2[6] = f4;
             fArr2[7] = f3;
@@ -173,88 +173,88 @@ public class PreviewView extends View {
             fArr2[9] = f3;
             fArr2[10] = f4;
             fArr2[11] = (float) previewPrtimageRect.top;
-            float[] fArr3 = this.mLinePoints;
+            float[] fArr3 = mLinePoints;
             fArr3[12] = f4;
             fArr3[13] = (float) previewPrtimageRect.top;
-            this.mLinePoints[14] = (float) previewPrtimageRect.left;
-            this.mLinePoints[15] = (float) previewPrtimageRect.top;
-            canvas.drawLines(this.mLinePoints, this.mPaint);
+            mLinePoints[14] = (float) previewPrtimageRect.left;
+            mLinePoints[15] = (float) previewPrtimageRect.top;
+            canvas.drawLines(mLinePoints, mPaint);
         }
     }
 
     private void drawNonPrintableArea(Canvas canvas, Rect rect, int[] iArr) {
-        this.mPaint.setColor(-1);
+        mPaint.setColor(-1);
         int i = iArr[0];
         int i2 = iArr[1];
         int i3 = iArr[2];
         int i4 = iArr[3];
         Canvas canvas2 = canvas;
-        canvas2.drawRect((float) rect.left, (float) rect.top, (float) (rect.left + i), (float) rect.bottom, this.mPaint);
-        canvas2.drawRect((float) (rect.left + i), (float) rect.top, (float) (rect.left + i + i3), (float) (rect.top + i2), this.mPaint);
-        canvas2.drawRect((float) (rect.left + i), (float) (rect.top + i2 + i4), (float) (rect.left + i + i3), (float) rect.bottom, this.mPaint);
-        canvas.drawRect((float) (rect.left + i + i3), (float) rect.top, (float) rect.right, (float) rect.bottom, this.mPaint);
+        canvas2.drawRect((float) rect.left, (float) rect.top, (float) (rect.left + i), (float) rect.bottom, mPaint);
+        canvas2.drawRect((float) (rect.left + i), (float) rect.top, (float) (rect.left + i + i3), (float) (rect.top + i2), mPaint);
+        canvas2.drawRect((float) (rect.left + i), (float) (rect.top + i2 + i4), (float) (rect.left + i + i3), (float) rect.bottom, mPaint);
+        canvas.drawRect((float) (rect.left + i + i3), (float) rect.top, (float) rect.right, (float) rect.bottom, mPaint);
     }
 
     private void drawOutsidePaperArea(Canvas canvas, Rect rect) {
-        this.mPaint.setColor(getResources().getColor(R.color.background_preview));
-        if (this.mIsMoving) {
-            this.mPaint.setAlpha(221);
+        mPaint.setColor(getResources().getColor(R.color.background_preview));
+        if (mIsMoving) {
+            mPaint.setAlpha(221);
         }
         float width = (float) getWidth();
         float height = (float) getHeight();
         Canvas canvas2 = canvas;
-        canvas2.drawRect(0.0f, 0.0f, (float) rect.left, height, this.mPaint);
-        canvas2.drawRect((float) rect.left, 0.0f, (float) rect.right, (float) rect.top, this.mPaint);
-        canvas2.drawRect((float) rect.left, (float) rect.bottom, (float) rect.right, height, this.mPaint);
-        canvas.drawRect((float) rect.right, 0.0f, width, height, this.mPaint);
+        canvas2.drawRect(0.0f, 0.0f, (float) rect.left, height, mPaint);
+        canvas2.drawRect((float) rect.left, 0.0f, (float) rect.right, (float) rect.top, mPaint);
+        canvas2.drawRect((float) rect.left, (float) rect.bottom, (float) rect.right, height, mPaint);
+        canvas.drawRect((float) rect.right, 0.0f, width, height, mPaint);
     }
 
     protected void onSizeChanged(int i, int i2, int i3, int i4) {
         super.onSizeChanged(i, i2, i3, i4);
         if (i > 0 && i2 > 0) {
             if (i3 <= 0 || i4 <= 0) {
-                this.mPreviewPosition.setScreenSize(i, i2);
+                mPreviewPosition.setScreenSize(i, i2);
                 update();
             } else if (i != i3 || i2 != i4) {
-                this.mPreviewPosition.changeScreenSize(i, i2);
+                mPreviewPosition.changeScreenSize(i, i2);
             }
         }
     }
 
     public void setMoving(boolean z) {
-        this.mIsMoving = z;
+        mIsMoving = z;
     }
 
     static class MyGestureListener extends GestureDetector.SimpleOnGestureListener {
         private final PreviewView mPreviewView;
 
         public MyGestureListener(PreviewView previewView) {
-            this.mPreviewView = previewView;
+            mPreviewView = previewView;
         }
 
         public boolean onScroll(MotionEvent motionEvent, MotionEvent motionEvent2, float f, float f2) {
-            this.mPreviewView.setMoving(true);
-            this.mPreviewView.mPreviewPosition.move(-((int) f), -((int) f2));
-            this.mPreviewView.invalidate();
+            mPreviewView.setMoving(true);
+            mPreviewView.mPreviewPosition.move(-((int) f), -((int) f2));
+            mPreviewView.invalidate();
             return true;
         }
 
         public boolean onDown(MotionEvent motionEvent) {
-            this.mPreviewView.setMoving(true);
-            this.mPreviewView.invalidate();
+            mPreviewView.setMoving(true);
+            mPreviewView.invalidate();
             return true;
         }
 
         public boolean onDoubleTap(MotionEvent motionEvent) {
-            if (this.mPreviewView.mPreviewPosition.isFitSize()) {
-                this.mPreviewView.mPreviewPosition.resetPrtimagePosition();
-                this.mPreviewView.updateScale();
-                this.mPreviewView.invalidate();
+            if (mPreviewView.mPreviewPosition.isFitSize()) {
+                mPreviewView.mPreviewPosition.resetPrtimagePosition();
+                mPreviewView.updateScale();
+                mPreviewView.invalidate();
                 return true;
             }
-            this.mPreviewView.mPreviewPosition.fitSize();
-            this.mPreviewView.updateScale();
-            this.mPreviewView.invalidate();
+            mPreviewView.mPreviewPosition.fitSize();
+            mPreviewView.updateScale();
+            mPreviewView.invalidate();
             return true;
         }
     }
@@ -264,41 +264,41 @@ public class PreviewView extends View {
         private final PreviewView mPreviewView;
 
         public MyScaledGestureListener(PreviewView previewView) {
-            this.mPreviewView = previewView;
+            mPreviewView = previewView;
         }
 
         public boolean onScaleBegin(ScaleGestureDetector scaleGestureDetector) {
-            this.mBaseFactor = this.mPreviewView.mPreviewPosition.getCurrentPrttargetScale();
+            mBaseFactor = mPreviewView.mPreviewPosition.getCurrentPrttargetScale();
             return super.onScaleBegin(scaleGestureDetector);
         }
 
         public boolean onScale(ScaleGestureDetector scaleGestureDetector) {
-            this.mPreviewView.mPreviewPosition.setScaleFactor(((double) scaleGestureDetector.getScaleFactor()) * this.mBaseFactor);
-            this.mPreviewView.updateScale();
-            this.mPreviewView.invalidate();
+            mPreviewView.mPreviewPosition.setScaleFactor(((double) scaleGestureDetector.getScaleFactor()) * mBaseFactor);
+            mPreviewView.updateScale();
+            mPreviewView.invalidate();
             return super.onScale(scaleGestureDetector);
         }
     }
 
     private void updateScale() {
-        PrttargetScaleChangeListener prttargetScaleChangeListener = this.mPrttargetScaleChangeListener;
+        PrttargetScaleChangeListener prttargetScaleChangeListener = mPrttargetScaleChangeListener;
         if (prttargetScaleChangeListener != null) {
-            prttargetScaleChangeListener.onPrttargetScaleChange(this.mPreviewPosition.getCurrentPrttargetScale());
+            prttargetScaleChangeListener.onPrttargetScaleChange(mPreviewPosition.getCurrentPrttargetScale());
         }
     }
 
     public void setPaperSize(int i) {
-        if (i != this.mPapaerSizeId) {
+        if (i != mPapaerSizeId) {
             setPaperSizeInternal(i);
         }
     }
 
     private void setPaperSizeInternal(int i) {
-        this.mPapaerSizeId = i;
+        mPapaerSizeId = i;
         Info_paper infoPaper = Info_paper.getInfoPaper(getContext(), i);
         if (infoPaper != null) {
-            this.mPreviewPosition.setPaperSize(infoPaper.getPaper_width(), infoPaper.getPaper_height(), infoPaper.getLeftMargin_border(), infoPaper.getTopMargin_border(), infoPaper.getPaper_width_boder(), infoPaper.getPaper_height_boder(), -infoPaper.getLeftMargin(), -infoPaper.getTopMargin(), infoPaper.getPaper_width_boderless(), infoPaper.getPaper_height_boderless());
-            this.mIsPrintPositionResetRequired = true;
+            mPreviewPosition.setPaperSize(infoPaper.getPaper_width(), infoPaper.getPaper_height(), infoPaper.getLeftMargin_border(), infoPaper.getTopMargin_border(), infoPaper.getPaper_width_boder(), infoPaper.getPaper_height_boder(), -infoPaper.getLeftMargin(), -infoPaper.getTopMargin(), infoPaper.getPaper_width_boderless(), infoPaper.getPaper_height_boderless());
+            mIsPrintPositionResetRequired = true;
         }
     }
 
@@ -316,41 +316,41 @@ public class PreviewView extends View {
                 break;
         }
         if (colorMatrixColorFilter != null) {
-            this.mBitmapPaint.setColorFilter(colorMatrixColorFilter);
+            mBitmapPaint.setColorFilter(colorMatrixColorFilter);
         }
     }
 
     public void rotateImageR90() {
-        this.mPreviewPosition.rotateRight90();
+        mPreviewPosition.rotateRight90();
         invalidate();
     }
 
     public void setImage(String str) {
-        this.mImageFileName = str;
-        this.mIsPrintPositionResetRequired = true;
+        mImageFileName = str;
+        mIsPrintPositionResetRequired = true;
     }
 
     public void setPrintTargetSize(int i, int i2) {
-        this.mPreviewPosition.setPrtimageActualSize(i, i2);
-        this.mIsPrintPositionResetRequired = true;
+        mPreviewPosition.setPrtimageActualSize(i, i2);
+        mIsPrintPositionResetRequired = true;
     }
 
     public void update() {
-        if (this.mImageFileName != null && getHeight() > 0 && getWidth() > 0) {
-            this.mBitmap = createPreviewBitmap(this.mImageFileName);
-            if (this.mBitmap != null) {
-                int[] prtImageActualSIze = this.mPreviewPosition.getPrtImageActualSIze();
+        if (mImageFileName != null && getHeight() > 0 && getWidth() > 0) {
+            mBitmap = createPreviewBitmap(mImageFileName);
+            if (mBitmap != null) {
+                int[] prtImageActualSIze = mPreviewPosition.getPrtImageActualSIze();
                 int i = 1;
-                if ((prtImageActualSIze[0] - prtImageActualSIze[1]) * (this.mBitmap.getWidth() - this.mBitmap.getHeight()) >= 0) {
+                if ((prtImageActualSIze[0] - prtImageActualSIze[1]) * (mBitmap.getWidth() - mBitmap.getHeight()) >= 0) {
                     i = 0;
                 }
-                this.mPreviewPosition.setPrintTargetAddRotation(i);
-                if (this.mIsPrintPositionResetRequired) {
-                    setPaperSizeInternal(this.mPapaerSizeId);
-                    this.mPreviewPosition.setBorderless(this.mBorderlessMode);
-                    this.mPreviewPosition.resetRotation();
-                    this.mPreviewPosition.calcSizeAndPositionOnScreen();
-                    this.mIsPrintPositionResetRequired = false;
+                mPreviewPosition.setPrintTargetAddRotation(i);
+                if (mIsPrintPositionResetRequired) {
+                    setPaperSizeInternal(mPapaerSizeId);
+                    mPreviewPosition.setBorderless(mBorderlessMode);
+                    mPreviewPosition.resetRotation();
+                    mPreviewPosition.calcSizeAndPositionOnScreen();
+                    mIsPrintPositionResetRequired = false;
                     updateScale();
                 }
                 invalidate();
@@ -363,43 +363,43 @@ public class PreviewView extends View {
     }
 
     public void releaseBitmap() {
-        this.mBitmap.recycle();
-        this.mBitmap = null;
+        mBitmap.recycle();
+        mBitmap = null;
     }
 
     public void restoreBitmap() {
         String str;
-        if (this.mBitmap == null && (str = this.mImageFileName) != null) {
-            this.mBitmap = createPreviewBitmap(str);
+        if (mBitmap == null && (str = mImageFileName) != null) {
+            mBitmap = createPreviewBitmap(str);
         }
     }
 
     public void setBorderless(boolean z) {
-        if (this.mBorderlessMode != z) {
-            this.mBorderlessMode = z;
-            this.mIsPrintPositionResetRequired = true;
+        if (mBorderlessMode != z) {
+            mBorderlessMode = z;
+            mIsPrintPositionResetRequired = true;
         }
     }
 
     public void printPostionResetRequest() {
-        this.mIsPrintPositionResetRequired = true;
+        mIsPrintPositionResetRequired = true;
     }
 
     public void setPrttargetScaleChangeListener(PrttargetScaleChangeListener prttargetScaleChangeListener) {
-        this.mPrttargetScaleChangeListener = prttargetScaleChangeListener;
+        mPrttargetScaleChangeListener = prttargetScaleChangeListener;
     }
 
     public ImageAndLayout getImageAndLayout() {
-        return this.mPreviewPosition.getImageAndLayout(this.mBorderlessMode);
+        return mPreviewPosition.getImageAndLayout(mBorderlessMode);
     }
 
     public void saveInstanceState(Bundle bundle, String str) {
-        bundle.putSerializable(str, this.mPreviewPosition);
+        bundle.putSerializable(str, mPreviewPosition);
     }
 
     public void restoreInstanceState(Bundle bundle, String str) {
-        this.mPreviewPosition = (PreviewPosition) bundle.getSerializable(str);
-        this.mIsPrintPositionResetRequired = false;
+        mPreviewPosition = (PreviewPosition) bundle.getSerializable(str);
+        mIsPrintPositionResetRequired = false;
         updateScale();
     }
 }

+ 42 - 42
app/src/main/java/com/epson/cameracopy/printlayout/RegistedDocumentSizeList.java

@@ -28,7 +28,7 @@ public class RegistedDocumentSizeList {
 
     RegistedDocumentSizeList(Context context) {
         if (context != null) {
-            this.mContext = context;
+            mContext = context;
             initData();
             return;
         }
@@ -55,55 +55,55 @@ public class RegistedDocumentSizeList {
     }
 
     public Collection<DocumentSizeInfo> getRegistedList() {
-        return this.mDocumentSizeList;
+        return mDocumentSizeList;
     }
 
     public DocumentSizeInfo getCurrentDocumentSize() {
-        return this.mCurrentDocumentSize;
+        return mCurrentDocumentSize;
     }
 
     public void add(DocumentSizeInfo documentSizeInfo) {
         if (documentSizeInfo != null) {
-            this.mDocumentSizeList.add(documentSizeInfo);
-            this.mCurrentDocumentSize = documentSizeInfo;
-            saveData(this.mContext);
+            mDocumentSizeList.add(documentSizeInfo);
+            mCurrentDocumentSize = documentSizeInfo;
+            saveData(mContext);
         }
     }
 
     public void update(DocumentSizeInfo documentSizeInfo, int i) {
-        DocumentSizeInfo documentSizeInfo2 = this.mDocumentSizeList.get(i);
+        DocumentSizeInfo documentSizeInfo2 = mDocumentSizeList.get(i);
         if (documentSizeInfo2 != null) {
             documentSizeInfo2.update(documentSizeInfo);
-            this.mCurrentDocumentSize = this.mDocumentSizeList.get(i);
-            saveData(this.mContext);
+            mCurrentDocumentSize = mDocumentSizeList.get(i);
+            saveData(mContext);
         }
     }
 
     public void delete(DocumentSizeInfo documentSizeInfo, int i) {
-        this.mDocumentSizeList.remove(documentSizeInfo);
-        DocumentSizeInfo documentSizeInfo2 = this.mCurrentDocumentSize;
+        mDocumentSizeList.remove(documentSizeInfo);
+        DocumentSizeInfo documentSizeInfo2 = mCurrentDocumentSize;
         if (documentSizeInfo2 != null && documentSizeInfo2.equals(documentSizeInfo)) {
             if (i > 0) {
-                this.mCurrentDocumentSize = this.mDocumentSizeList.get(i - 1);
-            } else if (this.mDocumentSizeList.size() > 0) {
-                this.mCurrentDocumentSize = this.mDocumentSizeList.get(0);
+                mCurrentDocumentSize = mDocumentSizeList.get(i - 1);
+            } else if (mDocumentSizeList.size() > 0) {
+                mCurrentDocumentSize = mDocumentSizeList.get(0);
             } else {
-                this.mCurrentDocumentSize = null;
+                mCurrentDocumentSize = null;
             }
         }
     }
 
     public void deleteAll() {
-        LinkedList<DocumentSizeInfo> linkedList = this.mDocumentSizeList;
+        LinkedList<DocumentSizeInfo> linkedList = mDocumentSizeList;
         linkedList.removeAll(linkedList);
-        this.mCurrentDocumentSize = null;
+        mCurrentDocumentSize = null;
     }
 
     public void reset() {
         initData();
         for (int i = 0; i < DEFAULT_PAPER_SIZE_COUNT; i++) {
             DocumentSizeInfo documentSizeInfo = new DocumentSizeInfo();
-            documentSizeInfo.setDocSizeName(this.mContext.getString(PAPER_SIZE_NAME[i]));
+            documentSizeInfo.setDocSizeName(mContext.getString(PAPER_SIZE_NAME[i]));
             documentSizeInfo.setScaleId(PAPER_SIZE_SCALE[i]);
             documentSizeInfo.setWidth(PAPER_SIZE_WIDTH[i]);
             documentSizeInfo.setHeight(PAPER_SIZE_HEIGHT[i]);
@@ -115,16 +115,16 @@ public class RegistedDocumentSizeList {
     }
 
     public int size() {
-        return this.mDocumentSizeList.size();
+        return mDocumentSizeList.size();
     }
 
     public DocumentSizeInfo getItem(int i) {
-        return this.mDocumentSizeList.get(i);
+        return mDocumentSizeList.get(i);
     }
 
     public DocumentSizeInfo getItem(String str) {
         DocumentSizeInfo documentSizeInfo;
-        Iterator it = this.mDocumentSizeList.iterator();
+        Iterator it = mDocumentSizeList.iterator();
         do {
             documentSizeInfo = null;
             if (!it.hasNext()) {
@@ -137,15 +137,15 @@ public class RegistedDocumentSizeList {
 
     public boolean isExistDocumentSizeName(String str, int i) {
         DocumentSizeInfo item = getItem(str);
-        return (item == null || this.mDocumentSizeList.indexOf(item) == i) ? false : true;
+        return (item == null || mDocumentSizeList.indexOf(item) == i) ? false : true;
     }
 
     public void storeData() {
-        saveData(this.mContext);
+        saveData(mContext);
     }
 
     public boolean isSelected(DocumentSizeInfo documentSizeInfo) {
-        DocumentSizeInfo documentSizeInfo2 = this.mCurrentDocumentSize;
+        DocumentSizeInfo documentSizeInfo2 = mCurrentDocumentSize;
         if (documentSizeInfo2 == null) {
             return false;
         }
@@ -154,35 +154,35 @@ public class RegistedDocumentSizeList {
 
     public void select(int i) {
         if (i < 0) {
-            this.mCurrentDocumentSize = null;
-        } else if (i < this.mDocumentSizeList.size()) {
-            this.mCurrentDocumentSize = this.mDocumentSizeList.get(i);
-            saveData(this.mContext);
+            mCurrentDocumentSize = null;
+        } else if (i < mDocumentSizeList.size()) {
+            mCurrentDocumentSize = mDocumentSizeList.get(i);
+            saveData(mContext);
         } else {
-            throw new IndexOutOfBoundsException(String.format(Locale.US, "position <%d> learger than list size <%s>", new Object[]{Integer.valueOf(i), Integer.valueOf(this.mDocumentSizeList.size())}));
+            throw new IndexOutOfBoundsException(String.format(Locale.US, "position <%d> learger than list size <%s>", new Object[]{Integer.valueOf(i), Integer.valueOf(mDocumentSizeList.size())}));
         }
     }
 
     public void select(DocumentSizeInfo documentSizeInfo) {
         if (documentSizeInfo != null) {
-            int indexOf = this.mDocumentSizeList.indexOf(documentSizeInfo);
+            int indexOf = mDocumentSizeList.indexOf(documentSizeInfo);
             if (indexOf >= 0) {
-                this.mCurrentDocumentSize = this.mDocumentSizeList.get(indexOf);
+                mCurrentDocumentSize = mDocumentSizeList.get(indexOf);
             } else {
-                this.mDocumentSizeList.add(documentSizeInfo);
-                this.mCurrentDocumentSize = documentSizeInfo;
+                mDocumentSizeList.add(documentSizeInfo);
+                mCurrentDocumentSize = documentSizeInfo;
             }
-            saveData(this.mContext);
+            saveData(mContext);
             return;
         }
         throw new IllegalArgumentException("DocumentSizeInfo is null");
     }
 
     public int getCurrentDocumentSizePosition() {
-        Iterator it = this.mDocumentSizeList.iterator();
+        Iterator it = mDocumentSizeList.iterator();
         int i = 0;
         while (it.hasNext()) {
-            if (((DocumentSizeInfo) it.next()) == this.mCurrentDocumentSize) {
+            if (((DocumentSizeInfo) it.next()) == mCurrentDocumentSize) {
                 return i;
             }
             i++;
@@ -191,11 +191,11 @@ public class RegistedDocumentSizeList {
     }
 
     public Iterator<DocumentSizeInfo> getIterator() {
-        return this.mDocumentSizeList.iterator();
+        return mDocumentSizeList.iterator();
     }
 
     public int indexOf(DocumentSizeInfo documentSizeInfo) {
-        LinkedList<DocumentSizeInfo> linkedList = this.mDocumentSizeList;
+        LinkedList<DocumentSizeInfo> linkedList = mDocumentSizeList;
         if (linkedList == null) {
             return -1;
         }
@@ -203,8 +203,8 @@ public class RegistedDocumentSizeList {
     }
 
     private void initData() {
-        this.mDocumentSizeList.clear();
-        this.mCurrentDocumentSize = null;
+        mDocumentSizeList.clear();
+        mCurrentDocumentSize = null;
     }
 
     private void saveData(Context context) {
@@ -213,8 +213,8 @@ public class RegistedDocumentSizeList {
             fileOutputStream = context.openFileOutput(REGISTED_DOCUMENTSIZE_LIST_FILENAME, 0);
             JSONObject jSONObject = new JSONObject();
             jSONObject.put("version", 1);
-            jSONObject.put("DocumentSizeInfoList", DocumentSizeInfo.makeDocumentSizeInfoList(this.mDocumentSizeList));
-            jSONObject.put("currentDocumentSize", this.mCurrentDocumentSize);
+            jSONObject.put("DocumentSizeInfoList", DocumentSizeInfo.makeDocumentSizeInfoList(mDocumentSizeList));
+            jSONObject.put("currentDocumentSize", mCurrentDocumentSize);
             fileOutputStream.write(jSONObject.toString().getBytes());
             if (fileOutputStream == null) {
                 return;

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

@@ -138,11 +138,11 @@ public class EscanI2Lib {
         private int mValue;
 
         private DoubleFeedLevel(int i) {
-            this.mValue = i;
+            mValue = i;
         }
 
         public int getValue() {
-            return this.mValue;
+            return mValue;
         }
     }
 
@@ -177,14 +177,14 @@ public class EscanI2Lib {
 
     public synchronized int initializeLibrary() {
         int initializeLibraryJni;
-        if (!this.mLibraryInitialized) {
-            this.mLibraryInitialized = false;
-            this.mSetScannerDone = false;
-            this.mScannerLocked = false;
-            this.mSetPaperSize = false;
+        if (!mLibraryInitialized) {
+            mLibraryInitialized = false;
+            mSetScannerDone = false;
+            mScannerLocked = false;
+            mSetPaperSize = false;
             initializeLibraryJni = sEscanI2NativeInterface.initializeLibraryJni();
             if (initializeLibraryJni == 0) {
-                this.mLibraryInitialized = true;
+                mLibraryInitialized = true;
             }
             sEscanI2NativeInterface.setPageWriteCallback(new EscanI2NativeInterface.PageWriteCallback() {
                 public void pageWriteDone(int i, int i2) {
@@ -242,8 +242,8 @@ public class EscanI2Lib {
     }
 
     public synchronized int setScanner(String str) {
-        if (this.mLibraryInitialized) {
-            this.mSetScannerDone = true;
+        if (mLibraryInitialized) {
+            mSetScannerDone = true;
         } else {
             throw new RuntimeException("initializeLibrary() has not been called.");
         }
@@ -251,9 +251,9 @@ public class EscanI2Lib {
     }
 
     public int waitStartRequest() {
-        this.mWaitStartRequest = true;
+        mWaitStartRequest = true;
         int waitStartRequest = sEscanI2NativeInterface.waitStartRequest();
-        this.mWaitStartRequest = false;
+        mWaitStartRequest = false;
         return trunsErrorCode(waitStartRequest, false);
     }
 
@@ -263,7 +263,7 @@ public class EscanI2Lib {
     }
 
     public synchronized int setPaperSize(ScanSize.PaperSize paperSize, int i, int i2, boolean z) {
-        if (!this.mSetScannerDone) {
+        if (!mSetScannerDone) {
             throw new RuntimeException("setScanner() has not been called.");
         } else if (checkResolution(i, i2)) {
             int[] iArr = ScanSize.get300DpiPixelFromPaperSize(paperSize);
@@ -275,20 +275,20 @@ public class EscanI2Lib {
             }
             if (!z) {
                 if (!isDeviceChige()) {
-                    this.moffsetX = (i3 - iArr[0]) / 2;
-                    this.moffsetY = 0;
-                    this.mwidth = iArr[0];
-                    this.mheight = iArr[1];
-                    this.mresolutionMain = i;
-                    this.mresolutionSub = i2;
+                    moffsetX = (i3 - iArr[0]) / 2;
+                    moffsetY = 0;
+                    mwidth = iArr[0];
+                    mheight = iArr[1];
+                    mresolutionMain = i;
+                    mresolutionSub = i2;
                 }
             }
-            this.moffsetX = 0;
-            this.moffsetY = 0;
-            this.mwidth = iArr[0];
-            this.mheight = iArr[1];
-            this.mresolutionMain = i;
-            this.mresolutionSub = i2;
+            moffsetX = 0;
+            moffsetY = 0;
+            mwidth = iArr[0];
+            mheight = iArr[1];
+            mresolutionMain = i;
+            mresolutionSub = i2;
         } else {
             throw new RuntimeException(String.format(Locale.US, "%dx%d dpi is not supported.", new Object[]{Integer.valueOf(i), Integer.valueOf(i2)}));
         }
@@ -299,32 +299,32 @@ public class EscanI2Lib {
         ImageFormat imageFormat2;
         int trunsErrorCode;
         synchronized (this) {
-            if (this.mLibraryInitialized) {
-                this.mautoCtop = autoCrop.ordinal();
-                this.mautoSkew = autoSkew.ordinal();
-                this.mcolorMode = colorMode;
-                this.muserGamma = gamma;
-                this.mlookupTableNo = i;
-                this.minputSource = inputUnit;
-                this.mMaxScanSheets = i2;
-                this.mDuplex = 0;
+            if (mLibraryInitialized) {
+                mautoCtop = autoCrop.ordinal();
+                mautoSkew = autoSkew.ordinal();
+                mcolorMode = colorMode;
+                muserGamma = gamma;
+                mlookupTableNo = i;
+                minputSource = inputUnit;
+                mMaxScanSheets = i2;
+                mDuplex = 0;
                 if (z) {
-                    this.mDuplex = 1;
+                    mDuplex = 1;
                 }
-                this.marg_over_scan = 0;
+                marg_over_scan = 0;
                 if (!z2 || isDeviceChige()) {
                     imageFormat2 = imageFormat;
                 } else {
-                    this.marg_over_scan = 1;
+                    marg_over_scan = 1;
                     imageFormat2 = imageFormat;
                 }
-                this.mimageFormat = imageFormat2;
-                this.marg_jpeg_quality = i4;
-                this.marg_threshold = i5;
-                this.mdoubleFeedLevel = doubleFeedLevel;
-                this.mbufferSize = 65536;
-                this.mScannerLocked = true;
-                trunsErrorCode = trunsErrorCode(sEscanI2NativeInterface.startScan(this.moffsetX, this.moffsetY, this.mwidth, this.mheight, this.mautoCtop, this.mautoSkew, this.mresolutionMain, this.mresolutionSub, this.mcolorMode.ordinal(), this.muserGamma.ordinal(), this.mlookupTableNo, this.minputSource.ordinal(), this.mDuplex > 0 ? this.mMaxScanSheets * 2 : this.mMaxScanSheets, i3, this.mDuplex, this.marg_over_scan, this.mimageFormat.ordinal(), this.marg_jpeg_quality, this.marg_threshold, this.mdoubleFeedLevel.getValue(), this.mbufferSize), true);
+                mimageFormat = imageFormat2;
+                marg_jpeg_quality = i4;
+                marg_threshold = i5;
+                mdoubleFeedLevel = doubleFeedLevel;
+                mbufferSize = 65536;
+                mScannerLocked = true;
+                trunsErrorCode = trunsErrorCode(sEscanI2NativeInterface.startScan(moffsetX, moffsetY, mwidth, mheight, mautoCtop, mautoSkew, mresolutionMain, mresolutionSub, mcolorMode.ordinal(), muserGamma.ordinal(), mlookupTableNo, minputSource.ordinal(), mDuplex > 0 ? mMaxScanSheets * 2 : mMaxScanSheets, i3, mDuplex, marg_over_scan, mimageFormat.ordinal(), marg_jpeg_quality, marg_threshold, mdoubleFeedLevel.getValue(), mbufferSize), true);
             } else {
                 throw new RuntimeException("initializeLibrary() has not been called.");
             }
@@ -337,7 +337,7 @@ public class EscanI2Lib {
         ScanI2Params scanI2Params2 = scanI2Params;
         synchronized (this) {
             int startScan = sEscanI2NativeInterface.startScan(i3, i4, i, i2, scanI2Params2.autoCrop.ordinal(), scanI2Params2.autoSkew.ordinal(), scanI2Params2.resolutionMain, scanI2Params2.resolutionSub, scanI2Params2.colorMode.ordinal(), scanI2Params2.userGamma.ordinal(), scanI2Params2.lookupTableNo, scanI2Params2.inputUnit.ordinal(), scanI2Params2.maxScanSheets, scanI2Params2.maxWriteSheets, scanI2Params2.duplex ? 1 : 0, scanI2Params2.overScan ? 1 : 0, imageFormat.ordinal(), i5, i6, scanI2Params2.doubleFeedLevel.getValue(), i7);
-            this.mScannerLocked = true;
+            mScannerLocked = true;
             trunsErrorCode = trunsErrorCode(startScan, true);
         }
         return trunsErrorCode;
@@ -380,11 +380,11 @@ public class EscanI2Lib {
     }
 
     public int writeScanImage(int i, String str, String str2) {
-        if (!this.mScannerLocked) {
+        if (!mScannerLocked) {
             throw new RuntimeException("startScan() has not been called");
         } else if (str == null) {
             throw new IllegalArgumentException("outfile_fmt_a must not be null.");
-        } else if (this.mDuplex <= 0 || str2 != null) {
+        } else if (mDuplex <= 0 || str2 != null) {
             return trunsErrorCode(sEscanI2NativeInterface.scan(i, str, str2), false);
         } else {
             throw new IllegalArgumentException("outfile_fmt_b must not be null.");
@@ -392,13 +392,13 @@ public class EscanI2Lib {
     }
 
     public void setObserver(Observer observer) {
-        synchronized (this.mObserverLock) {
-            this.mObserver = observer;
+        synchronized (mObserverLock) {
+            mObserver = observer;
         }
     }
 
     public int getScanPages(int i) {
-        if (this.mLibraryInitialized) {
+        if (mLibraryInitialized) {
             return sEscanI2NativeInterface.getScanPages(i);
         }
         throw new RuntimeException("initializeLibrary() has not been called.");
@@ -465,9 +465,9 @@ public class EscanI2Lib {
     }
 
     private void updatePages(int i, int i2) {
-        synchronized (this.mObserverLock) {
-            if (this.mObserver != null) {
-                this.mObserver.update(i, i2);
+        synchronized (mObserverLock) {
+            if (mObserver != null) {
+                mObserver.update(i, i2);
             }
         }
     }

+ 3 - 3
app/src/main/java/com/epson/lib/escani2/EscanI2NativeIf.java

@@ -58,13 +58,13 @@ class EscanI2NativeIf implements EscanI2NativeInterface {
     }
 
     private synchronized int pageWriteEndCallback(int i, int i2) {
-        if (this.mPageWriteCallback != null) {
-            this.mPageWriteCallback.pageWriteDone(i, i2);
+        if (mPageWriteCallback != null) {
+            mPageWriteCallback.pageWriteDone(i, i2);
         }
         return 1;
     }
 
     public synchronized void setPageWriteCallback(EscanI2NativeInterface.PageWriteCallback pageWriteCallback) {
-        this.mPageWriteCallback = pageWriteCallback;
+        mPageWriteCallback = pageWriteCallback;
     }
 }

+ 5 - 5
app/src/main/java/com/epson/lib/escani2/ScanI2PropertyTaker.java

@@ -11,24 +11,24 @@ public class ScanI2PropertyTaker {
         EscanI2Lib instance = EscanI2Lib.getInstance();
         int initializeLibrary = instance.initializeLibrary();
         if (initializeLibrary != 0) {
-            this.mEscanI2LibError = initializeLibrary;
+            mEscanI2LibError = initializeLibrary;
             return null;
         }
         try {
             int scanner = instance.setScanner(str);
             if (scanner != 0) {
-                this.mEscanI2LibError = scanner;
+                mEscanI2LibError = scanner;
                 return null;
             }
             int scannerInfo = instance.getScannerInfo(i2LibScannerInfoAndCapability.scannerI2Info);
             if (scannerInfo != 0) {
-                this.mEscanI2LibError = scannerInfo;
+                mEscanI2LibError = scannerInfo;
                 instance.releaseLibrary();
                 return null;
             }
             int capability = instance.getCapability(i2LibScannerInfoAndCapability.scannerI2Capability);
             if (capability != 0) {
-                this.mEscanI2LibError = capability;
+                mEscanI2LibError = capability;
                 instance.releaseLibrary();
                 return null;
             }
@@ -40,6 +40,6 @@ public class ScanI2PropertyTaker {
     }
 
     public int getEscanI2LibError() {
-        return this.mEscanI2LibError;
+        return mEscanI2LibError;
     }
 }

+ 8 - 8
app/src/main/java/com/epson/lib/escani2/ScanI2Runner.java

@@ -7,31 +7,31 @@ public class ScanI2Runner {
     private int[] mScanPages;
 
     public int[] getScanPages() {
-        return this.mScanPages;
+        return mScanPages;
     }
 
     public boolean isCancelScan() {
-        return this.mCancelScan;
+        return mCancelScan;
     }
 
     private void setCancelScan(boolean z) {
-        this.mCancelScan = z;
+        mCancelScan = z;
     }
 
     public ScanI2Runner() {
-        this.mScanPages = new int[2];
-        this.mEscanI2Lib = EscanI2Lib.getInstance();
-        this.mCancelScan = false;
+        mScanPages = new int[2];
+        mEscanI2Lib = EscanI2Lib.getInstance();
+        mCancelScan = false;
     }
 
     public ScanI2Runner(EscanI2Lib escanI2Lib) {
-        this.mScanPages = new int[2];
+        mScanPages = new int[2];
         throw new UnsupportedOperationException("ScanI2Runner(EscanI2Lib) is test only.");
     }
 
     public void cancelScan() {
         setCancelScan(true);
-        EscanI2Lib escanI2Lib = this.mEscanI2Lib;
+        EscanI2Lib escanI2Lib = mEscanI2Lib;
         if (escanI2Lib != null) {
             escanI2Lib.cancelScan();
         }

+ 25 - 25
app/src/main/java/com/epson/lib/escani2/ScanSize.java

@@ -68,17 +68,17 @@ public class ScanSize implements Serializable {
     }
 
     public ScanSize(PaperSize paperSize, boolean z) {
-        this.mSizeType = paperSize;
-        this.mPortrait = z;
+        mSizeType = paperSize;
+        mPortrait = z;
     }
 
     public ScanSize(int i, int i2, int i3, int i4) {
-        this.mSizeType = PaperSize.PIXEL;
-        this.mPixelWidth = i;
-        this.mPixelHeight = i2;
-        this.mOffsetX = i3;
-        this.mOffsetY = i4;
-        this.mPortrait = true;
+        mSizeType = PaperSize.PIXEL;
+        mPixelWidth = i;
+        mPixelHeight = i2;
+        mOffsetX = i3;
+        mOffsetY = i4;
+        mPortrait = true;
     }
 
     public boolean equals(Object obj) {
@@ -86,35 +86,35 @@ public class ScanSize implements Serializable {
             return false;
         }
         ScanSize scanSize = (ScanSize) obj;
-        if (!this.mSizeType.equals(scanSize.mSizeType)) {
+        if (!mSizeType.equals(scanSize.mSizeType)) {
             return false;
         }
-        switch (this.mSizeType) {
+        switch (mSizeType) {
             case PIXEL:
-                if (this.mPixelWidth == scanSize.mPixelWidth && this.mPixelHeight == scanSize.mPixelHeight && this.mOffsetX == scanSize.mOffsetX && this.mOffsetY == scanSize.mOffsetY) {
+                if (mPixelWidth == scanSize.mPixelWidth && mPixelHeight == scanSize.mPixelHeight && mOffsetX == scanSize.mOffsetX && mOffsetY == scanSize.mOffsetY) {
                     return true;
                 }
                 return false;
             case MAX:
                 return true;
             default:
-                return this.mPortrait;
+                return mPortrait;
         }
     }
 
     public int hashCode() {
-        if (this.mSizeType == PaperSize.PIXEL) {
-            return (((((((this.mSizeType.hashCode() * 31) + this.mPixelWidth) * 31) + this.mPixelHeight) * 31) + this.mOffsetX) * 31) + this.mOffsetY;
+        if (mSizeType == PaperSize.PIXEL) {
+            return (((((((mSizeType.hashCode() * 31) + mPixelWidth) * 31) + mPixelHeight) * 31) + mOffsetX) * 31) + mOffsetY;
         }
-        return this.mSizeType.hashCode();
+        return mSizeType.hashCode();
     }
 
     public PaperSize getSize() {
-        return this.mSizeType;
+        return mSizeType;
     }
 
     public boolean isPixelSize() {
-        return this.mSizeType == PaperSize.PIXEL;
+        return mSizeType == PaperSize.PIXEL;
     }
 
     public int[] getValidScanSize(ScannerI2Info scannerI2Info, ScanI2Params scanI2Params) {
@@ -210,14 +210,14 @@ public class ScanSize implements Serializable {
     }
 
     private int[] getPixel(ScannerI2Info scannerI2Info, EscanI2Lib.InputUnit inputUnit, int i, int i2) {
-        if (this.mSizeType == PaperSize.MAX) {
+        if (mSizeType == PaperSize.MAX) {
             return scannerI2Info.getSensorPixelSize(inputUnit, i, i2);
         }
-        if (this.mSizeType == PaperSize.PIXEL) {
-            return new int[]{this.mPixelWidth, this.mPixelHeight};
+        if (mSizeType == PaperSize.PIXEL) {
+            return new int[]{mPixelWidth, mPixelHeight};
         }
-        int[] iArr = get300DpiPixelFromPaperSize(this.mSizeType);
-        if (!this.mPortrait) {
+        int[] iArr = get300DpiPixelFromPaperSize(mSizeType);
+        if (!mPortrait) {
             int i3 = iArr[0];
             iArr[0] = iArr[1];
             iArr[1] = i3;
@@ -232,9 +232,9 @@ public class ScanSize implements Serializable {
     }
 
     private int[] getOffset(ScannerI2Info scannerI2Info, EscanI2Lib.InputUnit inputUnit, int i, int i2) {
-        if (this.mSizeType == PaperSize.PIXEL) {
-            return new int[]{this.mOffsetX, this.mOffsetY};
-        } else if (this.mSizeType == PaperSize.MAX) {
+        if (mSizeType == PaperSize.PIXEL) {
+            return new int[]{mOffsetX, mOffsetY};
+        } else if (mSizeType == PaperSize.MAX) {
             return new int[]{0, 0};
         } else {
             int[] iArr = {0, 0};

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

@@ -30,12 +30,12 @@ public class AltViewImageAdapter extends BaseAdapter implements CommonDefine {
     }
 
     public AltViewImageAdapter(Context context) {
-        this.mContext = context;
+        mContext = context;
         BitmapFactory.Options options = new BitmapFactory.Options();
         options.inPurgeable = true;
         options.inScaled = false;
         try {
-            this.mSelectPictureBitmap = BitmapFactory.decodeResource(this.mContext.getResources(), R.C2136drawable.select_picture, options);
+            mSelectPictureBitmap = BitmapFactory.decodeResource(mContext.getResources(), R.C2136drawable.select_picture, options);
         } catch (OutOfMemoryError e) {
             EPLog.m307e(TAG, "BitmapFactory.decodeResource Error " + e.getMessage());
         }
@@ -50,7 +50,7 @@ public class AltViewImageAdapter extends BaseAdapter implements CommonDefine {
         RelativeLayout relativeLayout;
         ImageItem imageItem;
         if (view == null) {
-            relativeLayout = new RelativeLayout(this.mContext);
+            relativeLayout = new RelativeLayout(mContext);
             relativeLayout.setLayoutParams(new AbsListView.LayoutParams(this.itmW, this.itmH));
             relativeLayout.setGravity(17);
         } else {
@@ -58,16 +58,16 @@ public class AltViewImageAdapter extends BaseAdapter implements CommonDefine {
         }
         ImageView imageView = (ImageView) relativeLayout.getChildAt(0);
         if (imageView == null) {
-            imageView = new ImageView(this.mContext);
+            imageView = new ImageView(mContext);
             imageView.setLayoutParams(new ViewGroup.LayoutParams(-1, -1));
             imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
             relativeLayout.addView(imageView, 0);
         }
-        if (this.mImageItemList.size() < 0 || this.mImageItemList.size() <= i) {
+        if (mImageItemList.size() < 0 || mImageItemList.size() <= i) {
             imageItem = null;
         } else {
             try {
-                imageItem = this.mImageItemList.get(i);
+                imageItem = mImageItemList.get(i);
             } catch (NullPointerException e) {
                 EPLog.m316v("null pointer Exception", "line 46 <> View Image Adapter");
                 e.printStackTrace();
@@ -93,13 +93,13 @@ public class AltViewImageAdapter extends BaseAdapter implements CommonDefine {
             ImageView imageView2 = (ImageView) relativeLayout.getChildAt(1);
             if (imageItem.getSelected() != 0) {
                 if (imageView2 == null) {
-                    ImageView imageView3 = new ImageView(this.mContext);
+                    ImageView imageView3 = new ImageView(mContext);
                     try {
                         imageView3.setLayoutParams(new ViewGroup.LayoutParams(-1, -1));
                         imageView3.setScaleType(ImageView.ScaleType.FIT_XY);
                         imageView3.setImageDrawable((Drawable) null);
                         imageView3.setBackground((Drawable) null);
-                        imageView3.setImageBitmap(this.mSelectPictureBitmap);
+                        imageView3.setImageBitmap(mSelectPictureBitmap);
                     } catch (OutOfMemoryError e3) {
                         EPLog.m307e(TAG, "setImageBitmap Error" + e3.getMessage());
                         System.runFinalization();
@@ -120,27 +120,27 @@ public class AltViewImageAdapter extends BaseAdapter implements CommonDefine {
     }
 
     public int getCount() {
-        return this.mImageItemList.size();
+        return mImageItemList.size();
     }
 
     public Object getItem(int i) {
-        return this.mImageItemList.get(i);
+        return mImageItemList.get(i);
     }
 
     public ImageItem getImageItem(int i) {
-        return this.mImageItemList.get(i);
+        return mImageItemList.get(i);
     }
 
     public void add(ImageItem imageItem) {
-        this.mImageItemList.add(imageItem);
+        mImageItemList.add(imageItem);
     }
 
     public void clearImageItem() {
-        this.mImageItemList.clear();
+        mImageItemList.clear();
     }
 
     public void recycleBitmap() {
-        for (ImageItem bitmap : this.mImageItemList) {
+        for (ImageItem bitmap : mImageItemList) {
             Bitmap bitmap2 = bitmap.getBitmap();
             if (bitmap2 != null) {
                 bitmap2.recycle();

+ 18 - 18
app/src/main/java/com/epson/memcardacc/BitmapCache.java

@@ -20,21 +20,21 @@ public class BitmapCache {
     private int mThumbnailWidth;
 
     public boolean setDirectory(File file, File file2) {
-        this.mCacheDir = file;
-        this.mTempolaryDownloadDir = file2;
+        mCacheDir = file;
+        mTempolaryDownloadDir = file2;
         return initEnv();
     }
 
     private boolean initEnv() {
-        if (!checkDirectory(this.mCacheDir) || !checkDirectory(this.mTempolaryDownloadDir)) {
+        if (!checkDirectory(mCacheDir) || !checkDirectory(mTempolaryDownloadDir)) {
             return false;
         }
-        new File(this.mCacheDir, MemcardConfig.MAP_FILE_NAME).exists();
+        new File(mCacheDir, MemcardConfig.MAP_FILE_NAME).exists();
         return true;
     }
 
     public boolean checkSettings() {
-        return checkDirectory(this.mCacheDir) && checkDirectory(this.mTempolaryDownloadDir);
+        return checkDirectory(mCacheDir) && checkDirectory(mTempolaryDownloadDir);
     }
 
     private boolean checkDirectory(File file) {
@@ -51,7 +51,7 @@ public class BitmapCache {
     }
 
     public void setCifsAccess(CifsAccess cifsAccess) {
-        this.mCifsAccess = cifsAccess;
+        mCifsAccess = cifsAccess;
     }
 
     private void deleteDir(File file) {
@@ -64,27 +64,27 @@ public class BitmapCache {
     }
 
     public void clearCache() {
-        deleteDir(this.mCacheDir);
-        deleteDir(this.mTempolaryDownloadDir);
+        deleteDir(mCacheDir);
+        deleteDir(mTempolaryDownloadDir);
     }
 
     public Bitmap makeThumbnailBitmap(String str, String str2) {
         File file;
         try {
-            file = new File(this.mTempolaryDownloadDir, str);
+            file = new File(mTempolaryDownloadDir, str);
             try {
-                if (this.mCifsAccess.readFromPrinterMemcard(str2, file.toString()) != 0) {
+                if (mCifsAccess.readFromPrinterMemcard(str2, file.toString()) != 0) {
                     if (file.exists()) {
                         file.delete();
                     }
                     return null;
                 }
                 int exifRotation = getExifRotation(file);
-                int i = this.mThumbnailWidth;
-                int i2 = this.mThumbnailHeight;
+                int i = mThumbnailWidth;
+                int i2 = mThumbnailHeight;
                 if (exifRotation == 90 || exifRotation == 270) {
-                    i = this.mThumbnailHeight;
-                    i2 = this.mThumbnailWidth;
+                    i = mThumbnailHeight;
+                    i2 = mThumbnailWidth;
                 }
                 Bitmap makeThumbNail = ImageUtil.makeThumbNail(file, new ImageUtil.WidthHeight(i, i2));
                 if (exifRotation == 0) {
@@ -223,13 +223,13 @@ public class BitmapCache {
     }
 
     private Bitmap getBitmapFromCache(String str) {
-        File file = (File) this.mCacheHashMap.get(str);
+        File file = (File) mCacheHashMap.get(str);
         if (file == null) {
             return null;
         }
         Bitmap decodeFile = BitmapFactory.decodeFile(file.toString());
         if (decodeFile == null) {
-            this.mCacheHashMap.remove(str);
+            mCacheHashMap.remove(str);
         }
         return decodeFile;
     }
@@ -252,7 +252,7 @@ public class BitmapCache {
     }
 
     public void setSize(int i, int i2) {
-        this.mThumbnailWidth = i;
-        this.mThumbnailHeight = i2;
+        mThumbnailWidth = i;
+        mThumbnailHeight = i2;
     }
 }

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

@@ -33,9 +33,9 @@ public class CifsAccess {
 
     public int initDefault(Context context, int i) {
         if (i != 2) {
-            this.mStorageSet = MemcardConfig.GENERIC_STORAGE_SET;
+            mStorageSet = MemcardConfig.GENERIC_STORAGE_SET;
         } else {
-            this.mStorageSet = MemcardConfig.PHOTO_COPY_STORAGE_SET;
+            mStorageSet = MemcardConfig.PHOTO_COPY_STORAGE_SET;
         }
         try {
             return init(MemcardUtil.getPrinterIpAddress(context), TimeZone.getDefault().getRawOffset() / DateUtils.MILLIS_IN_HOUR);
@@ -121,7 +121,7 @@ public class CifsAccess {
                 EPLog.m318w("CifsAccess", "cifsSemaphore.tryAcquire() can not get semaphore.");
                 return false;
             }
-            this.mGotCifsLibSemaphore = true;
+            mGotCifsLibSemaphore = true;
             return true;
         } catch (InterruptedException unused) {
             EPLog.m313i("CifsAccess", "cifsSemaphore.tryAcquire() interrupted.");
@@ -130,9 +130,9 @@ public class CifsAccess {
     }
 
     protected synchronized void releaseCifsLibSemaphore() {
-        if (this.mGotCifsLibSemaphore) {
+        if (mGotCifsLibSemaphore) {
             getCifsLibSemaphore().release();
-            this.mGotCifsLibSemaphore = false;
+            mGotCifsLibSemaphore = false;
         }
     }
 
@@ -143,7 +143,7 @@ public class CifsAccess {
     public int checkStorage() {
         int i = 0;
         while (true) {
-            String[] strArr = this.mStorageSet;
+            String[] strArr = mStorageSet;
             if (i >= strArr.length) {
                 return 0;
             }
@@ -190,7 +190,7 @@ public class CifsAccess {
         if (i <= 0) {
             return -1;
         }
-        return connectStorage(this.mStorageSet[i - 1], str, str2);
+        return connectStorage(mStorageSet[i - 1], str, str2);
     }
 
     public int connectDefaultStorageWidthDefaultAthInfo(int i) {
@@ -317,7 +317,7 @@ public class CifsAccess {
     }
 
     protected boolean checkCifsLibStatus() {
-        return this.mGotCifsLibSemaphore && sCifsLib != null;
+        return mGotCifsLibSemaphore && sCifsLib != null;
     }
 
     public int getErrorCode() {

+ 7 - 7
app/src/main/java/com/epson/memcardacc/CifsFileInfo.java

@@ -8,29 +8,29 @@ public class CifsFileInfo implements Serializable {
     public String mFileName;
 
     public CifsFileInfo(String str, int i) {
-        this.mFileName = str;
-        this.mAttribute = i;
+        mFileName = str;
+        mAttribute = i;
     }
 
     public boolean isDirectory() {
-        return (this.mAttribute & 16) != 0;
+        return (mAttribute & 16) != 0;
     }
 
     public boolean isReadableDir() {
-        int i = this.mAttribute;
+        int i = mAttribute;
         return (i & 16) != 0 && (i & 6) == 0;
     }
 
     public boolean readableNormalFile() {
-        int i = this.mAttribute;
+        int i = mAttribute;
         return (i & 16) == 0 && (i & 6) == 0;
     }
 
     public boolean isReadable() {
-        return (this.mAttribute & 6) == 0;
+        return (mAttribute & 6) == 0;
     }
 
     public boolean equals(Object obj) {
-        return this.mFileName.equals(((CifsFileInfo) obj).mFileName);
+        return mFileName.equals(((CifsFileInfo) obj).mFileName);
     }
 }

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

@@ -68,25 +68,25 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView((int) R.layout.activity_confirm_read_memcard);
-        this.mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
-        this.mModelDialog.getDialogJob().observe(this, new Observer() {
+        mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
+        mModelDialog.getDialogJob().observe(this, new Observer() {
             public final void onChanged(Object obj) {
                 ConfirmReadMemcard.lambda$onCreate$0(ConfirmReadMemcard.this, (Deque) obj);
             }
         });
         setActionBar((int) R.string.memcard_title_copy_confirm, true);
-        this.mFileNumText = (TextView) findViewById(R.id.textFileNumber);
-        this.mFileSizeText = (TextView) findViewById(R.id.textFileSize);
-        this.mFileSizeText.setText(CommonDefine.QUESTION_MARK);
-        this.mCopyTargetPathText = (TextView) findViewById(R.id.textWriteFolder);
+        mFileNumText = (TextView) findViewById(R.id.textFileNumber);
+        mFileSizeText = (TextView) findViewById(R.id.textFileSize);
+        mFileSizeText.setText(CommonDefine.QUESTION_MARK);
+        mCopyTargetPathText = (TextView) findViewById(R.id.textWriteFolder);
         Intent intent = getIntent();
-        this.mImageList = intent.getStringArrayListExtra(KEY_IMAGE_LIST);
-        if (this.mImageList == null) {
-            this.mImageList = new ArrayList<>();
+        mImageList = intent.getStringArrayListExtra(KEY_IMAGE_LIST);
+        if (mImageList == null) {
+            mImageList = new ArrayList<>();
         }
-        this.mMemcardStorageType = intent.getIntExtra("memcard_storage_type", 1);
-        int size = this.mImageList.size();
-        this.mFileNumText.setText(String.format(getResources().getString(R.string.memcard_file_num_format), new Object[]{Integer.valueOf(size)}));
+        mMemcardStorageType = intent.getIntExtra("memcard_storage_type", 1);
+        int size = mImageList.size();
+        mFileNumText.setText(String.format(getResources().getString(R.string.memcard_file_num_format), new Object[]{Integer.valueOf(size)}));
         setTargetDirectory(MemcardConfig.DEFAULT_READER_LOCAL_DIRECTORY);
         this.doTotalFileSizeCalc = true;
     }
@@ -118,8 +118,8 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         }
         this.isKeepSimleApConnect = false;
         if (this.doTotalFileSizeCalc) {
-            this.mTotalFileSizeCalcTask = new TotalFileSizeCalcTask();
-            this.mTotalFileSizeCalcTask.execute(new Void[0]);
+            mTotalFileSizeCalcTask = new TotalFileSizeCalcTask();
+            mTotalFileSizeCalcTask.execute(new Void[0]);
             this.doTotalFileSizeCalc = false;
         }
     }
@@ -138,7 +138,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
     }
 
     protected void onDestroy() {
-        this.mTotalFileSizeCalcTask.cancel(true);
+        mTotalFileSizeCalcTask.cancel(true);
         super.onDestroy();
     }
 
@@ -148,25 +148,25 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
     }
 
     private void localShowDialog(String str) {
-        this.mModelDialog.doShow(str);
+        mModelDialog.doShow(str);
     }
 
     public void setTargetDirectory(String str) {
-        this.mWriteDirectory = str;
-        this.mCopyTargetFolderName = getTargetFolderName();
-        String str2 = this.mCopyTargetFolderName;
+        mWriteDirectory = str;
+        mCopyTargetFolderName = getTargetFolderName();
+        String str2 = mCopyTargetFolderName;
         if (str2 == null) {
             localShowDialog(DIALOG_WRITE_LOCAL_DIR_CANNOT_GET);
             str2 = "";
         }
-        EPLog.m313i(LOG_TAG, "outdir: " + this.mCopyTargetFolderName);
-        this.mCopyTargetPathText.setText(String.format(getResources().getString(R.string.memcard_folder_save_to_format), new Object[]{str2}));
+        EPLog.m313i(LOG_TAG, "outdir: " + mCopyTargetFolderName);
+        mCopyTargetPathText.setText(String.format(getResources().getString(R.string.memcard_folder_save_to_format), new Object[]{str2}));
     }
 
     private String getTargetFolderName() {
         Calendar instance = Calendar.getInstance();
         for (int i = 0; i < 100; i++) {
-            String format = String.format(Locale.US, "%s/%s/%04d%02d%02d%02d%02d%02d", new Object[]{MemcardConfig.BASE_DIRECTORY, this.mWriteDirectory, Integer.valueOf(instance.get(1)), Integer.valueOf(instance.get(2) + 1), Integer.valueOf(instance.get(5)), Integer.valueOf(instance.get(11)), Integer.valueOf(instance.get(12)), Integer.valueOf(i)});
+            String format = String.format(Locale.US, "%s/%s/%04d%02d%02d%02d%02d%02d", new Object[]{MemcardConfig.BASE_DIRECTORY, mWriteDirectory, Integer.valueOf(instance.get(1)), Integer.valueOf(instance.get(2) + 1), Integer.valueOf(instance.get(5)), Integer.valueOf(instance.get(11)), Integer.valueOf(instance.get(12)), Integer.valueOf(i)});
             File file = new File(format);
             if (!file.exists()) {
                 boolean mkdirs = file.mkdirs();
@@ -192,20 +192,20 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
     }
 
     private boolean checkFileSize() {
-        StatFs statFs = new StatFs(new File(MemcardConfig.BASE_DIRECTORY, this.mWriteDirectory).toString());
-        return (this.mTotalFileSize / statFs.getBlockSizeLong()) + ((long) this.mImageList.size()) <= statFs.getAvailableBlocksLong();
+        StatFs statFs = new StatFs(new File(MemcardConfig.BASE_DIRECTORY, mWriteDirectory).toString());
+        return (mTotalFileSize / statFs.getBlockSizeLong()) + ((long) mImageList.size()) <= statFs.getAvailableBlocksLong();
     }
 
     public void updateFileSize(long j) {
-        this.mTotalFileSize = j;
-        this.mFileSizeText.setText(String.format(getResources().getString(R.string.memcard_total_file_size_format), new Object[]{Double.valueOf(((double) this.mTotalFileSize) / 1000000.0d)}));
+        mTotalFileSize = j;
+        mFileSizeText.setText(String.format(getResources().getString(R.string.memcard_total_file_size_format), new Object[]{Double.valueOf(((double) mTotalFileSize) / 1000000.0d)}));
     }
 
     private void startCopyActivity() {
         Intent intent = new Intent(this, MemcardReadProgress.class);
-        intent.putStringArrayListExtra("imageList", this.mImageList);
-        intent.putExtra("target_folder_name", this.mCopyTargetFolderName);
-        intent.putExtra("memcard_storage_type", this.mMemcardStorageType);
+        intent.putStringArrayListExtra("imageList", mImageList);
+        intent.putExtra("target_folder_name", mCopyTargetFolderName);
+        intent.putExtra("memcard_storage_type", mMemcardStorageType);
         startActivityForResult(intent, 1);
         this.isKeepSimleApConnect = true;
     }
@@ -218,8 +218,8 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
     }
 
     public void copy_button_clicked(View view) {
-        this.mCheckAndNextActivityTask = new CheckAndNextActivityTask();
-        this.mCheckAndNextActivityTask.execute(new Void[0]);
+        mCheckAndNextActivityTask = new CheckAndNextActivityTask();
+        mCheckAndNextActivityTask.execute(new Void[0]);
     }
 
     /* JADX WARNING: Can't fix incorrect switch cases order */
@@ -495,34 +495,34 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         }
 
         protected synchronized Long doInBackground(Void... voidArr) {
-            if (this.mCifsAccess.initDefault(ConfirmReadMemcard.this, 1) == 0) {
+            if (mCifsAccess.initDefault(ConfirmReadMemcard.this, 1) == 0) {
                 return -1L;
             }
-            if (this.mCifsAccess.connectDefaultStorageWidthDefaultAthInfo(ConfirmReadMemcard.this.mMemcardStorageType) == 0) {
-                this.mCifsAccess.free();
+            if (mCifsAccess.connectDefaultStorageWidthDefaultAthInfo(ConfirmReadMemcard.mMemcardStorageType) == 0) {
+                mCifsAccess.free();
                 return -1L;
             }
             try {
-                Iterator it = ConfirmReadMemcard.this.mImageList.iterator();
+                Iterator it = ConfirmReadMemcard.mImageList.iterator();
                 long j = 0;
                 while (it.hasNext()) {
                     if (isCancelled()) {
-                        this.mCifsAccess.disconnectStorage();
-                        this.mCifsAccess.free();
+                        mCifsAccess.disconnectStorage();
+                        mCifsAccess.free();
                         return 0L;
                     }
-                    long fileSize = this.mCifsAccess.getFileSize((String) it.next());
+                    long fileSize = mCifsAccess.getFileSize((String) it.next());
                     if (fileSize <= 0) {
                         return -1L;
                     }
                     j += fileSize;
                 }
-                this.mCifsAccess.disconnectStorage();
-                this.mCifsAccess.free();
+                mCifsAccess.disconnectStorage();
+                mCifsAccess.free();
                 return Long.valueOf(j);
             } finally {
-                this.mCifsAccess.disconnectStorage();
-                this.mCifsAccess.free();
+                mCifsAccess.disconnectStorage();
+                mCifsAccess.free();
             }
         }
 
@@ -536,11 +536,11 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
                     ConfirmReadMemcard.this.updateFileSize(l.longValue());
                 }
             }
-            ConfirmReadMemcard.this.mModelDialog.doDismiss(ConfirmReadMemcard.DIALOG_PROGRESS);
+            ConfirmReadMemcard.mModelDialog.doDismiss(ConfirmReadMemcard.DIALOG_PROGRESS);
         }
 
         protected void onPreExecute() {
-            ConfirmReadMemcard.this.mModelDialog.doShow(ConfirmReadMemcard.DIALOG_PROGRESS);
+            ConfirmReadMemcard.mModelDialog.doShow(ConfirmReadMemcard.DIALOG_PROGRESS);
         }
     }
 
@@ -549,7 +549,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         }
 
         protected Integer doInBackground(Void... voidArr) {
-            if (ConfirmReadMemcard.this.mCopyTargetFolderName == null) {
+            if (ConfirmReadMemcard.mCopyTargetFolderName == null) {
                 return 100;
             }
             if (isCancelled()) {
@@ -567,17 +567,17 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
                 case 2:
                     return 10;
                 default:
-                    new File(ConfirmReadMemcard.this.mCopyTargetFolderName).mkdir();
+                    new File(ConfirmReadMemcard.mCopyTargetFolderName).mkdir();
                     return 0;
             }
         }
 
         protected void onCancelled() {
-            ConfirmReadMemcard.this.mModelDialog.doDismiss(ConfirmReadMemcard.DIALOG_PROGRESS);
+            ConfirmReadMemcard.mModelDialog.doDismiss(ConfirmReadMemcard.DIALOG_PROGRESS);
         }
 
         protected void onPostExecute(Integer num) {
-            ConfirmReadMemcard.this.mModelDialog.doDismiss(ConfirmReadMemcard.DIALOG_PROGRESS);
+            ConfirmReadMemcard.mModelDialog.doDismiss(ConfirmReadMemcard.DIALOG_PROGRESS);
             switch (num.intValue()) {
                 case 0:
                     ConfirmReadMemcard.this.startCopyActivity();
@@ -597,8 +597,8 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         }
 
         protected void onPreExecute() {
-            ConfirmReadMemcard.this.mModelDialog.doShow(ConfirmReadMemcard.DIALOG_PROGRESS);
-            if (ConfirmReadMemcard.this.mCopyTargetFolderName == null) {
+            ConfirmReadMemcard.mModelDialog.doShow(ConfirmReadMemcard.DIALOG_PROGRESS);
+            if (ConfirmReadMemcard.mCopyTargetFolderName == null) {
                 ConfirmReadMemcard.this.setTargetDirectory(MemcardConfig.DEFAULT_READER_LOCAL_DIRECTORY);
             }
         }

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

@@ -78,20 +78,20 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView((int) R.layout.activity_confirm_write_memcard);
-        this.mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
-        this.mModelDialog.getDialogJob().observe(this, new Observer() {
+        mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
+        mModelDialog.getDialogJob().observe(this, new Observer() {
             public final void onChanged(Object obj) {
                 ConfirmWriteMemcard.lambda$onCreate$0(ConfirmWriteMemcard.this, (Deque) obj);
             }
         });
         setActionBar((int) R.string.memcard_title_copy_confirm, true);
-        this.mFileNumText = (TextView) findViewById(R.id.textFileNumber);
-        this.mFileSizeText = (TextView) findViewById(R.id.textFileSize);
-        this.mCopyTargetPrinter = (TextView) findViewById(R.id.textWritePrt);
-        this.mCopyTargetPathText = (TextView) findViewById(R.id.textWriteFolder);
-        this.mCopyTargetPathText.setText("");
-        this.mImageList = null;
-        this.mCopyTargetPrinter.setText(String.format(getResources().getString(R.string.memcard_printer_save_to_format), new Object[]{MyPrinter.getCurPrinter(this).getName()}));
+        mFileNumText = (TextView) findViewById(R.id.textFileNumber);
+        mFileSizeText = (TextView) findViewById(R.id.textFileSize);
+        mCopyTargetPrinter = (TextView) findViewById(R.id.textWritePrt);
+        mCopyTargetPathText = (TextView) findViewById(R.id.textWriteFolder);
+        mCopyTargetPathText.setText("");
+        mImageList = null;
+        mCopyTargetPrinter.setText(String.format(getResources().getString(R.string.memcard_printer_save_to_format), new Object[]{MyPrinter.getCurPrinter(this).getName()}));
         this.doDirectoryNameTask = true;
         observeImageConvertFromIntent(getIntent());
     }
@@ -132,7 +132,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
     }
 
     private void observeImageConvert(@NonNull ArrayList<String> arrayList) {
-        this.mModelDialog.doShow(DIALOG_FILE_CONVERT);
+        mModelDialog.doShow(DIALOG_FILE_CONVERT);
         MemCardWriteConvertViewModel memCardWriteConvertViewModel = (MemCardWriteConvertViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(MemCardWriteConvertViewModel.class);
         memCardWriteConvertViewModel.setOrigFileList(arrayList);
         memCardWriteConvertViewModel.getData().observe(this, new Observer<MemCardWriteConvertViewModel.ConvertResult>() {
@@ -147,15 +147,15 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
             finish();
             return;
         }
-        this.mModelDialog.doDismiss(DIALOG_FILE_CONVERT);
-        this.mTotalFileSize = convertResult.totalFileSize;
-        this.mImageList = new ArrayList<>(convertResult.filenameList);
-        updateFileInfo(this.mImageList);
+        mModelDialog.doDismiss(DIALOG_FILE_CONVERT);
+        mTotalFileSize = convertResult.totalFileSize;
+        mImageList = new ArrayList<>(convertResult.filenameList);
+        updateFileInfo(mImageList);
     }
 
     private void updateFileInfo(@Nullable ArrayList<String> arrayList) {
-        this.mFileNumText.setText(String.format(getResources().getString(R.string.memcard_file_num_format), new Object[]{Integer.valueOf(arrayList != null ? arrayList.size() : 0)}));
-        this.mFileSizeText.setText(String.format(getResources().getString(R.string.memcard_total_file_size_format), new Object[]{Double.valueOf(((double) this.mTotalFileSize) / 1000000.0d)}));
+        mFileNumText.setText(String.format(getResources().getString(R.string.memcard_file_num_format), new Object[]{Integer.valueOf(arrayList != null ? arrayList.size() : 0)}));
+        mFileSizeText.setText(String.format(getResources().getString(R.string.memcard_total_file_size_format), new Object[]{Double.valueOf(((double) mTotalFileSize) / 1000000.0d)}));
     }
 
     protected void onResume() {
@@ -172,8 +172,8 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         }
         this.isKeepSimleApConnect = false;
         if (this.doDirectoryNameTask) {
-            this.mDirectoryNameTask = new DirectoryNameTask();
-            this.mDirectoryNameTask.execute(new Void[0]);
+            mDirectoryNameTask = new DirectoryNameTask();
+            mDirectoryNameTask.execute(new Void[0]);
             this.doDirectoryNameTask = false;
         }
     }
@@ -194,18 +194,18 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
     }
 
     private void setWriteDirName(String str) {
-        this.mCopyTargetFolderName = str;
-        if (str != null && this.mCopyTargetFolderName != null) {
+        mCopyTargetFolderName = str;
+        if (str != null && mCopyTargetFolderName != null) {
             runOnUiThread(new Runnable() {
                 public void run() {
-                    ConfirmWriteMemcard.this.mCopyTargetPathText.setText(String.format(ConfirmWriteMemcard.this.getResources().getString(R.string.memcard_folder_save_to_format), new Object[]{ConfirmWriteMemcard.this.mCopyTargetFolderName}));
+                    ConfirmWriteMemcard.mCopyTargetPathText.setText(String.format(ConfirmWriteMemcard.this.getResources().getString(R.string.memcard_folder_save_to_format), new Object[]{ConfirmWriteMemcard.mCopyTargetFolderName}));
                 }
             });
         }
     }
 
     private boolean isWirteDirNameDetermined() {
-        String str = this.mCopyTargetFolderName;
+        String str = mCopyTargetFolderName;
         return str != null && str.length() > 0;
     }
 
@@ -215,8 +215,8 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
     }
 
     public void copy_button_clicked(View view) {
-        this.mCheckAndNextActivity = new CheckAndNextActivityTask();
-        this.mCheckAndNextActivity.execute(new Void[0]);
+        mCheckAndNextActivity = new CheckAndNextActivityTask();
+        mCheckAndNextActivity.execute(new Void[0]);
     }
 
     public void onBackPressed() {
@@ -235,7 +235,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
             if (instance.initDefault(this, 1) == 0) {
                 return 2;
             }
-            if (instance.connectDefaultStorageWidthDefaultAthInfo(this.mMemcardStorageType) == 0) {
+            if (instance.connectDefaultStorageWidthDefaultAthInfo(mMemcardStorageType) == 0) {
                 instance.free();
                 return 2;
             }
@@ -244,7 +244,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
             instance.disconnectStorage();
             instance.free();
             EPLog.m313i(LOG_TAG, "unit :<" + unitSize + "> free: <" + freeUnit + ">");
-            if ((this.mTotalFileSize / ((long) unitSize)) + ((long) this.mImageList.size()) > freeUnit) {
+            if ((mTotalFileSize / ((long) unitSize)) + ((long) mImageList.size()) > freeUnit) {
                 return 1;
             }
             return 0;
@@ -264,7 +264,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
                 instance.free();
                 return null;
             }
-            this.mMemcardStorageType = checkStorage;
+            mMemcardStorageType = checkStorage;
             if (instance.connectDefaultStorageWidthDefaultAthInfo(checkStorage) == 0) {
                 instance.free();
                 return null;
@@ -297,9 +297,9 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
 
     private void startCopyActivity() {
         Intent intent = new Intent(this, MemcardWriteProgress.class);
-        intent.putStringArrayListExtra("imageList", this.mImageList);
-        intent.putExtra("target_folder_name", this.mCopyTargetFolderName);
-        intent.putExtra("memcard_storage_type", this.mMemcardStorageType);
+        intent.putStringArrayListExtra("imageList", mImageList);
+        intent.putExtra("target_folder_name", mCopyTargetFolderName);
+        intent.putExtra("memcard_storage_type", mMemcardStorageType);
         startActivityForResult(intent, 1);
         this.isKeepSimleApConnect = true;
     }
@@ -319,11 +319,11 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
     }
 
     private void loggerCountUp() {
-        this.mImageList.size();
+        mImageList.size();
     }
 
     private void localShowDialog(String str) {
-        this.mModelDialog.doShow(str);
+        mModelDialog.doShow(str);
     }
 
     /* JADX WARNING: Can't fix incorrect switch cases order */
@@ -615,11 +615,11 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
             } else {
                 ConfirmWriteMemcard.this.setWriteDirName(str);
             }
-            ConfirmWriteMemcard.this.mModelDialog.doDismiss(ConfirmWriteMemcard.DIALOG_TARGET_DIRECTORY_NAME_TASK);
+            ConfirmWriteMemcard.mModelDialog.doDismiss(ConfirmWriteMemcard.DIALOG_TARGET_DIRECTORY_NAME_TASK);
         }
 
         protected void onPreExecute() {
-            ConfirmWriteMemcard.this.mModelDialog.doShow(ConfirmWriteMemcard.DIALOG_TARGET_DIRECTORY_NAME_TASK);
+            ConfirmWriteMemcard.mModelDialog.doShow(ConfirmWriteMemcard.DIALOG_TARGET_DIRECTORY_NAME_TASK);
         }
 
         protected String doInBackground(Void... voidArr) {
@@ -657,11 +657,11 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         }
 
         protected void onCancelled() {
-            ConfirmWriteMemcard.this.mModelDialog.doDismiss(ConfirmWriteMemcard.DIALOG_CHECK_AND_NEXT);
+            ConfirmWriteMemcard.mModelDialog.doDismiss(ConfirmWriteMemcard.DIALOG_CHECK_AND_NEXT);
         }
 
         protected void onPostExecute(Integer num) {
-            ConfirmWriteMemcard.this.mModelDialog.doDismiss(ConfirmWriteMemcard.DIALOG_CHECK_AND_NEXT);
+            ConfirmWriteMemcard.mModelDialog.doDismiss(ConfirmWriteMemcard.DIALOG_CHECK_AND_NEXT);
             int intValue = num.intValue();
             switch (intValue) {
                 case 0:
@@ -691,7 +691,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         }
 
         protected void onPreExecute() {
-            ConfirmWriteMemcard.this.mModelDialog.doShow(ConfirmWriteMemcard.DIALOG_CHECK_AND_NEXT);
+            ConfirmWriteMemcard.mModelDialog.doShow(ConfirmWriteMemcard.DIALOG_CHECK_AND_NEXT);
         }
     }
 }

+ 20 - 20
app/src/main/java/com/epson/memcardacc/CopyTask.java

@@ -24,36 +24,36 @@ class CopyTask extends AsyncTaskExecutor<Void, Integer, Integer> {
     private ArrayList<String> mWriteFileList;
 
     public CopyTask(@NonNull MemcardWriteProgress memcardWriteProgress, int i, int i2, @NonNull ArrayList<String> arrayList, @NonNull ArrayList<String> arrayList2, @NonNull String str, @Nullable CommonLog commonLog) {
-        this.mCallback = memcardWriteProgress;
-        this.mCifsAccessStorageType = i;
-        this.mMemcardStorageType = i2;
-        this.mImageList = arrayList;
-        this.mWriteFileList = arrayList2;
-        this.mTargetFolderName = str;
-        this.mLogData = commonLog;
+        mCallback = memcardWriteProgress;
+        mCifsAccessStorageType = i;
+        mMemcardStorageType = i2;
+        mImageList = arrayList;
+        mWriteFileList = arrayList2;
+        mTargetFolderName = str;
+        mLogData = commonLog;
     }
 
     public void setCheck(boolean z, boolean z2) {
-        this.mEscprCheck = z;
+        mEscprCheck = z;
     }
 
     protected void onCancelled() {
         EPLog.m313i(LOG_TAG, "canceled in AsyncTask");
-        this.mCallback.finishWithState(0, 0, this.mLogData);
+        mCallback.finishWithState(0, 0, mLogData);
     }
 
     protected void onPostExecute(Integer num) {
         EPLog.m313i(LOG_TAG, "onPostExecute in AsyncTask");
-        this.mCallback.finishWithState(num.intValue(), this.mErrorCode, this.mLogData);
+        mCallback.finishWithState(num.intValue(), mErrorCode, mLogData);
     }
 
     protected void onPreExecute() {
-        this.mCanceling = false;
-        this.mCallback.setProgress(0, this.mImageList.size());
+        mCanceling = false;
+        mCallback.setProgress(0, mImageList.size());
     }
 
     protected void onProgressUpdate(Integer... numArr) {
-        this.mCallback.setProgress(numArr[0].intValue(), this.mImageList.size());
+        mCallback.setProgress(numArr[0].intValue(), mImageList.size());
     }
 
     protected EscprLibPrinter getEscprLibPrinter() {
@@ -358,24 +358,24 @@ class CopyTask extends AsyncTaskExecutor<Void, Integer, Integer> {
 
     protected boolean checkFileSize(String str, String str2) {
         long fileLength = MemcardUtil.getFileLength(str);
-        long fileSize = this.mCifsAccess.getFileSize(str2);
+        long fileSize = mCifsAccess.getFileSize(str2);
         return fileSize > 0 && fileLength == fileSize;
     }
 
     public void taskCancel() {
-        if (!this.mCanceling) {
-            this.mCanceling = true;
+        if (!mCanceling) {
+            mCanceling = true;
             EPLog.m313i(LOG_TAG, "taskCancel()");
-            this.mCifsAccess.cancel();
+            mCifsAccess.cancel();
             cancel(false);
         }
     }
 
     public void taskCancelByFileSizeZero() {
-        if (!this.mCanceling) {
-            this.mCanceling = true;
+        if (!mCanceling) {
+            mCanceling = true;
             EPLog.m313i(LOG_TAG, "taskCancel()");
-            this.mCifsAccess.cancelByFileSizeZero();
+            mCifsAccess.cancelByFileSizeZero();
             cancel(false);
         }
     }

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

@@ -7,17 +7,17 @@ public class DirectoryCache {
     CifsAccess mCifsAccess;
 
     public void setCifsAccess(CifsAccess cifsAccess) {
-        this.mCifsAccess = cifsAccess;
+        mCifsAccess = cifsAccess;
     }
 
     public LinkedList<CifsFileInfo> getFileList(String str) {
-        LinkedList<CifsFileInfo> linkedList = (LinkedList) this.mCacheHashMap.get(str);
+        LinkedList<CifsFileInfo> linkedList = (LinkedList) mCacheHashMap.get(str);
         if (linkedList != null) {
             return linkedList;
         }
-        LinkedList<CifsFileInfo> fileList = this.mCifsAccess.getFileList(str);
+        LinkedList<CifsFileInfo> fileList = mCifsAccess.getFileList(str);
         if (fileList != null) {
-            this.mCacheHashMap.put(str, fileList);
+            mCacheHashMap.put(str, fileList);
         }
         return fileList;
     }

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

@@ -30,17 +30,17 @@ public class DirectorySelecterActivity extends Activity {
         super.onCreate(bundle);
         setContentView(R.layout.activity_directory_selecter);
         setTitle(getResources().getText(R.string.memcard_folder_save_to_string));
-        this.mBaseDirTextView = (TextView) findViewById(R.id.baseDirText);
-        this.mTargetDir = (EditText) findViewById(R.id.memcardUsername);
-        this.mOkButton = (Button) findViewById(R.id.okButton);
+        mBaseDirTextView = (TextView) findViewById(R.id.baseDirText);
+        mTargetDir = (EditText) findViewById(R.id.memcardUsername);
+        mOkButton = (Button) findViewById(R.id.okButton);
         Intent intent = getIntent();
         String stringExtra = intent.getStringExtra(PARAM_BASE_DIRECTORY);
         String stringExtra2 = intent.getStringExtra(PARAM_DEFAULT_DIR);
-        TextView textView = this.mBaseDirTextView;
+        TextView textView = mBaseDirTextView;
         textView.setText(stringExtra + CommonDefine.SLASH);
-        this.mTargetDir.setText(stringExtra2);
-        this.mTargetDir.addTextChangedListener(new TargetDirTextWatcher());
-        this.mButtonActionProgress = false;
+        mTargetDir.setText(stringExtra2);
+        mTargetDir.addTextChangedListener(new TargetDirTextWatcher());
+        mButtonActionProgress = false;
     }
 
     private void localShowDialog(int i) {
@@ -48,16 +48,16 @@ public class DirectorySelecterActivity extends Activity {
     }
 
     public void ok_button_clicked(View view) {
-        if (!this.mButtonActionProgress) {
-            this.mButtonActionProgress = true;
+        if (!mButtonActionProgress) {
+            mButtonActionProgress = true;
             Intent intent = new Intent();
-            String obj = this.mTargetDir.getText().toString();
+            String obj = mTargetDir.getText().toString();
             if (!MemcardUtil.checkFileName(obj)) {
                 localShowDialog(1);
-                this.mButtonActionProgress = false;
+                mButtonActionProgress = false;
                 return;
             }
-            File file = new File(new File(this.mBaseDirTextView.getText().toString()), obj);
+            File file = new File(new File(mBaseDirTextView.getText().toString()), obj);
             if (file.exists() || file.mkdirs()) {
                 intent.putExtra(RESULT_DIRECTORY, obj);
                 setResult(-1, intent);
@@ -65,13 +65,13 @@ public class DirectorySelecterActivity extends Activity {
                 return;
             }
             localShowDialog(1);
-            this.mButtonActionProgress = false;
+            mButtonActionProgress = false;
         }
     }
 
     public void cancel_button_clicked(View view) {
-        if (!this.mButtonActionProgress) {
-            this.mButtonActionProgress = true;
+        if (!mButtonActionProgress) {
+            mButtonActionProgress = true;
             setResult(0);
             finish();
         }
@@ -88,13 +88,13 @@ public class DirectorySelecterActivity extends Activity {
     }
 
     private void disableOkButton() {
-        this.mOkButton.setClickable(false);
-        this.mOkButton.setEnabled(false);
+        mOkButton.setClickable(false);
+        mOkButton.setEnabled(false);
     }
 
     private void enableOkButton() {
-        this.mOkButton.setEnabled(true);
-        this.mOkButton.setClickable(true);
+        mOkButton.setEnabled(true);
+        mOkButton.setClickable(true);
     }
 
     class TargetDirTextWatcher implements TextWatcher {

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

@@ -25,35 +25,35 @@ public class EscprLibPrinter {
         if (location != 1 && location != 3) {
             return 1;
         }
-        this.mMaintainPrinter = getMaintainPrinter();
-        this.mMaintainPrinter.doInitDriver(context, 2);
-        if (this.mMaintainPrinter.doProbePrinter(i, printerId, ip, location) != 0) {
-            this.mMaintainPrinter = null;
+        mMaintainPrinter = getMaintainPrinter();
+        mMaintainPrinter.doInitDriver(context, 2);
+        if (mMaintainPrinter.doProbePrinter(i, printerId, ip, location) != 0) {
+            mMaintainPrinter = null;
             return 2;
-        } else if (this.mMaintainPrinter.doSetPrinter() != 0) {
-            this.mMaintainPrinter = null;
+        } else if (mMaintainPrinter.doSetPrinter() != 0) {
+            mMaintainPrinter = null;
             return 2;
         } else if (location == 1) {
-            String doGetIp = this.mMaintainPrinter.doGetIp();
+            String doGetIp = mMaintainPrinter.doGetIp();
             if (ip.equals(doGetIp) || !z) {
                 return 0;
             }
             currentPrinter.setIp(doGetIp);
             currentPrinter.setCurPrinter(context);
             return 0;
-        } else if (location != 3 || printerId.equals(this.mMaintainPrinter.doGetId())) {
+        } else if (location != 3 || printerId.equals(mMaintainPrinter.doGetId())) {
             return 0;
         } else {
-            this.mMaintainPrinter = null;
+            mMaintainPrinter = null;
             return 2;
         }
     }
 
     public int getStatus() {
-        if (this.mMaintainPrinter.doGetStatus() != 0) {
+        if (mMaintainPrinter.doGetStatus() != 0) {
             return 4;
         }
-        switch (this.mMaintainPrinter.getMPrinterInfor().getMStatus()[0]) {
+        switch (mMaintainPrinter.getMPrinterInfor().getMStatus()[0]) {
             case 0:
                 return 0;
             case 1:
@@ -68,8 +68,8 @@ public class EscprLibPrinter {
     }
 
     public void release() {
-        if (this.mMaintainPrinter != null) {
-            this.mMaintainPrinter = null;
+        if (mMaintainPrinter != null) {
+            mMaintainPrinter = null;
         }
     }
 

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

@@ -27,8 +27,8 @@ class FileConvertTask extends AsyncTask<Void, Void, ArrayList<String>> {
     }
 
     FileConvertTask(@NonNull ArrayList<String> arrayList, @NonNull ConvertEndListener convertEndListener) {
-        this.mOrgFileList = arrayList;
-        this.mConvertEndListener = convertEndListener;
+        mOrgFileList = arrayList;
+        mConvertEndListener = convertEndListener;
     }
 
     static boolean checkSize(ArrayList<String> arrayList) {
@@ -50,21 +50,21 @@ class FileConvertTask extends AsyncTask<Void, Void, ArrayList<String>> {
     }
 
     protected void onPostExecute(ArrayList<String> arrayList) {
-        ConvertEndListener convertEndListener = this.mConvertEndListener;
+        ConvertEndListener convertEndListener = mConvertEndListener;
         if (convertEndListener != null) {
-            convertEndListener.onConvertEnd(this.mErrorType, arrayList);
+            convertEndListener.onConvertEnd(mErrorType, arrayList);
         }
     }
 
     protected ArrayList<String> doInBackground(Void... voidArr) {
-        ArrayList<String> convertImageFile = convertImageFile(this.mOrgFileList);
+        ArrayList<String> convertImageFile = convertImageFile(mOrgFileList);
         if (convertImageFile == null) {
             return null;
         }
         if (checkSize(convertImageFile)) {
             return convertImageFile;
         }
-        this.mErrorType = ErrorType.FILE_SIZE_ERROR;
+        mErrorType = ErrorType.FILE_SIZE_ERROR;
         return null;
     }
 
@@ -77,10 +77,10 @@ class FileConvertTask extends AsyncTask<Void, Void, ArrayList<String>> {
             String next = it.next();
             String notDuplicateFilename = ExternalFileUtils.getNotDuplicateFilename(next, initTempDirectory.getPath(), 1);
             if (notDuplicateFilename == null) {
-                this.mErrorType = ErrorType.CONVERT_ERROR;
+                mErrorType = ErrorType.CONVERT_ERROR;
                 return null;
             } else if (!ImageUtil.convertHEIFtoJPEG(next, notDuplicateFilename)) {
-                this.mErrorType = ErrorType.CONVERT_ERROR;
+                mErrorType = ErrorType.CONVERT_ERROR;
                 return null;
             } else {
                 arrayList2.add(notDuplicateFilename);

+ 12 - 12
app/src/main/java/com/epson/memcardacc/FileConvertViewModel.java

@@ -13,7 +13,7 @@ import java.util.ArrayList;
 public class FileConvertViewModel extends AndroidViewModel {
     private final FileConvertTask.ConvertEndListener mConvertEndListener = new FileConvertTask.ConvertEndListener() {
         public void onConvertEnd(@NonNull FileConvertTask.ErrorType errorType, @Nullable ArrayList<String> arrayList) {
-            FileConvertViewModel.this.mFileConvertStatusLiveData.setValue(new FileConvertStatus(ConvertStatus.TASK_END, errorType, arrayList));
+            FileConvertViewModel.mFileConvertStatusLiveData.setValue(new FileConvertStatus(ConvertStatus.TASK_END, errorType, arrayList));
         }
     };
     private final MutableLiveData<FileConvertStatus> mFileConvertStatusLiveData = new MutableLiveData<>();
@@ -39,39 +39,39 @@ public class FileConvertViewModel extends AndroidViewModel {
         }
 
         public FileConvertStatus(ConvertStatus convertStatus, FileConvertTask.ErrorType errorType, ArrayList<String> arrayList) {
-            this.mErrorType = errorType;
-            this.mConvertStatus = convertStatus;
-            this.mConvertFileList = arrayList;
+            mErrorType = errorType;
+            mConvertStatus = convertStatus;
+            mConvertFileList = arrayList;
         }
 
         @NonNull
         public ConvertStatus getConvertStatus() {
-            return this.mConvertStatus;
+            return mConvertStatus;
         }
 
         @NonNull
         public FileConvertTask.ErrorType getErrorType() {
-            return this.mErrorType;
+            return mErrorType;
         }
 
         @Nullable
         public ArrayList<String> getConvertFileList() {
-            return this.mConvertFileList;
+            return mConvertFileList;
         }
     }
 
     public FileConvertViewModel(@NonNull Application application) {
         super(application);
-        this.mFileConvertStatusLiveData.setValue(new FileConvertStatus());
+        mFileConvertStatusLiveData.setValue(new FileConvertStatus());
     }
 
     public void startConvert(@NonNull ArrayList<String> arrayList) {
-        this.mFileConvertStatusLiveData.setValue(new FileConvertStatus(ConvertStatus.TASK_RUNNING));
-        this.mFileConvertTask = new FileConvertTask(arrayList, this.mConvertEndListener);
-        this.mFileConvertTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
+        mFileConvertStatusLiveData.setValue(new FileConvertStatus(ConvertStatus.TASK_RUNNING));
+        mFileConvertTask = new FileConvertTask(arrayList, mConvertEndListener);
+        mFileConvertTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
     }
 
     public LiveData<FileConvertStatus> getData() {
-        return this.mFileConvertStatusLiveData;
+        return mFileConvertStatusLiveData;
     }
 }

+ 48 - 48
app/src/main/java/com/epson/memcardacc/ImageFileListAdapter.java

@@ -31,27 +31,27 @@ public class ImageFileListAdapter extends BaseAdapter implements Serializable {
     }
 
     public void setLayoutInflater(LayoutInflater layoutInflater) {
-        this.mLayoutInflator = layoutInflater;
+        mLayoutInflator = layoutInflater;
     }
 
     public void setUpFolderString(String str) {
-        this.mUpFolderString = str;
+        mUpFolderString = str;
     }
 
     public int getCount() {
-        return this.mFileInfoWithCheck.size();
+        return mFileInfoWithCheck.size();
     }
 
     public Object getItem(int i) {
-        return this.mFileInfoWithCheck.get(i);
+        return mFileInfoWithCheck.get(i);
     }
 
     public View getView(int i, View view, ViewGroup viewGroup) {
         if (view == null) {
-            view = this.mLayoutInflator.inflate(R.layout.memcard_card_grid_view_elem, viewGroup, false);
+            view = mLayoutInflator.inflate(R.layout.memcard_card_grid_view_elem, viewGroup, false);
         }
         ImageView imageView = (ImageView) view.findViewById(R.id.thumbNail);
-        FileInfoWithCheck fileInfoWithCheck = this.mFileInfoWithCheck.get(i);
+        FileInfoWithCheck fileInfoWithCheck = mFileInfoWithCheck.get(i);
         Bitmap thumNail = fileInfoWithCheck.getThumNail();
         TextView textView = (TextView) view.findViewById(R.id.baseDirText);
         if (thumNail != null) {
@@ -60,7 +60,7 @@ public class ImageFileListAdapter extends BaseAdapter implements Serializable {
         } else if (fileInfoWithCheck.isDirectory()) {
             if (fileInfoWithCheck.isParentDirectory()) {
                 imageView.setImageResource(R.C2136drawable.parent_folder);
-                String str = this.mUpFolderString;
+                String str = mUpFolderString;
                 if (str != null) {
                     textView.setText(str);
                 }
@@ -83,37 +83,37 @@ public class ImageFileListAdapter extends BaseAdapter implements Serializable {
     }
 
     public void setImageSize(int i, int i2) {
-        this.mReqWidth = i;
-        this.mReqHeight = i2;
+        mReqWidth = i;
+        mReqHeight = i2;
     }
 
     public void setFileList(String str, LinkedList<CifsFileInfo> linkedList) {
         String str2 = str.length() <= 0 ? "\\" : str;
-        if (!this.mBaseDir.equals(str2)) {
-            this.mReaderSelectedImage.setFileList(this.mBaseDir, getSelectedFileList());
-            this.mBaseDir = str2;
-            this.mFileInfoWithCheck.clear();
-            if (!"\\".equals(this.mBaseDir)) {
-                this.mFileInfoWithCheck.add(new FileInfoWithCheck(CifsAccess.getParentDirectory(str)));
+        if (!mBaseDir.equals(str2)) {
+            mReaderSelectedImage.setFileList(mBaseDir, getSelectedFileList());
+            mBaseDir = str2;
+            mFileInfoWithCheck.clear();
+            if (!"\\".equals(mBaseDir)) {
+                mFileInfoWithCheck.add(new FileInfoWithCheck(CifsAccess.getParentDirectory(str)));
             }
             Iterator it = linkedList.iterator();
             while (it.hasNext()) {
                 CifsFileInfo cifsFileInfo = (CifsFileInfo) it.next();
                 if (cifsFileInfo.isReadable()) {
                     FileInfoWithCheck fileInfoWithCheck = new FileInfoWithCheck(cifsFileInfo);
-                    if (this.mReaderSelectedImage.contains(this.mBaseDir, cifsFileInfo)) {
+                    if (mReaderSelectedImage.contains(mBaseDir, cifsFileInfo)) {
                         fileInfoWithCheck.mChecked = 1;
                     }
-                    this.mFileInfoWithCheck.add(fileInfoWithCheck);
+                    mFileInfoWithCheck.add(fileInfoWithCheck);
                 }
             }
-            this.mReaderSelectedImage.deleteBaseDir(this.mBaseDir);
+            mReaderSelectedImage.deleteBaseDir(mBaseDir);
         }
     }
 
     private LinkedList<CifsFileInfo> getSelectedFileList() {
         LinkedList<CifsFileInfo> linkedList = new LinkedList<>();
-        Iterator it = this.mFileInfoWithCheck.iterator();
+        Iterator it = mFileInfoWithCheck.iterator();
         while (it.hasNext()) {
             FileInfoWithCheck fileInfoWithCheck = (FileInfoWithCheck) it.next();
             if (fileInfoWithCheck.mChecked != 0) {
@@ -124,23 +124,23 @@ public class ImageFileListAdapter extends BaseAdapter implements Serializable {
     }
 
     public int getSelectedFileNum() {
-        Iterator it = this.mFileInfoWithCheck.iterator();
+        Iterator it = mFileInfoWithCheck.iterator();
         int i = 0;
         while (it.hasNext()) {
             if (((FileInfoWithCheck) it.next()).mChecked != 0) {
                 i++;
             }
         }
-        return i + this.mReaderSelectedImage.getFileSize();
+        return i + mReaderSelectedImage.getFileSize();
     }
 
     public void clear() {
-        this.mFileInfoWithCheck.clear();
+        mFileInfoWithCheck.clear();
         notifyDataSetChanged();
     }
 
     public Iterator<FileInfoWithCheck> getFileInfoIterator() {
-        return this.mFileInfoWithCheck.iterator();
+        return mFileInfoWithCheck.iterator();
     }
 
     public String getDirectoryName(int i) {
@@ -149,14 +149,14 @@ public class ImageFileListAdapter extends BaseAdapter implements Serializable {
 
     public ArrayList<String> getAllSelectedFile() {
         ArrayList<String> arrayList = new ArrayList<>();
-        Iterator it = this.mFileInfoWithCheck.iterator();
+        Iterator it = mFileInfoWithCheck.iterator();
         while (it.hasNext()) {
             FileInfoWithCheck fileInfoWithCheck = (FileInfoWithCheck) it.next();
             if (fileInfoWithCheck.mChecked != 0) {
                 arrayList.add(fileInfoWithCheck.getFullPath());
             }
         }
-        arrayList.addAll(this.mReaderSelectedImage.getAllFileFullPath());
+        arrayList.addAll(mReaderSelectedImage.getAllFileFullPath());
         return arrayList;
     }
 
@@ -177,23 +177,23 @@ public class ImageFileListAdapter extends BaseAdapter implements Serializable {
         public Bitmap mThumbNail;
 
         public FileInfoWithCheck(CifsFileInfo cifsFileInfo) {
-            this.mCifsFileInfo = cifsFileInfo;
+            mCifsFileInfo = cifsFileInfo;
         }
 
         public boolean isParentDirectory() {
-            return this.mParentDirectory != null;
+            return mParentDirectory != null;
         }
 
         public Bitmap getThumNail() {
-            return this.mThumbNail;
+            return mThumbNail;
         }
 
         public String getFileName() {
-            String str = this.mParentDirectory;
+            String str = mParentDirectory;
             if (str != null) {
                 return str;
             }
-            CifsFileInfo cifsFileInfo = this.mCifsFileInfo;
+            CifsFileInfo cifsFileInfo = mCifsFileInfo;
             if (cifsFileInfo != null) {
                 return cifsFileInfo.mFileName;
             }
@@ -201,59 +201,59 @@ public class ImageFileListAdapter extends BaseAdapter implements Serializable {
         }
 
         public String getFullPath() {
-            String str = this.mParentDirectory;
+            String str = mParentDirectory;
             if (str != null) {
                 return str;
             }
-            if (ImageFileListAdapter.this.mBaseDir.endsWith("\\")) {
-                return ImageFileListAdapter.this.mBaseDir + this.mCifsFileInfo.mFileName;
+            if (ImageFileListAdapter.mBaseDir.endsWith("\\")) {
+                return ImageFileListAdapter.mBaseDir + mCifsFileInfo.mFileName;
             }
-            return ImageFileListAdapter.this.mBaseDir + "\\" + this.mCifsFileInfo.mFileName;
+            return ImageFileListAdapter.mBaseDir + "\\" + mCifsFileInfo.mFileName;
         }
 
         public void setThumbNail(Bitmap bitmap) {
-            this.mThumbNail = bitmap;
+            mThumbNail = bitmap;
         }
 
         public boolean needThumbNail() {
-            return this.mThumbNail == null;
+            return mThumbNail == null;
         }
 
         public boolean isDirectory() {
-            if (this.mParentDirectory != null) {
+            if (mParentDirectory != null) {
                 return true;
             }
-            return this.mCifsFileInfo.isDirectory();
+            return mCifsFileInfo.isDirectory();
         }
 
         public FileInfoWithCheck(String str) {
-            this.mParentDirectory = str;
+            mParentDirectory = str;
         }
 
         public String getDirectoryName() {
-            String str = this.mParentDirectory;
+            String str = mParentDirectory;
             if (str != null) {
                 return str;
             }
-            if (!this.mCifsFileInfo.isDirectory()) {
+            if (!mCifsFileInfo.isDirectory()) {
                 return null;
             }
-            if (ImageFileListAdapter.this.mBaseDir.endsWith("\\")) {
-                return ImageFileListAdapter.this.mBaseDir + this.mCifsFileInfo.mFileName;
+            if (ImageFileListAdapter.mBaseDir.endsWith("\\")) {
+                return ImageFileListAdapter.mBaseDir + mCifsFileInfo.mFileName;
             }
-            return ImageFileListAdapter.this.mBaseDir + "\\" + this.mCifsFileInfo.mFileName;
+            return ImageFileListAdapter.mBaseDir + "\\" + mCifsFileInfo.mFileName;
         }
 
         public void toggleCheck() {
-            if (this.mChecked == 0) {
-                this.mChecked = 1;
+            if (mChecked == 0) {
+                mChecked = 1;
             } else {
-                this.mChecked = 0;
+                mChecked = 0;
             }
         }
     }
 
     public String getTargetDirectoryName() {
-        return this.mBaseDir;
+        return mBaseDir;
     }
 }

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

@@ -31,8 +31,8 @@ public class ImageUtil {
         int mWidth;
 
         public WidthHeight(int i, int i2) {
-            this.mWidth = i;
-            this.mHeight = i2;
+            mWidth = i;
+            mHeight = i2;
         }
     }
 }

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

@@ -43,7 +43,7 @@ public class LocalAlertDialogFragment extends DialogFragment {
         int i = arguments.getInt("message", 0);
         int i2 = arguments.getInt(KEY_TITLE, 0);
         boolean z = arguments.getBoolean(KEY_NO_TITLE, false);
-        this.mDialogCode = arguments.getInt(KEY_DIALOG_CODE);
+        mDialogCode = arguments.getInt(KEY_DIALOG_CODE);
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setMessage(i).setPositiveButton(getActivity().getString(R.string.str_ok), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
@@ -62,7 +62,7 @@ public class LocalAlertDialogFragment extends DialogFragment {
         try {
             DialogCallback dialogCallback = (DialogCallback) getActivity();
             if (dialogCallback != null) {
-                dialogCallback.onDialogCallback(this.mDialogCode);
+                dialogCallback.onDialogCallback(mDialogCode);
             }
         } catch (ClassCastException unused) {
         }

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

@@ -27,19 +27,19 @@ public class MemCardWriteConvertViewModel extends AndroidViewModel {
 
     public MemCardWriteConvertViewModel(@NonNull Application application) {
         super(application);
-        this.mApplication = application;
+        mApplication = application;
     }
 
     public void setOrigFileList(@NonNull ArrayList<String> arrayList) {
-        this.mConvertLiveData.setOrigFileList(arrayList);
+        mConvertLiveData.setOrigFileList(arrayList);
     }
 
     public void deleteTempFile() {
-        this.mConvertLiveData.initTempDirectory();
+        mConvertLiveData.initTempDirectory();
     }
 
     public ConvertLiveData getData() {
-        return this.mConvertLiveData;
+        return mConvertLiveData;
     }
 
     public class ConvertLiveData extends LiveData<ConvertResult> {
@@ -53,14 +53,14 @@ public class MemCardWriteConvertViewModel extends AndroidViewModel {
                 }
 
                 protected void onPostExecute(ConvertResult convertResult) {
-                    MemCardWriteConvertViewModel.this.mConvertLiveData.setValue(convertResult);
+                    MemCardWriteConvertViewModel.mConvertLiveData.setValue(convertResult);
                 }
             }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
         }
 
         private synchronized ConvertResult convertAndGetFileSize(@NonNull ArrayList<String> arrayList) {
             ConvertResult convertResult = new ConvertResult();
-            File initTempDirectory = initTempDirectory(ExternalFileUtils.getInstance(MemCardWriteConvertViewModel.this.mApplication));
+            File initTempDirectory = initTempDirectory(ExternalFileUtils.getInstance(MemCardWriteConvertViewModel.mApplication));
             Iterator<String> it = arrayList.iterator();
             while (it.hasNext()) {
                 String next = it.next();
@@ -82,7 +82,7 @@ public class MemCardWriteConvertViewModel extends AndroidViewModel {
         }
 
         private synchronized void initTempDirectory() {
-            initTempDirectory(ExternalFileUtils.getInstance(MemCardWriteConvertViewModel.this.mApplication));
+            initTempDirectory(ExternalFileUtils.getInstance(MemCardWriteConvertViewModel.mApplication));
         }
     }
 }

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

@@ -28,15 +28,15 @@ public class MemcardCheckTask extends AsyncTask<Void, Void, Integer> {
     }
 
     public MemcardCheckTask(Context context, MemcardCheckCallback memcardCheckCallback, int i) {
-        this.mActivityOnPauseCancel = false;
-        this.mQueue = new SynchronousQueue<>();
-        this.mContext = context.getApplicationContext();
-        this.mCallback = memcardCheckCallback;
-        this.mCifsStorageSetType = i;
+        mActivityOnPauseCancel = false;
+        mQueue = new SynchronousQueue<>();
+        mContext = context.getApplicationContext();
+        mCallback = memcardCheckCallback;
+        mCifsStorageSetType = i;
     }
 
     protected MemcardCheckTask() {
-        this.mActivityOnPauseCancel = false;
+        mActivityOnPauseCancel = false;
     }
 
     /* access modifiers changed from: protected */
@@ -151,25 +151,25 @@ public class MemcardCheckTask extends AsyncTask<Void, Void, Integer> {
     }
 
     protected void onPreExecute() {
-        this.mCallback.onPreExecute();
+        mCallback.onPreExecute();
     }
 
     protected void onPostExecute(Integer num) {
-        this.mCallback.onMemcardCheckEnd(num, this.mErrorCode);
+        mCallback.onMemcardCheckEnd(num, mErrorCode);
     }
 
     protected void onCancelled() {
-        this.mCallback.onMemcardCheckEnd((Integer) null, this.mActivityOnPauseCancel ? 6 : 5);
+        mCallback.onMemcardCheckEnd((Integer) null, mActivityOnPauseCancel ? 6 : 5);
     }
 
     public void activityOnPauseCancel() {
-        this.mActivityOnPauseCancel = true;
+        mActivityOnPauseCancel = true;
         cancel(true);
     }
 
     public void setAuthData(String str, String str2) {
         int i = 0;
-        while (!this.mQueue.offer(new MyQueueData(2)) && i < 4) {
+        while (!mQueue.offer(new MyQueueData(2)) && i < 4) {
             try {
                 Thread.sleep(300);
                 i++;
@@ -204,11 +204,11 @@ public class MemcardCheckTask extends AsyncTask<Void, Void, Integer> {
         }
 
         public MyQueueData(int i) {
-            this.mDataType = i;
+            mDataType = i;
         }
 
         public boolean isCancel() {
-            return this.mDataType == 1;
+            return mDataType == 1;
         }
     }
 }

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

@@ -64,12 +64,12 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         public void handleMessage(Message message) {
             switch (message.what) {
                 case 1:
-                    if (MemcardImageGrid.this.mCifsFileListLoader != null) {
-                        EPLog.m313i(MemcardImageGrid.LOG_TAG, "status :" + MemcardImageGrid.this.mCifsFileListLoader.getStatus());
-                        switch (C09864.$SwitchMap$android$os$AsyncTask$Status[MemcardImageGrid.this.mCifsFileListLoader.getStatus().ordinal()]) {
+                    if (MemcardImageGrid.mCifsFileListLoader != null) {
+                        EPLog.m313i(MemcardImageGrid.LOG_TAG, "status :" + MemcardImageGrid.mCifsFileListLoader.getStatus());
+                        switch (C09864.$SwitchMap$android$os$AsyncTask$Status[MemcardImageGrid.mCifsFileListLoader.getStatus().ordinal()]) {
                             case 1:
                             case 2:
-                                MemcardImageGrid.this.mHandler.sendEmptyMessageDelayed(1, 1000);
+                                MemcardImageGrid.mHandler.sendEmptyMessageDelayed(1, 1000);
                                 return;
                             case 3:
                                 break;
@@ -80,7 +80,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
                     } else {
                         EPLog.m313i(MemcardImageGrid.LOG_TAG, "mCifsFileListLoader == null");
                     }
-                    MemcardImageGrid.this.mHandler.sendEmptyMessageDelayed(2, 300);
+                    MemcardImageGrid.mHandler.sendEmptyMessageDelayed(2, 300);
                     return;
                 case 2:
                     MemcardImageGrid.this.execNextTaskOrIdle();
@@ -108,8 +108,8 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
     }
 
     protected void onCreate(Bundle bundle) {
-        this.mBitmapCache = MemcardBitmapCache.getInstance(this);
-        MemcardBitmapCache memcardBitmapCache = this.mBitmapCache;
+        mBitmapCache = MemcardBitmapCache.getInstance(this);
+        MemcardBitmapCache memcardBitmapCache = mBitmapCache;
         if (memcardBitmapCache == null || !memcardBitmapCache.checkEnv()) {
             new MemcardTempAlertDialog().showAlertDialog(this, new MemcardTempAlertDialog.DialogCallback() {
                 public void onPositiveCallback() {
@@ -117,40 +117,40 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
                 }
             });
         }
-        this.mCifsAccess = CifsAccess.getInstance();
-        this.mDirectoryCache = new DirectoryCache();
-        this.mDirectoryCache.setCifsAccess(this.mCifsAccess);
+        mCifsAccess = CifsAccess.getInstance();
+        mDirectoryCache = new DirectoryCache();
+        mDirectoryCache.setCifsAccess(mCifsAccess);
         super.onCreate(bundle);
-        this.mImageFileListAdapter = new ImageFileListAdapter();
-        this.mImageFileListAdapter.setLayoutInflater(getLayoutInflater());
-        this.mImageFileListAdapter.setUpFolderString(getResources().getString(R.string.memcard_folder_up));
+        mImageFileListAdapter = new ImageFileListAdapter();
+        mImageFileListAdapter.setLayoutInflater(getLayoutInflater());
+        mImageFileListAdapter.setUpFolderString(getResources().getString(R.string.memcard_folder_up));
         setContentView((int) R.layout.activity_memcard_image_grid);
         setActionBar("", true);
-        this.mGridView = (GridView) findViewById(R.id.gridView1);
-        this.mGridView.setAdapter(this.mImageFileListAdapter);
-        this.mSelectedFileNumText = (TextView) findViewById(R.id.textSelectedImageNum);
-        this.mGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+        mGridView = (GridView) findViewById(R.id.gridView1);
+        mGridView.setAdapter(mImageFileListAdapter);
+        mSelectedFileNumText = (TextView) findViewById(R.id.textSelectedImageNum);
+        mGridView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
                 MemcardImageGrid.this.gridViewItemClicked(adapterView, view, i, j);
             }
         });
-        this.mThumbnailWidth = getResources().getDimensionPixelSize(R.dimen.image_selector_grid_thumbnail_size);
-        int i = this.mThumbnailWidth;
-        this.mThumbnailHeight = i;
-        this.mBitmapCache.setSize(i, this.mThumbnailHeight);
-        this.mImageFileListAdapter.setImageSize(this.mThumbnailWidth, this.mThumbnailHeight);
-        this.mGridView.getViewTreeObserver().addOnGlobalLayoutListener(new MyGridLayoutListener(this.mGridView, this.mImageFileListAdapter, getResources().getDimensionPixelSize(R.dimen.image_selector_grid_thumbnail_spacing)));
+        mThumbnailWidth = getResources().getDimensionPixelSize(R.dimen.image_selector_grid_thumbnail_size);
+        int i = mThumbnailWidth;
+        mThumbnailHeight = i;
+        mBitmapCache.setSize(i, mThumbnailHeight);
+        mImageFileListAdapter.setImageSize(mThumbnailWidth, mThumbnailHeight);
+        mGridView.getViewTreeObserver().addOnGlobalLayoutListener(new MyGridLayoutListener(mGridView, mImageFileListAdapter, getResources().getDimensionPixelSize(R.dimen.image_selector_grid_thumbnail_spacing)));
         updateSelectedNumber();
-        this.mProgressBar = (ProgressBar) findViewById(R.id.progressBar1);
-        this.mProgressBar.setVisibility(4);
-        this.mMemcardStorageType = getIntent().getIntExtra("memcard_storage_type", 1);
-        if (this.mMemcardStorageType <= 0) {
-            this.mMemcardStorageType = 1;
+        mProgressBar = (ProgressBar) findViewById(R.id.progressBar1);
+        mProgressBar.setVisibility(4);
+        mMemcardStorageType = getIntent().getIntExtra("memcard_storage_type", 1);
+        if (mMemcardStorageType <= 0) {
+            mMemcardStorageType = 1;
         }
-        this.mStartDirectory = true;
+        mStartDirectory = true;
         this.targetDir = MemcardConfig.INIT_CIFS_DIRECTORY;
-        this.mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
-        this.mModelDialog.getDialogJob().observe(this, new Observer() {
+        mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
+        mModelDialog.getDialogJob().observe(this, new Observer() {
             public final void onChanged(Object obj) {
                 MemcardImageGrid.lambda$onCreate$0(MemcardImageGrid.this, (Deque) obj);
             }
@@ -172,13 +172,13 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
     }
 
     private void dispTargetDirectory() {
-        setTitle(this.mImageFileListAdapter.getTargetDirectoryName());
+        setTitle(mImageFileListAdapter.getTargetDirectoryName());
     }
 
     protected void onStop() {
-        this.mHandler.removeMessages(1);
+        mHandler.removeMessages(1);
         if (!this.isKeepSimleApConnect) {
-            CifsFileListLoader cifsFileListLoader = this.mCifsFileListLoader;
+            CifsFileListLoader cifsFileListLoader = mCifsFileListLoader;
             if (cifsFileListLoader != null && cifsFileListLoader.getStatus() == AsyncTask.Status.RUNNING) {
                 this.discconectOnThreadFinish = true;
             }
@@ -193,7 +193,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
 
     protected void onRestart() {
         super.onRestart();
-        this.targetDir = this.mImageFileListAdapter.getTargetDirectoryName();
+        this.targetDir = mImageFileListAdapter.getTargetDirectoryName();
     }
 
     protected void onResume() {
@@ -222,11 +222,11 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
     }
 
     private void gridViewItemClicked(AdapterView<?> adapterView, View view, int i, long j) {
-        String directoryName = this.mImageFileListAdapter.getDirectoryName(i);
+        String directoryName = mImageFileListAdapter.getDirectoryName(i);
         if (directoryName != null) {
             EPLog.m313i(LOG_TAG, "item clicked : dir_name => " + directoryName);
             chengeTargetDirectory(directoryName);
-        } else if (this.mImageFileListAdapter.itemSelected(i)) {
+        } else if (mImageFileListAdapter.itemSelected(i)) {
             updateSelectedNumber();
         } else {
             localShowDialog(DIALOG_OVER_SELECTED_NUMBER);
@@ -234,11 +234,11 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
-        int selectedFileNum = this.mImageFileListAdapter.getSelectedFileNum();
+        int selectedFileNum = mImageFileListAdapter.getSelectedFileNum();
         getMenuInflater().inflate(R.C2138menu.menu_image_selector, menu);
         menu.findItem(R.id.action_go_preview).setEnabled(selectedFileNum > 0);
         if (selectedFileNum <= 0) {
-            setTitle(this.mImageFileListAdapter.getTargetDirectoryName());
+            setTitle(mImageFileListAdapter.getTargetDirectoryName());
         } else {
             setTitle(String.format(getResources().getString(R.string.photo_selected), new Object[]{Integer.valueOf(selectedFileNum)}));
         }
@@ -263,15 +263,15 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
 
     private void goNext() {
         showProgressDialog();
-        if (this.mImageFileListAdapter.getSelectedFileNum() <= 0) {
+        if (mImageFileListAdapter.getSelectedFileNum() <= 0) {
             dismissProgressDialog();
             localShowDialog(DIALOG_NO_IMAGE_SELECTED);
             return;
         }
         cancelFileListLoadTask();
         Intent intent = new Intent(this, ConfirmReadMemcard.class);
-        intent.putStringArrayListExtra(ConfirmReadMemcard.KEY_IMAGE_LIST, this.mImageFileListAdapter.getAllSelectedFile());
-        intent.putExtra("memcard_storage_type", this.mMemcardStorageType);
+        intent.putStringArrayListExtra(ConfirmReadMemcard.KEY_IMAGE_LIST, mImageFileListAdapter.getAllSelectedFile());
+        intent.putExtra("memcard_storage_type", mMemcardStorageType);
         startActivityForResult(intent, 1);
         dismissProgressDialog();
         this.isKeepSimleApConnect = true;
@@ -282,24 +282,24 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
     }
 
     private void finishMemCardImageGridActivity() {
-        this.mHandler.removeMessages(1);
+        mHandler.removeMessages(1);
         cancelFileListLoadTask();
         finish();
         this.isFinishRequested = true;
     }
 
     private void localShowDialog(String str) {
-        this.mModelDialog.doShow(str);
+        mModelDialog.doShow(str);
     }
 
     private void chengeTargetDirectory(String str) {
         EPLog.m313i(LOG_TAG, "chengeTargetDirectory() start");
         showProgressDialog();
-        this.mTaskQueue.clear();
+        mTaskQueue.clear();
         cancelFileListLoadTask();
         try {
-            this.mTaskQueue.put(str);
-            this.mHandler.sendEmptyMessage(1);
+            mTaskQueue.put(str);
+            mHandler.sendEmptyMessage(1);
         } catch (InterruptedException e) {
             e.printStackTrace();
             EPLog.m307e(LOG_TAG, "queue.put() error in chengeTargetDirectory()");
@@ -308,32 +308,32 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
     }
 
     protected void execNextTaskOrIdle() {
-        if (!this.mTaskQueue.isEmpty()) {
+        if (!mTaskQueue.isEmpty()) {
             EPLog.m313i(LOG_TAG, "checkQueue() queue not empty");
-            this.mCifsFileListLoader = new CifsFileListLoader();
+            mCifsFileListLoader = new CifsFileListLoader();
             String str = "";
-            while (!this.mTaskQueue.isEmpty()) {
-                str = this.mTaskQueue.poll();
+            while (!mTaskQueue.isEmpty()) {
+                str = mTaskQueue.poll();
             }
-            this.mCifsFileListLoader.execute(new String[]{str});
+            mCifsFileListLoader.execute(new String[]{str});
             return;
         }
         dismissProgressDialog();
     }
 
     private void cancelFileListLoadTask() {
-        CifsFileListLoader cifsFileListLoader = this.mCifsFileListLoader;
+        CifsFileListLoader cifsFileListLoader = mCifsFileListLoader;
         if (cifsFileListLoader != null) {
             cifsFileListLoader.cancelTask();
         }
     }
 
     private void showProgressDialog() {
-        this.mModelDialog.doShow(DIALOG_PROGRESS);
+        mModelDialog.doShow(DIALOG_PROGRESS);
     }
 
     private void dismissProgressDialog() {
-        this.mModelDialog.doDismiss(DIALOG_PROGRESS);
+        mModelDialog.doDismiss(DIALOG_PROGRESS);
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:23:0x0049  */
@@ -515,7 +515,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
 
     public void onNegativeClick(String str) {
         if (((str.hashCode() == -195189813 && str.equals(DIALOG_FILE_READ_ERROR)) ? (char) 0 : 65535) == 0) {
-            this.mStartDirectory = true;
+            mStartDirectory = true;
             chengeTargetDirectory(MemcardConfig.INIT_CIFS_DIRECTORY);
         }
     }
@@ -526,34 +526,34 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         private int mHorizontalSpacing;
 
         public MyGridLayoutListener(GridView gridView, ImageFileListAdapter imageFileListAdapter, int i) {
-            this.mGridView = gridView;
-            this.mAdapter = imageFileListAdapter;
-            this.mHorizontalSpacing = i;
+            mGridView = gridView;
+            mAdapter = imageFileListAdapter;
+            mHorizontalSpacing = i;
         }
 
         @TargetApi(16)
         public void onGlobalLayout() {
-            int numColumns = this.mGridView.getNumColumns();
+            int numColumns = mGridView.getNumColumns();
             if (numColumns <= 0) {
                 return;
             }
             if (Build.VERSION.SDK_INT >= 16) {
                 setNewVerticalParams();
-                this.mGridView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                mGridView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
                 return;
             }
-            int width = this.mGridView.getWidth();
-            int i = this.mHorizontalSpacing;
+            int width = mGridView.getWidth();
+            int i = mHorizontalSpacing;
             int i2 = ((width + i) / numColumns) - i;
-            this.mAdapter.setImageSize(i2, i2);
-            this.mGridView.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+            mAdapter.setImageSize(i2, i2);
+            mGridView.getViewTreeObserver().removeGlobalOnLayoutListener(this);
         }
 
         @TargetApi(16)
         private void setNewVerticalParams() {
-            this.mGridView.setVerticalSpacing(this.mGridView.getHorizontalSpacing());
-            int columnWidth = this.mGridView.getColumnWidth();
-            this.mAdapter.setImageSize(columnWidth, columnWidth);
+            mGridView.setVerticalSpacing(mGridView.getHorizontalSpacing());
+            int columnWidth = mGridView.getColumnWidth();
+            mAdapter.setImageSize(columnWidth, columnWidth);
         }
     }
 
@@ -575,13 +575,13 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         }
 
         private boolean waiteAdapterUpdateAndCancelCheck() {
-            if (this.mCanceling) {
+            if (mCanceling) {
                 return false;
             }
-            while (!this.mAdapterUpdateWaitDone) {
+            while (!mAdapterUpdateWaitDone) {
                 try {
                     Thread.sleep(200);
-                    if (this.mCanceling) {
+                    if (mCanceling) {
                         return false;
                     }
                 } catch (InterruptedException unused) {
@@ -593,24 +593,24 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
 
         protected synchronized Integer doInBackground(String... strArr) {
             EPLog.m313i(MemcardImageGrid.LOG_TAG, "doInBackground() started");
-            if (MemcardImageGrid.this.mCifsAccess.initDefault(MemcardImageGrid.this, 1) == 0) {
+            if (MemcardImageGrid.mCifsAccess.initDefault(MemcardImageGrid.this, 1) == 0) {
                 return null;
             }
-            if (MemcardImageGrid.this.mCifsAccess.connectDefaultStorageWidthDefaultAthInfo(MemcardImageGrid.this.mMemcardStorageType) == 0) {
-                MemcardImageGrid.this.mCifsAccess.free();
+            if (MemcardImageGrid.mCifsAccess.connectDefaultStorageWidthDefaultAthInfo(MemcardImageGrid.mMemcardStorageType) == 0) {
+                MemcardImageGrid.mCifsAccess.free();
                 return null;
             }
             try {
                 String str = strArr[0];
-                LinkedList<CifsFileInfo> fileList = MemcardImageGrid.this.mDirectoryCache.getFileList(str);
+                LinkedList<CifsFileInfo> fileList = MemcardImageGrid.mDirectoryCache.getFileList(str);
                 if (fileList == null) {
-                    if (MemcardImageGrid.this.mStartDirectory) {
+                    if (MemcardImageGrid.mStartDirectory) {
                         str = "";
-                        fileList = MemcardImageGrid.this.mDirectoryCache.getFileList(str);
+                        fileList = MemcardImageGrid.mDirectoryCache.getFileList(str);
                         if (fileList == null) {
-                            if (MemcardImageGrid.this.mCifsAccess.getFreeUnit() < 0) {
-                                MemcardImageGrid.this.mCifsAccess.disconnectStorage();
-                                MemcardImageGrid.this.mCifsAccess.free();
+                            if (MemcardImageGrid.mCifsAccess.getFreeUnit() < 0) {
+                                MemcardImageGrid.mCifsAccess.disconnectStorage();
+                                MemcardImageGrid.mCifsAccess.free();
                                 return 1;
                             }
                             fileList = new LinkedList<>();
@@ -619,24 +619,24 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
                         fileList = new LinkedList<>();
                     }
                 }
-                MemcardImageGrid.this.mStartDirectory = false;
+                MemcardImageGrid.mStartDirectory = false;
                 MemcardImageGrid.this.selectFileList(fileList);
-                this.mBaseDir = str;
-                this.mFileList = fileList;
-                this.mAdapterUpdateWaitDone = false;
+                mBaseDir = str;
+                mFileList = fileList;
+                mAdapterUpdateWaitDone = false;
                 publishProgress(new Integer[]{1});
                 if (waiteAdapterUpdateAndCancelCheck()) {
                     EPLog.m313i(MemcardImageGrid.LOG_TAG, "doInBackground() next createThumbnail");
-                    createThumbnail(MemcardImageGrid.this.mCifsAccess);
+                    createThumbnail(MemcardImageGrid.mCifsAccess);
                 }
                 EPLog.m313i(MemcardImageGrid.LOG_TAG, "doInBackground() disconnectStorage()");
-                MemcardImageGrid.this.mCifsAccess.disconnectStorage();
+                MemcardImageGrid.mCifsAccess.disconnectStorage();
                 if (MemcardImageGrid.this.discconectOnThreadFinish) {
                     EPLog.m305d(MemcardImageGrid.LOG_TAG, "disconnectOnThreadFinish");
                     WiFiDirectManager.disconnect(MemcardImageGrid.this, WiFiDirectManager.DEVICE_TYPE_PRINTER, MemcardUtil.getPrinterIpAddress(MemcardImageGrid.this));
                 }
                 EPLog.m313i(MemcardImageGrid.LOG_TAG, "doInBackground() end");
-                MemcardImageGrid.this.mCifsAccess.free();
+                MemcardImageGrid.mCifsAccess.free();
                 return 0;
             } catch (UnsupportedEncodingException e) {
                 try {
@@ -644,29 +644,29 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
                     EPLog.m313i(MemcardImageGrid.LOG_TAG, "exception in doInBackground()");
                     return null;
                 } finally {
-                    MemcardImageGrid.this.mCifsAccess.free();
+                    MemcardImageGrid.mCifsAccess.free();
                 }
             }
         }
 
         public void cancelTask() {
-            if (!this.mCanceling) {
+            if (!mCanceling) {
                 EPLog.m313i(MemcardImageGrid.LOG_TAG, "task canceling...");
-                this.mCanceling = true;
-                MemcardImageGrid.this.mCifsAccess.cancel();
+                mCanceling = true;
+                MemcardImageGrid.mCifsAccess.cancel();
             }
         }
 
         protected void onProgressUpdate(Integer... numArr) {
             if (numArr[0].intValue() == 1) {
-                MemcardImageGrid.this.mImageFileListAdapter.setFileList(this.mBaseDir, this.mFileList);
-                MemcardImageGrid.this.mImageFileListAdapter.notifyDataSetChanged();
-                this.mAdapterUpdateWaitDone = true;
+                MemcardImageGrid.mImageFileListAdapter.setFileList(mBaseDir, mFileList);
+                MemcardImageGrid.mImageFileListAdapter.notifyDataSetChanged();
+                mAdapterUpdateWaitDone = true;
                 MemcardImageGrid.this.updateSelectedNumber();
                 MemcardImageGrid.this.dismissProgressDialog();
                 return;
             }
-            MemcardImageGrid.this.mImageFileListAdapter.notifyDataSetChanged();
+            MemcardImageGrid.mImageFileListAdapter.notifyDataSetChanged();
         }
 
         protected void onPostExecute(Integer num) {
@@ -678,7 +678,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
             }
             switch (num.intValue()) {
                 case 0:
-                    MemcardImageGrid.this.mImageFileListAdapter.notifyDataSetChanged();
+                    MemcardImageGrid.mImageFileListAdapter.notifyDataSetChanged();
                     return;
                 case 1:
                     MemcardImageGrid.this.localShowDialog(MemcardImageGrid.DIALOG_FILE_READ_ERROR);
@@ -689,10 +689,10 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         }
 
         private int createThumbnail(CifsAccess cifsAccess) throws UnsupportedEncodingException {
-            MemcardImageGrid.this.mBitmapCache.setCifsAccess(cifsAccess);
-            Iterator<ImageFileListAdapter.FileInfoWithCheck> fileInfoIterator = MemcardImageGrid.this.mImageFileListAdapter.getFileInfoIterator();
+            MemcardImageGrid.mBitmapCache.setCifsAccess(cifsAccess);
+            Iterator<ImageFileListAdapter.FileInfoWithCheck> fileInfoIterator = MemcardImageGrid.mImageFileListAdapter.getFileInfoIterator();
             while (fileInfoIterator.hasNext()) {
-                if (this.mCanceling) {
+                if (mCanceling) {
                     return 0;
                 }
                 ImageFileListAdapter.FileInfoWithCheck next = fileInfoIterator.next();
@@ -702,7 +702,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
                     } else {
                         String fileName = next.getFileName();
                         EPLog.m313i(MemcardImageGrid.LOG_TAG, "name <" + fileName + ">");
-                        next.setThumbNail(MemcardImageGrid.this.mBitmapCache.cacheOrMakeThumbnailBitmap(fileName, next.getFullPath()));
+                        next.setThumbNail(MemcardImageGrid.mBitmapCache.cacheOrMakeThumbnailBitmap(fileName, next.getFullPath()));
                     }
                     publishProgress(new Integer[]{2});
                 }

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

@@ -17,8 +17,8 @@ public class MemcardPhotocopyTop extends MemcardTopSuper {
     }
 
     protected void onCreate(Bundle bundle) {
-        this.mBitmapCache = MemcardBitmapCache.getInstance(this);
-        if (this.mBitmapCache == null || !this.mBitmapCache.checkEnv()) {
+        mBitmapCache = MemcardBitmapCache.getInstance(this);
+        if (mBitmapCache == null || !mBitmapCache.checkEnv()) {
             new MemcardTempAlertDialog().showAlertDialog(this, new MemcardTempAlertDialog.DialogCallback() {
                 public void onPositiveCallback() {
                     MemcardPhotocopyTop.this.finish();
@@ -31,7 +31,7 @@ public class MemcardPhotocopyTop extends MemcardTopSuper {
         super.onCreate(bundle);
         setContentView((int) R.layout.activity_mcphotocopy_top);
         setActionBar((int) R.string.FunctionName_iPrint_PhotoTransfer, true);
-        this.mLaunchType = 0;
+        mLaunchType = 0;
         findViewById(R.id.photocopy_button).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 MemcardPhotocopyTop.this.launchWriter();
@@ -40,8 +40,8 @@ public class MemcardPhotocopyTop extends MemcardTopSuper {
     }
 
     private void launchWriter() {
-        if (this.mLaunchType == 0) {
-            this.mLaunchType = 1;
+        if (mLaunchType == 0) {
+            mLaunchType = 1;
             startMemcardStorageCheck();
         }
     }
@@ -51,7 +51,7 @@ public class MemcardPhotocopyTop extends MemcardTopSuper {
     }
 
     private void localShowDialog(int i) {
-        if (!this.mActivityIsFinishing && this.mIsActivityForeground) {
+        if (!mActivityIsFinishing && mIsActivityForeground) {
             LocalAlertDialogFragment localAlertDialogFragment = null;
             if (i == 1) {
                 localAlertDialogFragment = LocalAlertDialogFragment.newInstance(R.string.mcphotocopy_media_not_found_message, R.string.mcphotocopy_media_not_found_title, 101);

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

@@ -44,26 +44,26 @@ public class MemcardReadProgress extends Activity {
         Utils.setFInishOnTOuchOutside(this, false);
         setContentView(R.layout.memcard_write_progress);
         Intent intent = getIntent();
-        this.mImageList = intent.getStringArrayListExtra("imageList");
-        this.mTargetFolderName = intent.getStringExtra("target_folder_name");
-        this.mMemcardStorageType = intent.getIntExtra("memcard_storage_type", 1);
-        this.mTotalProgress = (ProgressBar) findViewById(R.id.progress_percent);
-        this.mTotalProgress.setVisibility(0);
-        this.mEachProgress = (ProgressBar) findViewById(R.id.progress_copies);
-        this.mEachProgress.setVisibility(8);
-        this.mTextView = (TextView) findViewById(R.id.percent);
+        mImageList = intent.getStringArrayListExtra("imageList");
+        mTargetFolderName = intent.getStringExtra("target_folder_name");
+        mMemcardStorageType = intent.getIntExtra("memcard_storage_type", 1);
+        mTotalProgress = (ProgressBar) findViewById(R.id.progress_percent);
+        mTotalProgress.setVisibility(0);
+        mEachProgress = (ProgressBar) findViewById(R.id.progress_copies);
+        mEachProgress.setVisibility(8);
+        mTextView = (TextView) findViewById(R.id.percent);
         ((TextView) findViewById(R.id.copyingMessageText)).setText(getResources().getString(R.string.memcard_file_reading_message));
         Intent intent2 = getIntent();
-        this.mImageList = intent2.getStringArrayListExtra("imageList");
-        this.mTargetFolderName = intent2.getStringExtra("target_folder_name");
-        this.mCancelButton = (Button) findViewById(R.id.cancel_button);
-        this.mCancelButton.setOnClickListener(new View.OnClickListener() {
+        mImageList = intent2.getStringArrayListExtra("imageList");
+        mTargetFolderName = intent2.getStringExtra("target_folder_name");
+        mCancelButton = (Button) findViewById(R.id.cancel_button);
+        mCancelButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 MemcardReadProgress.this.actionCancel();
             }
         });
-        this.mCopyTask = new CopyTask();
-        this.mCopyTask.execute(new Void[0]);
+        mCopyTask = new CopyTask();
+        mCopyTask.execute(new Void[0]);
     }
 
     protected void onStop() {
@@ -74,18 +74,18 @@ public class MemcardReadProgress extends Activity {
     }
 
     public void actionCancel() {
-        this.mCancelButton.setEnabled(false);
-        this.mCopyTask.taskCancel();
+        mCancelButton.setEnabled(false);
+        mCopyTask.taskCancel();
     }
 
     public void setProgressText(int i, int i2) {
-        this.mTextView.setText(String.format("%d/%d", new Object[]{Integer.valueOf(i), Integer.valueOf(i2)}));
+        mTextView.setText(String.format("%d/%d", new Object[]{Integer.valueOf(i), Integer.valueOf(i2)}));
     }
 
     public void setProgress(int i, int i2) {
         setProgressText(i, i2);
-        this.mTotalProgress.setMax(i2);
-        this.mTotalProgress.setProgress(i);
+        mTotalProgress.setMax(i2);
+        mTotalProgress.setProgress(i);
     }
 
     public void finishWithState(int i, @Nullable CommonLog commonLog) {
@@ -105,7 +105,7 @@ public class MemcardReadProgress extends Activity {
         private CommonLog mCommonLog = new CommonLog();
 
         CopyTask() {
-            CommonLog commonLog = this.mCommonLog;
+            CommonLog commonLog = mCommonLog;
             commonLog.numberOfSheet = 0;
             commonLog.action = 8194;
             commonLog.printerName = Analytics.getDefaultPrinterName(MemcardReadProgress.this.getApplicationContext());
@@ -114,23 +114,23 @@ public class MemcardReadProgress extends Activity {
         protected void onCancelled() {
             MemcardUtil.clearKeepScreenOn(MemcardReadProgress.this.getWindow());
             EPLog.m313i(MemcardReadProgress.LOG_TAG, "canceld in AsyncTask");
-            MemcardReadProgress.this.finishWithState(0, this.mCommonLog);
+            MemcardReadProgress.this.finishWithState(0, mCommonLog);
         }
 
         protected void onPostExecute(Integer num) {
             MemcardUtil.clearKeepScreenOn(MemcardReadProgress.this.getWindow());
-            MemcardReadProgress.this.finishWithState(num.intValue(), this.mCommonLog);
+            MemcardReadProgress.this.finishWithState(num.intValue(), mCommonLog);
         }
 
         protected void onPreExecute() {
-            this.mCanceling = false;
+            mCanceling = false;
             MemcardUtil.keepScreenOn(MemcardReadProgress.this.getWindow());
             MemcardReadProgress memcardReadProgress = MemcardReadProgress.this;
             memcardReadProgress.setProgress(0, memcardReadProgress.mImageList.size());
         }
 
         protected void onProgressUpdate(Integer... numArr) {
-            MemcardReadProgress.this.setProgress(numArr[0].intValue(), MemcardReadProgress.this.mImageList.size());
+            MemcardReadProgress.this.setProgress(numArr[0].intValue(), MemcardReadProgress.mImageList.size());
         }
 
         protected Integer doInBackground(Void... voidArr) {
@@ -138,13 +138,13 @@ public class MemcardReadProgress extends Activity {
                 if (this.cifsAccess.initDefault(MemcardReadProgress.this, 1) == 0) {
                     return 3;
                 }
-                if (this.cifsAccess.connectDefaultStorageWidthDefaultAthInfo(MemcardReadProgress.this.mMemcardStorageType) == 0) {
+                if (this.cifsAccess.connectDefaultStorageWidthDefaultAthInfo(MemcardReadProgress.mMemcardStorageType) == 0) {
                     this.cifsAccess.free();
                     return 3;
                 }
                 int copyFile = copyFile();
                 this.cifsAccess.disconnectStorage();
-                this.mCommonLog.setConnectionType(MemcardReadProgress.this.getApplicationContext());
+                mCommonLog.setConnectionType(MemcardReadProgress.this.getApplicationContext());
                 Integer valueOf = Integer.valueOf(copyFile);
                 this.cifsAccess.free();
                 return valueOf;
@@ -154,7 +154,7 @@ public class MemcardReadProgress extends Activity {
         }
 
         private int copyFile() {
-            Iterator it = MemcardReadProgress.this.mImageList.iterator();
+            Iterator it = MemcardReadProgress.mImageList.iterator();
             int i = 0;
             while (it.hasNext()) {
                 if (isCancelled()) {
@@ -162,7 +162,7 @@ public class MemcardReadProgress extends Activity {
                 }
                 publishProgress(new Integer[]{Integer.valueOf(i)});
                 String str = (String) it.next();
-                String format = String.format(Locale.US, "%s/IMG_%04d.JPG", new Object[]{MemcardReadProgress.this.mTargetFolderName, Integer.valueOf(i)});
+                String format = String.format(Locale.US, "%s/IMG_%04d.JPG", new Object[]{MemcardReadProgress.mTargetFolderName, Integer.valueOf(i)});
                 i++;
                 if (new File(format).exists()) {
                     EPLog.m313i(MemcardReadProgress.LOG_TAG, "local file exists. skip");
@@ -184,15 +184,15 @@ public class MemcardReadProgress extends Activity {
                     } else {
                         EPLog.m307e(MemcardReadProgress.LOG_TAG, "Failed MediaScannerConnection.scanFile path = " + replace);
                     }
-                    this.mCommonLog.numberOfSheet = i;
+                    mCommonLog.numberOfSheet = i;
                 }
             }
             return -2;
         }
 
         public void taskCancel() {
-            if (!this.mCanceling) {
-                this.mCanceling = true;
+            if (!mCanceling) {
+                mCanceling = true;
                 this.cifsAccess.cancel();
                 cancel(false);
             }

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

@@ -17,8 +17,8 @@ public class MemcardTop extends MemcardTopSuper {
     }
 
     protected void onCreate(Bundle bundle) {
-        this.mBitmapCache = MemcardBitmapCache.getInstance(this);
-        if (this.mBitmapCache == null || !this.mBitmapCache.checkEnv()) {
+        mBitmapCache = MemcardBitmapCache.getInstance(this);
+        if (mBitmapCache == null || !mBitmapCache.checkEnv()) {
             new MemcardTempAlertDialog().showAlertDialog(this, new MemcardTempAlertDialog.DialogCallback() {
                 public void onPositiveCallback() {
                     MemcardTop.this.finish();
@@ -31,7 +31,7 @@ public class MemcardTop extends MemcardTopSuper {
         super.onCreate(bundle);
         setContentView((int) R.layout.activity_memcard_top);
         setActionBar((int) R.string.FunctionName_iPrint_MemoryCard, true);
-        this.mLaunchType = 0;
+        mLaunchType = 0;
     }
 
     protected void onActivityResult(int i, int i2, Intent intent) {
@@ -42,14 +42,14 @@ public class MemcardTop extends MemcardTopSuper {
     }
 
     public void copy_term_to_mem(View view) {
-        if (this.mLaunchType == 0) {
-            this.mLaunchType = 1;
+        if (mLaunchType == 0) {
+            mLaunchType = 1;
             startMemcardStorageCheck();
         }
     }
 
     public void copy_term_from_mem(View view) {
-        if (this.mLaunchType == 0) {
+        if (mLaunchType == 0) {
             if (ActivityRequestPermissions.isRuntimePermissionSupported()) {
                 String[] strArr = {"android.permission.WRITE_EXTERNAL_STORAGE"};
                 ActivityRequestPermissions.Permission permission = new ActivityRequestPermissions.Permission(strArr[0], new String[]{getString(R.string.permission_dialog_title), getString(R.string.permission_dialog_title)}, new String[]{ActivityRequestPermissions.DialogParameter.setMessage2((Context) this, getString(R.string.permission_dialog_message_storage)), ActivityRequestPermissions.DialogParameter.setMessage3A((Context) this, getString(R.string.permission_dialog_message_storage), getString(R.string.permission_function_storage))});
@@ -63,7 +63,7 @@ public class MemcardTop extends MemcardTopSuper {
     }
 
     private void startReader() {
-        this.mLaunchType = 2;
+        mLaunchType = 2;
         startMemcardStorageCheck();
     }
 

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

@@ -50,13 +50,13 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        this.mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
-        this.mModelDialog.getDialogJob().observe(this, new Observer() {
+        mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
+        mModelDialog.getDialogJob().observe(this, new Observer() {
             public final void onChanged(Object obj) {
                 MemcardTopSuper.lambda$onCreate$0(MemcardTopSuper.this, (Deque) obj);
             }
         });
-        this.mReservationDialog = 0;
+        mReservationDialog = 0;
     }
 
     public static /* synthetic */ void lambda$onCreate$0(MemcardTopSuper memcardTopSuper, Deque deque) {
@@ -75,16 +75,16 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
 
     protected void onResume() {
         super.onResume();
-        this.mIsActivityForeground = true;
-        if (!showDialogOnResume() && this.mLaunchType != 0) {
+        mIsActivityForeground = true;
+        if (!showDialogOnResume() && mLaunchType != 0) {
             execMemcardCheck();
             this.isTryConnectSimpleAp = false;
         }
     }
 
     private boolean showDialogOnResume() {
-        int i = this.mReservationDialog;
-        this.mReservationDialog = 0;
+        int i = mReservationDialog;
+        mReservationDialog = 0;
         if (i == 0) {
             return false;
         }
@@ -97,9 +97,9 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
     }
 
     protected void onPause() {
-        this.mIsActivityForeground = false;
+        mIsActivityForeground = false;
         if (isFinishing()) {
-            this.mActivityIsFinishing = true;
+            mActivityIsFinishing = true;
             CifsAccess.clearSmbAuthInfo();
             releaseResource();
         }
@@ -137,9 +137,9 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
     }
 
     protected void execMemcardCheck() {
-        MemcardCheckTask memcardCheckTask = this.mMemcardCheckTask;
+        MemcardCheckTask memcardCheckTask = mMemcardCheckTask;
         if (memcardCheckTask == null || memcardCheckTask.getStatus() == AsyncTask.Status.FINISHED) {
-            this.mMemcardCheckTask = new MemcardCheckTask(this, new MemcardCheckTask.MemcardCheckCallback() {
+            mMemcardCheckTask = new MemcardCheckTask(this, new MemcardCheckTask.MemcardCheckCallback() {
                 public void onAuthInfoRequired(MemcardCheckTask memcardCheckTask, boolean z) {
                     MemcardTopSuper.this.authInfoRequested(memcardCheckTask, z);
                 }
@@ -152,46 +152,46 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
                     MemcardTopSuper.this.onMemcardCheckEnd(num, i);
                 }
             }, getStorageSetType());
-            this.mMemcardCheckTask.execute(new Void[0]);
+            mMemcardCheckTask.execute(new Void[0]);
         }
     }
 
     private void onPreMemcardChek() {
-        this.mModelDialog.doShow(DIALOG_PROGRESS);
+        mModelDialog.doShow(DIALOG_PROGRESS);
     }
 
     public void onPositiveClicked(String str, String str2) {
-        MemcardCheckTask memcardCheckTask = this.mMemcardCheckTask;
+        MemcardCheckTask memcardCheckTask = mMemcardCheckTask;
         if (memcardCheckTask != null) {
             memcardCheckTask.setAuthData(str, str2);
         }
-        this.mModelDialog.doShow(DIALOG_PROGRESS);
+        mModelDialog.doShow(DIALOG_PROGRESS);
     }
 
     public void onNegativeClicked() {
-        this.mLaunchType = 0;
-        MemcardCheckTask memcardCheckTask = this.mMemcardCheckTask;
+        mLaunchType = 0;
+        MemcardCheckTask memcardCheckTask = mMemcardCheckTask;
         if (memcardCheckTask != null) {
             memcardCheckTask.cancel(true);
         }
-        this.mModelDialog.doShow(DIALOG_PROGRESS);
+        mModelDialog.doShow(DIALOG_PROGRESS);
     }
 
     private void showPasswordDialog(boolean z) {
-        if (!this.mActivityIsFinishing) {
-            PasswordDialogFragment passwordDialogFragment = this.mPasswordDialogFragment;
+        if (!mActivityIsFinishing) {
+            PasswordDialogFragment passwordDialogFragment = mPasswordDialogFragment;
             if (passwordDialogFragment != null) {
                 passwordDialogFragment.dismissAllowingStateLoss();
             }
-            this.mModelDialog.doDismiss(DIALOG_PROGRESS);
-            this.mPasswordDialogFragment = PasswordDialogFragment.newInstance(z);
-            this.mPasswordDialogFragment.show(getSupportFragmentManager(), FRAGMENT_TAG_PASSWORD_DIALOG);
+            mModelDialog.doDismiss(DIALOG_PROGRESS);
+            mPasswordDialogFragment = PasswordDialogFragment.newInstance(z);
+            mPasswordDialogFragment.show(getSupportFragmentManager(), FRAGMENT_TAG_PASSWORD_DIALOG);
         }
     }
 
     protected void authInfoRequested(final MemcardCheckTask memcardCheckTask, final boolean z) {
-        if (!this.mIsActivityForeground) {
-            this.mReservationDialog = 50;
+        if (!mIsActivityForeground) {
+            mReservationDialog = 50;
         } else {
             runOnUiThread(new Runnable() {
                 public void run() {
@@ -205,16 +205,16 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
     }
 
     private void releaseResource() {
-        MemcardBitmapCache memcardBitmapCache = this.mBitmapCache;
+        MemcardBitmapCache memcardBitmapCache = mBitmapCache;
         if (memcardBitmapCache != null) {
             memcardBitmapCache.clearCache();
         }
     }
 
     private void localShowDialog(int i) {
-        if (!this.mActivityIsFinishing) {
-            if (!this.mIsActivityForeground) {
-                this.mReservationDialog = i;
+        if (!mActivityIsFinishing) {
+            if (!mIsActivityForeground) {
+                mReservationDialog = i;
                 return;
             }
             LocalAlertDialogFragment localAlertDialogFragment = null;
@@ -236,12 +236,12 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
     }
 
     private void onMemcardCheckEnd(Integer num, int i) {
-        this.mMemcardCheckTask = null;
-        this.mPasswordDialogFragment = null;
+        mMemcardCheckTask = null;
+        mPasswordDialogFragment = null;
         if (num == null || num.intValue() == 0) {
             WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, MemcardUtil.getPrinterIpAddress(this));
-            this.mLaunchType = 0;
-            this.mModelDialog.doDismiss(DIALOG_PROGRESS);
+            mLaunchType = 0;
+            mModelDialog.doDismiss(DIALOG_PROGRESS);
             if (i == 1) {
                 localShowDialog(1);
             } else if (i != 3) {
@@ -257,13 +257,13 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
                 localShowDialog(3);
             }
         } else {
-            this.mModelDialog.doDismiss(DIALOG_PROGRESS);
+            mModelDialog.doDismiss(DIALOG_PROGRESS);
             launchActivity(num.intValue());
         }
     }
 
     public void launchActivity(int i) {
-        switch (this.mLaunchType) {
+        switch (mLaunchType) {
             case 1:
                 launchWriterActivity();
                 WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, MemcardUtil.getPrinterIpAddress(this));
@@ -272,7 +272,7 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
                 launchReaderActivity(i);
                 break;
         }
-        this.mLaunchType = 0;
+        mLaunchType = 0;
     }
 
     private void showDialog(String str) {

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

@@ -54,30 +54,30 @@ public class MemcardWriteProgress extends Activity {
         super.onCreate(bundle);
         Utils.setFInishOnTOuchOutside(this, false);
         setContentView(R.layout.memcard_write_progress);
-        this.mCountDownLatch = new CountDownLatch(1);
-        this.mSheetPerTotalText = (TextView) findViewById(R.id.percent);
-        this.mTotalProgress = (ProgressBar) findViewById(R.id.progress_percent);
+        mCountDownLatch = new CountDownLatch(1);
+        mSheetPerTotalText = (TextView) findViewById(R.id.percent);
+        mTotalProgress = (ProgressBar) findViewById(R.id.progress_percent);
         Intent intent = getIntent();
-        this.mImageList = intent.getStringArrayListExtra("imageList");
-        this.mTargetFolderName = intent.getStringExtra("target_folder_name");
-        this.mMemcardStorageType = intent.getIntExtra("memcard_storage_type", 1);
-        if (this.mTargetFolderName == null) {
+        mImageList = intent.getStringArrayListExtra("imageList");
+        mTargetFolderName = intent.getStringExtra("target_folder_name");
+        mMemcardStorageType = intent.getIntExtra("memcard_storage_type", 1);
+        if (mTargetFolderName == null) {
             setResult(3);
             finish();
         }
-        this.mWriteFileList = intent.getStringArrayListExtra(KEY_WRITE_FILE_LIST);
-        ArrayList<String> arrayList = this.mWriteFileList;
+        mWriteFileList = intent.getStringArrayListExtra(KEY_WRITE_FILE_LIST);
+        ArrayList<String> arrayList = mWriteFileList;
         if (arrayList != null) {
-            if (!checkWriteFile(this.mImageList, arrayList)) {
+            if (!checkWriteFile(mImageList, arrayList)) {
                 setResult(3);
                 finish();
             }
             ((TextView) findViewById(R.id.copyingMessageText)).setText(R.string.mcphotocopy_sending_message);
         }
-        this.mCifsAccessStorageType = intent.getIntExtra(KEY_CIFS_STORAGE_TYPE, 1);
-        this.mWifiDirectConnector = new WifiDirectConnector(this, intent.getBooleanExtra(KEY_CHECK_WIFI_DIRECT, false));
-        this.mCancelButton = (Button) findViewById(R.id.cancel_button);
-        this.mCancelButton.setOnClickListener(new View.OnClickListener() {
+        mCifsAccessStorageType = intent.getIntExtra(KEY_CIFS_STORAGE_TYPE, 1);
+        mWifiDirectConnector = new WifiDirectConnector(this, intent.getBooleanExtra(KEY_CHECK_WIFI_DIRECT, false));
+        mCancelButton = (Button) findViewById(R.id.cancel_button);
+        mCancelButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 MemcardWriteProgress.this.actionCancelTask();
             }
@@ -87,8 +87,8 @@ public class MemcardWriteProgress extends Activity {
 
     protected void execCopyTask() {
         EPLog.m313i(LOG_TAG, "mCopyTask.execute()");
-        this.mCopyTask = new CopyTask(this, this.mCifsAccessStorageType, this.mMemcardStorageType, this.mImageList, this.mWriteFileList, this.mTargetFolderName, getLogData());
-        this.mCopyTask.executeOnExecutor(new Void[0]);
+        mCopyTask = new CopyTask(this, mCifsAccessStorageType, mMemcardStorageType, mImageList, mWriteFileList, mTargetFolderName, getLogData());
+        mCopyTask.executeOnExecutor(new Void[0]);
     }
 
     private CommonLog getLogData() {
@@ -140,7 +140,7 @@ public class MemcardWriteProgress extends Activity {
 
     protected void onResume() {
         super.onResume();
-        this.mWifiDirectConnector.tryConnectWifiDirect();
+        mWifiDirectConnector.tryConnectWifiDirect();
     }
 
     protected void onStop() {
@@ -151,27 +151,27 @@ public class MemcardWriteProgress extends Activity {
     }
 
     protected void actionCancelTask() {
-        this.mCancelButton.setEnabled(false);
+        mCancelButton.setEnabled(false);
         taskCancel();
     }
 
     protected void taskCancel() {
-        this.mCopyTask.taskCancel();
+        mCopyTask.taskCancel();
     }
 
     public void setProgressText(int i, int i2) {
-        this.mSheetPerTotalText.setText(String.format("%d/%d", new Object[]{Integer.valueOf(i), Integer.valueOf(i2)}));
+        mSheetPerTotalText.setText(String.format("%d/%d", new Object[]{Integer.valueOf(i), Integer.valueOf(i2)}));
     }
 
     public void setProgress(int i, int i2) {
         setProgressText(i, i2);
-        this.mTotalProgress.setMax(i2);
-        this.mTotalProgress.setProgress(i);
+        mTotalProgress.setMax(i2);
+        mTotalProgress.setProgress(i);
     }
 
     public void finishWithState(int i, int i2, @Nullable CommonLog commonLog) {
         EPLog.m305d(LOG_TAG, "finishWithState state = " + i);
-        this.mWifiDirectConnector.tryDisconnectWifiDirect();
+        mWifiDirectConnector.tryDisconnectWifiDirect();
         if (commonLog != null && commonLog.numberOfSheet > 0) {
             Analytics.sendCommonLog(this, commonLog);
         }
@@ -185,12 +185,12 @@ public class MemcardWriteProgress extends Activity {
     }
 
     private void connectOk() {
-        this.mCountDownLatch.countDown();
+        mCountDownLatch.countDown();
     }
 
     protected boolean waitWifiConnect() {
         try {
-            return this.mCountDownLatch.await(4, TimeUnit.MINUTES);
+            return mCountDownLatch.await(4, TimeUnit.MINUTES);
         } catch (InterruptedException e) {
             e.printStackTrace();
             return false;
@@ -203,20 +203,20 @@ public class MemcardWriteProgress extends Activity {
         private boolean mCheckWifiDirect;
 
         public WifiDirectConnector(Activity activity, boolean z) {
-            this.mCheckWifiDirect = z;
-            this.mActivity = activity;
+            mCheckWifiDirect = z;
+            mActivity = activity;
         }
 
         public void tryConnectWifiDirect() {
-            if (!this.mCheckWifiDirect) {
+            if (!mCheckWifiDirect) {
                 MemcardWriteProgress.this.connectOk();
                 return;
             }
-            if (!WiFiDirectManager.isNeedConnect(this.mActivity, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
+            if (!WiFiDirectManager.isNeedConnect(mActivity, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
                 this.isTryConnectSimpleAp = false;
             } else if (!this.isTryConnectSimpleAp) {
                 this.isTryConnectSimpleAp = true;
-                if (WiFiDirectManager.reconnect(this.mActivity, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
+                if (WiFiDirectManager.reconnect(mActivity, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
                     return;
                 }
             }
@@ -224,8 +224,8 @@ public class MemcardWriteProgress extends Activity {
         }
 
         public void tryDisconnectWifiDirect() {
-            if (this.mCheckWifiDirect) {
-                Activity activity = this.mActivity;
+            if (mCheckWifiDirect) {
+                Activity activity = mActivity;
                 WiFiDirectManager.disconnect(activity, WiFiDirectManager.DEVICE_TYPE_PRINTER, MemcardUtil.getPrinterIpAddress(activity));
             }
         }

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

@@ -41,18 +41,18 @@ public class PasswordDialogFragment extends DialogFragment implements DialogInte
         }
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         View inflate = View.inflate(getActivity(), R.layout.fragment_password_dialog, (ViewGroup) null);
-        this.mMessage = (TextView) inflate.findViewById(R.id.password_message);
-        this.mMessage.setText(z ? R.string.memcard_password_input_message : R.string.memcard_password_incorrect_message);
-        this.mUserNameEdit = (EditText) inflate.findViewById(R.id.memcardUsername);
-        this.mPasswordEdit = (EditText) inflate.findViewById(R.id.memcardPassword);
+        mMessage = (TextView) inflate.findViewById(R.id.password_message);
+        mMessage.setText(z ? R.string.memcard_password_input_message : R.string.memcard_password_incorrect_message);
+        mUserNameEdit = (EditText) inflate.findViewById(R.id.memcardUsername);
+        mPasswordEdit = (EditText) inflate.findViewById(R.id.memcardPassword);
         ((ImageButton) inflate.findViewById(R.id.imageButton1)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                PasswordDialogFragment.this.mUserNameEdit.getText().clear();
+                PasswordDialogFragment.mUserNameEdit.getText().clear();
             }
         });
         ((ImageButton) inflate.findViewById(R.id.imageButton2)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                PasswordDialogFragment.this.mPasswordEdit.getText().clear();
+                PasswordDialogFragment.mPasswordEdit.getText().clear();
             }
         });
         builder.setView(inflate).setPositiveButton(R.string.str_ok, new DialogInterface.OnClickListener() {
@@ -78,11 +78,11 @@ public class PasswordDialogFragment extends DialogFragment implements DialogInte
     }
 
     public String getPassword() {
-        return this.mPasswordEdit.getText().toString();
+        return mPasswordEdit.getText().toString();
     }
 
     public String getUserName() {
-        return this.mUserNameEdit.getText().toString();
+        return mUserNameEdit.getText().toString();
     }
 
     public boolean onKey(DialogInterface dialogInterface, int i, KeyEvent keyEvent) {

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

@@ -71,27 +71,27 @@ public class PhotoCopyImageSelectActivity extends ImageSelectActivity implements
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        this.mWaitingForTransferEnd = false;
+        mWaitingForTransferEnd = false;
         if (bundle != null) {
-            this.mWaitingForTransferEnd = bundle.getBoolean(SAVED_INSTANCE_STATE_KEY_WAITING_FOR_TRANSFER_END);
+            mWaitingForTransferEnd = bundle.getBoolean(SAVED_INSTANCE_STATE_KEY_WAITING_FOR_TRANSFER_END);
         }
-        this.mFileConvertViewModel = (FileConvertViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(FileConvertViewModel.class);
-        this.mFileConvertViewModel.getData().observe(this, this.mFileConvertStateObserver);
+        mFileConvertViewModel = (FileConvertViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(FileConvertViewModel.class);
+        mFileConvertViewModel.getData().observe(this, mFileConvertStateObserver);
     }
 
     protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         if (i == 106) {
-            this.mWaitingForTransferEnd = false;
+            mWaitingForTransferEnd = false;
             FileConvertTask.initTempDirectory();
             if (i2 == -2) {
                 finish();
             } else if (i2 != 0) {
-                this.mDialogType = new DialogType(112);
+                mDialogType = new DialogType(112);
                 if (intent != null) {
-                    this.mDialogType.mErrorCode = intent.getIntExtra(MemcardWriteProgress.RESULT_KEY_CIFS_ERROR_CODE, 0);
+                    mDialogType.mErrorCode = intent.getIntExtra(MemcardWriteProgress.RESULT_KEY_CIFS_ERROR_CODE, 0);
                 } else {
-                    this.mDialogType.mErrorCode = 0;
+                    mDialogType.mErrorCode = 0;
                 }
                 clearSelectFile();
             } else {
@@ -102,10 +102,10 @@ public class PhotoCopyImageSelectActivity extends ImageSelectActivity implements
 
     protected void onPostResume() {
         super.onPostResume();
-        DialogType dialogType = this.mDialogType;
+        DialogType dialogType = mDialogType;
         if (dialogType != null) {
             localShowDialog(dialogType);
-            this.mDialogType = null;
+            mDialogType = null;
         }
     }
 
@@ -115,7 +115,7 @@ public class PhotoCopyImageSelectActivity extends ImageSelectActivity implements
 
     protected void onSaveInstanceState(Bundle bundle) {
         super.onSaveInstanceState(bundle);
-        bundle.putBoolean(SAVED_INSTANCE_STATE_KEY_WAITING_FOR_TRANSFER_END, this.mWaitingForTransferEnd);
+        bundle.putBoolean(SAVED_INSTANCE_STATE_KEY_WAITING_FOR_TRANSFER_END, mWaitingForTransferEnd);
     }
 
     protected void clearSelectFile() {
@@ -125,7 +125,7 @@ public class PhotoCopyImageSelectActivity extends ImageSelectActivity implements
     protected void goNext() {
         ArrayList<String> fileArrayList = getImageSelector().getFileArrayList();
         if (fileArrayList.size() > 0) {
-            this.mFileConvertViewModel.startConvert(fileArrayList);
+            mFileConvertViewModel.startConvert(fileArrayList);
         }
     }
 
@@ -150,18 +150,18 @@ public class PhotoCopyImageSelectActivity extends ImageSelectActivity implements
         public int mErrorCode;
 
         public DialogType(int i) {
-            this.mDialogCode = i;
+            mDialogCode = i;
         }
 
         public AltAlertDialogFragment getDialogFragment(Context context) {
             String str = "";
             String str2 = null;
-            switch (this.mDialogCode) {
+            switch (mDialogCode) {
                 case 111:
                     str = context.getString(R.string.memcard_file_read_error_message);
                     break;
                 case 112:
-                    int i = this.mErrorCode;
+                    int i = mErrorCode;
                     if (i == 5) {
                         str2 = context.getString(R.string.memcard_capacity_shortage_error_title);
                         str = context.getString(R.string.mcphotocopy_capacity_shortage_error_message);
@@ -219,7 +219,7 @@ public class PhotoCopyImageSelectActivity extends ImageSelectActivity implements
             localShowDialog(new DialogType(getErrorDialogType(errorType)));
             clearSelectFile();
         } else if (arrayList != null) {
-            this.mWaitingForTransferEnd = true;
+            mWaitingForTransferEnd = true;
             startWriteProgressActivity(arrayList);
         }
     }

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

@@ -13,13 +13,13 @@ public class PhotoCopyWriteProgress extends MemcardWriteProgress {
 
     protected void taskCancel() {
         EPLog.m313i("PhotoCopyWriteProgress", "taskCancel()");
-        this.mCopyTask.taskCancelByFileSizeZero();
+        mCopyTask.taskCancelByFileSizeZero();
     }
 
     protected void execCopyTask() {
-        this.mCopyTask = new CopyTask(this, this.mCifsAccessStorageType, this.mMemcardStorageType, this.mImageList, this.mWriteFileList, this.mTargetFolderName, getLogData());
-        this.mCopyTask.setCheck(true, false);
-        this.mCopyTask.executeOnExecutor(new Void[0]);
+        mCopyTask = new CopyTask(this, mCifsAccessStorageType, mMemcardStorageType, mImageList, mWriteFileList, mTargetFolderName, getLogData());
+        mCopyTask.setCheck(true, false);
+        mCopyTask.executeOnExecutor(new Void[0]);
     }
 
     private CommonLog getLogData() {

+ 7 - 7
app/src/main/java/com/epson/memcardacc/ReaderSelectedImage.java

@@ -16,8 +16,8 @@ class ReaderSelectedImage implements Serializable {
 
     public ArrayList<String> getAllFileFullPath() {
         ArrayList<String> arrayList = new ArrayList<>();
-        for (String next : this.mDataMap.keySet()) {
-            for (CifsFileInfo cifsFileInfo : this.mDataMap.get(next)) {
+        for (String next : mDataMap.keySet()) {
+            for (CifsFileInfo cifsFileInfo : mDataMap.get(next)) {
                 arrayList.add(CifsAccess.join(next, cifsFileInfo.mFileName));
             }
         }
@@ -25,7 +25,7 @@ class ReaderSelectedImage implements Serializable {
     }
 
     public boolean contains(String str, CifsFileInfo cifsFileInfo) {
-        Collection collection = this.mDataMap.get(str);
+        Collection collection = mDataMap.get(str);
         if (collection == null) {
             return false;
         }
@@ -33,20 +33,20 @@ class ReaderSelectedImage implements Serializable {
     }
 
     public void deleteBaseDir(String str) {
-        this.mDataMap.remove(str);
+        mDataMap.remove(str);
     }
 
     public int getFileSize() {
         int i = 0;
-        for (String str : this.mDataMap.keySet()) {
-            i += this.mDataMap.get(str).size();
+        for (String str : mDataMap.keySet()) {
+            i += mDataMap.get(str).size();
         }
         return i;
     }
 
     public void setFileList(String str, LinkedList<CifsFileInfo> linkedList) {
         if (!linkedList.isEmpty()) {
-            this.mDataMap.put(str, linkedList);
+            mDataMap.put(str, linkedList);
         }
     }
 }

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

@@ -6,19 +6,19 @@ public class SmbAuthInfo {
     public String mUserName;
 
     public SmbAuthInfo(String str, String str2) {
-        this.mUserName = str;
-        this.mPassword = str2;
+        mUserName = str;
+        mPassword = str2;
     }
 
     public void setUserNameAndPassword(String str, String str2) {
-        this.mIsPasswordValid = true;
-        this.mUserName = str;
-        this.mPassword = str2;
+        mIsPasswordValid = true;
+        mUserName = str;
+        mPassword = str2;
     }
 
     public void clearData() {
-        this.mIsPasswordValid = false;
-        this.mUserName = null;
-        this.mPassword = null;
+        mIsPasswordValid = false;
+        mUserName = null;
+        mPassword = null;
     }
 }

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

@@ -56,13 +56,13 @@ public class ReviewInvitationDialog extends DialogFragment {
     }
 
     private void doCallback(boolean z) {
-        this.mOnClickListener.invitationDialogClicked(z);
+        mOnClickListener.invitationDialogClicked(z);
     }
 
     public void onAttach(Context context) {
         super.onAttach(context);
         try {
-            this.mOnClickListener = (OnClickListener) context;
+            mOnClickListener = (OnClickListener) context;
         } catch (ClassCastException unused) {
             throw new ClassCastException(context.toString() + " must implement ReviewInvitationDialog.OnClickListener");
         }
@@ -70,6 +70,6 @@ public class ReviewInvitationDialog extends DialogFragment {
 
     public void onDetach() {
         super.onDetach();
-        this.mOnClickListener = null;
+        mOnClickListener = null;
     }
 }

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

@@ -13,26 +13,26 @@ public class ReviewInvitationViewModel extends AndroidViewModel {
 
     public ReviewInvitationViewModel(@NonNull Application application) {
         super(application);
-        this.mShowStoreInvitation.setValue(false);
+        mShowStoreInvitation.setValue(false);
     }
 
     /* access modifiers changed from: package-private */
     @VisibleForTesting
     public void setStoreReviewObject(StoreReview storeReview) {
-        this.mStoreReview = storeReview;
+        mStoreReview = storeReview;
     }
 
     public MutableLiveData<Boolean> getShowInvitationLiveData() {
-        return this.mShowStoreInvitation;
+        return mShowStoreInvitation;
     }
 
     public void setStartStoreEnd() {
-        this.mShowStoreInvitation.setValue(false);
+        mShowStoreInvitation.setValue(false);
     }
 
     public void onPrintEnd(boolean z) {
-        if (z && checkLanguage() && this.mStoreReview.checkPrintSuccessCount(getApplication())) {
-            this.mShowStoreInvitation.setValue(true);
+        if (z && checkLanguage() && mStoreReview.checkPrintSuccessCount(getApplication())) {
+            mShowStoreInvitation.setValue(true);
         }
     }
 

+ 26 - 26
app/src/main/java/com/epson/mobilephone/common/ble/BleAsyncTask.java

@@ -53,15 +53,15 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
         mTimeOutTask = new Runnable() {
             public void run() {
                 try {
-                    BleAsyncTask.this.get(BleAsyncTask.this.mTimeOut, TimeUnit.MILLISECONDS);
+                    BleAsyncTask.this.get(BleAsyncTask.mTimeOut, TimeUnit.MILLISECONDS);
                 } catch (InterruptedException unused) {
                     EpLog.m71e("InterruptedException");
                 } catch (ExecutionException unused2) {
                     EpLog.m71e("ExecutionException");
                 } catch (TimeoutException unused3) {
                     EpLog.m77i("Running task has timed out!!");
-                    if (BleAsyncTask.this.mBleWork != null) {
-                        BleAsyncTask.this.mBleWork.stopScan();
+                    if (BleAsyncTask.mBleWork != null) {
+                        BleAsyncTask.mBleWork.stopScan();
                     }
                     BleAsyncTask.mTask.cancel(true);
                 } catch (CancellationException unused4) {
@@ -69,24 +69,24 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
                 }
             }
         };
-        this.m_Activity = activity;
-        this.mTimeOut = (long) (BleWork.getScanAdvertisingPacketTimeout() + 2000);
-        this.mTimeOutScan = -1;
+        m_Activity = activity;
+        mTimeOut = (long) (BleWork.getScanAdvertisingPacketTimeout() + 2000);
+        mTimeOutScan = -1;
     }
 
     public BleAsyncTask(Activity activity, BLEUtility.BleWorkCallback bleWorkCallback, int i) {
         mTimeOutTask = new Runnable() {
             public void run() {
                 try {
-                    BleAsyncTask.this.get(BleAsyncTask.this.mTimeOut, TimeUnit.MILLISECONDS);
+                    BleAsyncTask.this.get(BleAsyncTask.mTimeOut, TimeUnit.MILLISECONDS);
                 } catch (InterruptedException unused) {
                     EpLog.m71e("InterruptedException");
                 } catch (ExecutionException unused2) {
                     EpLog.m71e("ExecutionException");
                 } catch (TimeoutException unused3) {
                     EpLog.m77i("Running task has timed out!!");
-                    if (BleAsyncTask.this.mBleWork != null) {
-                        BleAsyncTask.this.mBleWork.stopScan();
+                    if (BleAsyncTask.mBleWork != null) {
+                        BleAsyncTask.mBleWork.stopScan();
                     }
                     BleAsyncTask.mTask.cancel(true);
                 } catch (CancellationException unused4) {
@@ -94,15 +94,15 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
                 }
             }
         };
-        this.m_Activity = activity;
-        this.mTimeOut = (long) (i + 2000);
-        this.mTimeOutScan = (long) i;
-        this.mCallBack = bleWorkCallback;
+        m_Activity = activity;
+        mTimeOut = (long) (i + 2000);
+        mTimeOutScan = (long) i;
+        mCallBack = bleWorkCallback;
     }
 
     protected void onPreExecute() {
         super.onPreExecute();
-        this.mBleWork = BleScanWork.getInstace();
+        mBleWork = BleScanWork.getInstace();
     }
 
     /* access modifiers changed from: protected */
@@ -209,34 +209,34 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
     }
 
     private void showAdvanceToSettingDialog() {
-        if (this.mCallBack != null) {
-            this.mDevicelist = this.mBleWork.getScannedDeviceList();
+        if (mCallBack != null) {
+            mDevicelist = mBleWork.getScannedDeviceList();
             ArrayList arrayList = new ArrayList();
-            for (ScannedDevice next : this.mDevicelist) {
+            for (ScannedDevice next : mDevicelist) {
                 arrayList.add(new ScannedDevice(next.getDevice(), next.getRssi(), next.getDisplayName(), next.getHardwareType()));
             }
             EpLog.m69d(" ★ mDevicelist " + arrayList.size());
-            this.mCallBack.call(arrayList);
+            mCallBack.call(arrayList);
             return;
         }
-        dialog = new AlertDialog.Builder(this.m_Activity).setCancelable(false).setMessage(this.m_Activity.getString(R.string.BLE_find_unconfigured_printer_title)).setPositiveButton(this.m_Activity.getString(R.string.BLE_find_unconfigured_printer_setup_button), new DialogInterface.OnClickListener() {
+        dialog = new AlertDialog.Builder(m_Activity).setCancelable(false).setMessage(m_Activity.getString(R.string.BLE_find_unconfigured_printer_title)).setPositiveButton(m_Activity.getString(R.string.BLE_find_unconfigured_printer_setup_button), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 EpLog.m69d("★ stopScan");
-                BleAsyncTask.this.mBleWork.stopScan();
+                BleAsyncTask.mBleWork.stopScan();
                 BleAsyncTask bleAsyncTask = BleAsyncTask.this;
                 List unused = bleAsyncTask.mDevicelist = bleAsyncTask.mBleWork.getScannedDeviceList();
                 ArrayList arrayList = new ArrayList();
-                for (ScannedDevice scannedDevice : BleAsyncTask.this.mDevicelist) {
+                for (ScannedDevice scannedDevice : BleAsyncTask.mDevicelist) {
                     arrayList.add(new ScannedDevice(scannedDevice.getDevice(), scannedDevice.getRssi(), scannedDevice.getDisplayName(), scannedDevice.getHardwareType()));
                 }
-                Intent intent = new Intent(BleAsyncTask.this.m_Activity.getApplicationContext(), BleWorkActivity.class);
+                Intent intent = new Intent(BleAsyncTask.m_Activity.getApplicationContext(), BleWorkActivity.class);
                 intent.putParcelableArrayListExtra(ScannedDevice.TYPE, arrayList);
-                BleAsyncTask.this.m_Activity.startActivity(intent);
+                BleAsyncTask.m_Activity.startActivity(intent);
             }
-        }).setNegativeButton(this.m_Activity.getString(R.string.BLE_find_unconfigured_printer_not_now_button), new DialogInterface.OnClickListener() {
+        }).setNegativeButton(m_Activity.getString(R.string.BLE_find_unconfigured_printer_not_now_button), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 EpLog.m69d("★ stopScan");
-                BleAsyncTask.this.mBleWork.stopScan();
+                BleAsyncTask.mBleWork.stopScan();
                 BleAsyncTask.setStop(true);
             }
         }).create();
@@ -253,7 +253,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
     }
 
     public BleAsyncTask setTimeOut(long j) {
-        this.mTimeOut = j;
+        mTimeOut = j;
         return this;
     }
 

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

@@ -58,11 +58,11 @@ public class BleScanWork {
     }
 
     private BleScanWork() {
-        this.mSuccess = null;
-        this.mFailed = null;
-        this.mScannedDeviceList = new CopyOnWriteArrayList();
+        mSuccess = null;
+        mFailed = null;
+        mScannedDeviceList = new CopyOnWriteArrayList();
         if (Build.VERSION.SDK_INT >= 21) {
-            this.mScanCallback = new ScanCallback() {
+            mScanCallback = new ScanCallback() {
                 @RequiresApi(api = 21)
                 public void onScanResult(int i, @NonNull ScanResult scanResult) {
                     ScanRecord scanRecord = scanResult.getScanRecord();
@@ -79,9 +79,9 @@ public class BleScanWork {
                                 sb.append(BLEUtility.IntToHex2(b & UnsignedBytes.MAX_VALUE));
                             }
                             String deviceName = getDeviceName(scanResult);
-                            if (deviceName != null && !deviceName.isEmpty() && scanResult.getRssi() >= -75 && scanResult.getRssi() < 127 && BleScanWork.this.update(scanResult.getDevice(), scanResult.getRssi(), deviceName, valueAt) && BleScanWork.this.mScannedDeviceList.size() > 0 && BleScanWork.this.mSuccess != null) {
-                                EpLog.m71e("mScannedDeviceList --- " + BleScanWork.this.mScannedDeviceList.size());
-                                BleScanWork.this.mSuccess.call(BleScanWork.this.mScannedDeviceList);
+                            if (deviceName != null && !deviceName.isEmpty() && scanResult.getRssi() >= -75 && scanResult.getRssi() < 127 && BleScanWork.this.update(scanResult.getDevice(), scanResult.getRssi(), deviceName, valueAt) && BleScanWork.mScannedDeviceList.size() > 0 && BleScanWork.mSuccess != null) {
+                                EpLog.m71e("mScannedDeviceList --- " + BleScanWork.mScannedDeviceList.size());
+                                BleScanWork.mSuccess.call(BleScanWork.mScannedDeviceList);
                                 return;
                             }
                             return;
@@ -101,7 +101,7 @@ public class BleScanWork {
                 }
             };
         }
-        this.mLeScanCallback = new BluetoothAdapter.LeScanCallback() {
+        mLeScanCallback = new BluetoothAdapter.LeScanCallback() {
             public void onLeScan(BluetoothDevice bluetoothDevice, int i, @NonNull byte[] bArr) {
                 StringBuilder sb = new StringBuilder();
                 StringBuilder sb2 = new StringBuilder();
@@ -117,14 +117,14 @@ public class BleScanWork {
                         sb3.append(BLEUtility.IntToHex2(bArr[i4] & UnsignedBytes.MAX_VALUE));
                     }
                 }
-                if (BleScanWork.this.mIsFiltering && BLEUuid.SERVICE_SNMP.replace("-", "").equalsIgnoreCase(sb.toString()) && i >= -75 && i < 127) {
+                if (BleScanWork.mIsFiltering && BLEUuid.SERVICE_SNMP.replace("-", "").equalsIgnoreCase(sb.toString()) && i >= -75 && i < 127) {
                     String name = bluetoothDevice.getName();
                     byte[] bArr2 = new byte[3];
                     System.arraycopy(bArr, 7, bArr2, 0, bArr2.length);
                     EpLog.m69d(name + " Company information = " + sb2 + " getManufacturerSpecificData = " + sb3);
-                    if (BleScanWork.this.update(bluetoothDevice, i, name, bArr2) && BleScanWork.this.mSuccess != null && name != null) {
-                        EpLog.m71e("mScannedDeviceList --- " + BleScanWork.this.mScannedDeviceList.size());
-                        BleScanWork.this.mSuccess.call(BleScanWork.this.mScannedDeviceList);
+                    if (BleScanWork.this.update(bluetoothDevice, i, name, bArr2) && BleScanWork.mSuccess != null && name != null) {
+                        EpLog.m71e("mScannedDeviceList --- " + BleScanWork.mScannedDeviceList.size());
+                        BleScanWork.mSuccess.call(BleScanWork.mScannedDeviceList);
                     }
                 }
             }
@@ -133,12 +133,12 @@ public class BleScanWork {
 
     @NonNull
     public ArrayList<ScannedDevice> getScannedDeviceList() {
-        return new ArrayList<>(this.mScannedDeviceList);
+        return new ArrayList<>(mScannedDeviceList);
     }
 
     private void search(BLEUtility.BleWorkCallback bleWorkCallback, BLEUtility.BleWorkCallback bleWorkCallback2) {
-        this.mSuccess = bleWorkCallback;
-        this.mFailed = bleWorkCallback2;
+        mSuccess = bleWorkCallback;
+        mFailed = bleWorkCallback2;
         startScan(true);
     }
 
@@ -147,7 +147,7 @@ public class BleScanWork {
         if (bluetoothDevice == null || bluetoothDevice.getAddress() == null) {
             return false;
         }
-        Iterator<ScannedDevice> it = this.mScannedDeviceList.iterator();
+        Iterator<ScannedDevice> it = mScannedDeviceList.iterator();
         while (true) {
             if (!it.hasNext()) {
                 z = false;
@@ -163,7 +163,7 @@ public class BleScanWork {
         if (z) {
             return false;
         }
-        this.mScannedDeviceList.add(new ScannedDevice(bluetoothDevice, i, str, bArr));
+        mScannedDeviceList.add(new ScannedDevice(bluetoothDevice, i, str, bArr));
         EpLog.m77i("☆☆ = " + str + ":" + i);
         return true;
     }
@@ -174,15 +174,15 @@ public class BleScanWork {
         }
         BluetoothManager manager = BLEUtility.getManager(context);
         if (manager != null) {
-            this.mBTAdapter = manager.getAdapter();
+            mBTAdapter = manager.getAdapter();
         }
-        BluetoothAdapter bluetoothAdapter = this.mBTAdapter;
+        BluetoothAdapter bluetoothAdapter = mBTAdapter;
         if (bluetoothAdapter == null || !bluetoothAdapter.isEnabled()) {
             return false;
         }
         if (Build.VERSION.SDK_INT >= 21) {
-            this.mBluetoothLeScanner = this.mBTAdapter.getBluetoothLeScanner();
-            if (this.mBluetoothLeScanner == null) {
+            mBluetoothLeScanner = mBTAdapter.getBluetoothLeScanner();
+            if (mBluetoothLeScanner == null) {
                 return false;
             }
         }
@@ -194,23 +194,23 @@ public class BleScanWork {
     private void startScan(boolean z) {
         ScanSettings scanSettings;
         EpLog.m77i("☆startScan☆");
-        this.mScannedDeviceList.clear();
-        this.mIsFiltering = z;
-        if (this.mBTAdapter != null && !this.mIsScanning) {
+        mScannedDeviceList.clear();
+        mIsFiltering = z;
+        if (mBTAdapter != null && !mIsScanning) {
             if (Build.VERSION.SDK_INT < 21) {
-                this.mBTAdapter.startLeScan(this.mLeScanCallback);
+                mBTAdapter.startLeScan(mLeScanCallback);
             } else if (Build.VERSION.SDK_INT >= 21) {
                 ArrayList arrayList = new ArrayList();
-                if (this.mIsFiltering) {
+                if (mIsFiltering) {
                     arrayList.add(new ScanFilter.Builder().setServiceUuid(ParcelUuid.fromString(BLEUuid.SERVICE_SNMP)).build());
                     scanSettings = new ScanSettings.Builder().setScanMode(2).setReportDelay(0).build();
                 } else {
                     scanSettings = new ScanSettings.Builder().setScanMode(2).build();
                 }
-                BluetoothLeScanner bluetoothLeScanner = this.mBluetoothLeScanner;
+                BluetoothLeScanner bluetoothLeScanner = mBluetoothLeScanner;
                 if (bluetoothLeScanner != null) {
-                    bluetoothLeScanner.startScan(arrayList, scanSettings, this.mScanCallback);
-                    this.mIsScanning = true;
+                    bluetoothLeScanner.startScan(arrayList, scanSettings, mScanCallback);
+                    mIsScanning = true;
                 }
             }
         }
@@ -218,20 +218,20 @@ public class BleScanWork {
 
     public void stopScan() {
         EpLog.m77i("stopScan");
-        if (this.mBTAdapter == null) {
+        if (mBTAdapter == null) {
             return;
         }
         if (Build.VERSION.SDK_INT < 21) {
-            this.mBTAdapter.stopLeScan(this.mLeScanCallback);
+            mBTAdapter.stopLeScan(mLeScanCallback);
             EpLog.m77i("mLeScanCallback");
-            this.mIsScanning = false;
+            mIsScanning = false;
             return;
         }
-        BluetoothLeScanner bluetoothLeScanner = this.mBluetoothLeScanner;
+        BluetoothLeScanner bluetoothLeScanner = mBluetoothLeScanner;
         if (bluetoothLeScanner != null) {
-            bluetoothLeScanner.stopScan(this.mScanCallback);
+            bluetoothLeScanner.stopScan(mScanCallback);
             EpLog.m77i("mScanCallback");
-            this.mIsScanning = false;
+            mIsScanning = false;
         }
     }
 }

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

@@ -124,44 +124,44 @@ public class BleWork {
 
     @NonNull
     public List<String> getSsidLis() {
-        return this.mSsidLis;
+        return mSsidLis;
     }
 
     public void setSSID(String str) {
-        this.mSSID = str;
+        mSSID = str;
     }
 
     public void setRetryFinish() {
-        this.mRetry = 3;
+        mRetry = 3;
     }
 
     public String getSSID() {
-        return this.mSSID;
+        return mSSID;
     }
 
     public synchronized void setSecurityType(short s) {
-        this.mSecurityType = s;
+        mSecurityType = s;
     }
 
     public synchronized short getSecurityType() {
-        return this.mSecurityType;
+        return mSecurityType;
     }
 
     public void setSSIDPassword(String str) {
-        this.mSSIDPassword = str;
+        mSSIDPassword = str;
     }
 
     public String getSSIDPassword() {
-        String str = this.mSSIDPassword;
+        String str = mSSIDPassword;
         return str != null ? str : "";
     }
 
     public void setTimeOut(long j) {
-        this.mTimeOut = j;
+        mTimeOut = j;
     }
 
     public String getDeviceMacAddress() {
-        String str = this.mDeviceMacAddress;
+        String str = mDeviceMacAddress;
         if (str == null) {
             return "";
         }
@@ -169,29 +169,29 @@ public class BleWork {
     }
 
     public String getDeviceName() {
-        return this.mSelectItem.getDisplayName();
+        return mSelectItem.getDisplayName();
     }
 
     private BleWork() {
-        this.mSuccess = null;
-        this.mFailed = null;
-        this.mSequenceCallbackSuccess = null;
-        this.mSequenceCallbackFailed = null;
-        this.mResposne = null;
-        this.mSsidLis = new ArrayList();
-        this.mTimeOut = -1;
-        this.mEscprlib = EscprLib.getInstance();
-        this.mMibCommand = new MIBCommand();
-        this.mIndex = 0;
-        this.mInSequence = false;
-        this.mEngineID = this.mEscprlib.getEngineId(IprintApplication.getInstance());
-        this.mReconnect = false;
-        this.mSequence = jobSequence.UNINITIALIZED;
-        this.mGattcallback = null;
-        if (this.mGattcallback != null) {
+        mSuccess = null;
+        mFailed = null;
+        mSequenceCallbackSuccess = null;
+        mSequenceCallbackFailed = null;
+        mResposne = null;
+        mSsidLis = new ArrayList();
+        mTimeOut = -1;
+        mEscprlib = EscprLib.getInstance();
+        mMibCommand = new MIBCommand();
+        mIndex = 0;
+        mInSequence = false;
+        mEngineID = mEscprlib.getEngineId(IprintApplication.getInstance());
+        mReconnect = false;
+        mSequence = jobSequence.UNINITIALIZED;
+        mGattcallback = null;
+        if (mGattcallback != null) {
             EpLog.m71e("mGattcallback != null");
         }
-        this.mGattcallback = new BluetoothGattCallback() {
+        mGattcallback = new BluetoothGattCallback() {
             public void onMtuChanged(BluetoothGatt bluetoothGatt, int i, int i2) {
                 super.onMtuChanged(bluetoothGatt, i, i2);
                 EpLog.m77i("onMtuChanged " + i);
@@ -202,15 +202,15 @@ public class BleWork {
                 BleWork.this.showStatus("DescriptorWrite", i);
                 if (i != 0) {
                     BleWork.this.sequenceError();
-                } else if (BleWork.this.mResposne != null) {
-                    BleWork.this.mResposne.call(bluetoothGattDescriptor);
+                } else if (BleWork.mResposne != null) {
+                    BleWork.mResposne.call(bluetoothGattDescriptor);
                 }
             }
 
             public void onConnectionStateChange(BluetoothGatt bluetoothGatt, int i, int i2) {
                 EpLog.m77i("status = " + i + "  newState = " + i2);
                 if (i == 0 && i2 == 2) {
-                    EpLog.m77i("STATE_CONNECTED  -- " + BleWork.this.mSequence);
+                    EpLog.m77i("STATE_CONNECTED  -- " + BleWork.mSequence);
                     BleWork bleWork = BleWork.this;
                     bleWork.mStatus = i2;
                     if (bleWork.mConnGatt == null) {
@@ -219,13 +219,13 @@ public class BleWork {
                     if (bluetoothGatt == null) {
                         EpLog.m71e("gatt  NULL !");
                     }
-                    BluetoothGatt unused = BleWork.this.mConnGatt = bluetoothGatt;
+                    BluetoothGatt unused = BleWork.mConnGatt = bluetoothGatt;
                     BleWork.this.handlerWrite.removeCallbacks((Runnable) null);
                     BleWork.this.handlerWrite.postDelayed(new Runnable() {
                         public void run() {
                             EpLog.m77i("discoverServices");
                             try {
-                                if (!((BluetoothGatt) Objects.requireNonNull(BleWork.this.mConnGatt)).discoverServices()) {
+                                if (!((BluetoothGatt) Objects.requireNonNull(BleWork.mConnGatt)).discoverServices()) {
                                     EpLog.m71e("discoverServices error");
                                 }
                             } catch (NullPointerException unused) {
@@ -234,32 +234,32 @@ public class BleWork {
                         }
                     }, 500);
                 } else if (i != 0 || i2 == 0) {
-                    EpLog.m77i("STATE_DISCONNECTED " + BleWork.this.mSequence + " mReconnect = " + BleWork.this.mReconnect + " mRetry  " + BleWork.this.mRetry);
-                    if (!BleWork.this.mReconnect && BleWork.this.mSequence == jobSequence.UNINITIALIZED) {
+                    EpLog.m77i("STATE_DISCONNECTED " + BleWork.mSequence + " mReconnect = " + BleWork.mReconnect + " mRetry  " + BleWork.mRetry);
+                    if (!BleWork.mReconnect && BleWork.mSequence == jobSequence.UNINITIALIZED) {
                         BleWork.this.failedProcessing();
-                    } else if (BleWork.this.mReconnect || BleWork.this.mSequence == jobSequence.UNINITIALIZED || BleWork.this.mSequence == jobSequence.MIB_REBOOT_NW || BleWork.this.mSequence == jobSequence.DISCONNECTED || BleWork.this.mSequence == jobSequence.MIB_SET_SSID || BleWork.this.mSequence == jobSequence.AFTER_SETTING_PASSWORD) {
+                    } 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.m69d("★ stopScan");
                         BleScanWork.getInstace().stopScan();
                         BleWork bleWork2 = BleWork.this;
                         bleWork2.mStatus = i2;
-                        if ((bleWork2.mSequence == jobSequence.AFTER_SETTING_PASSWORD || BleWork.this.mSequence == jobSequence.BEFORE_CHECK_SSID || BleWork.this.mSequence == jobSequence.MIB_SET_SSID || BleWork.this.mSequence == jobSequence.MIB_REBOOT_NW) && !BleWork.this.mReconnect) {
-                            if (BleWork.this.mSequence == jobSequence.MIB_REBOOT_NW) {
+                        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();
                             }
-                            EpLog.m77i(" BREAK ★ mSequence " + BleWork.this.mSequence);
+                            EpLog.m77i(" BREAK ★ mSequence " + BleWork.mSequence);
                             return;
                         }
                         BleWork.this.gattClose();
-                        if (BleWork.this.mSequence != jobSequence.UNINITIALIZED && !BleWork.this.mReconnect) {
+                        if (BleWork.mSequence != jobSequence.UNINITIALIZED && !BleWork.mReconnect) {
                             return;
                         }
-                        if (BleWork.this.mRetry < 3) {
+                        if (BleWork.mRetry < 3) {
                             try {
                                 TimeUnit.SECONDS.sleep(5);
                             } catch (InterruptedException e) {
                                 e.printStackTrace();
                             }
-                            EpLog.m82w("retry " + BleWork.this.mRetry);
+                            EpLog.m82w("retry " + BleWork.mRetry);
                             BleWork.access$508(BleWork.this);
                             EpLog.m71e("init");
                             boolean unused2 = BleWork.this.init();
@@ -288,8 +288,8 @@ public class BleWork {
                                         next2.setValue(next.getCharacteristic(UUID.fromString((String) next2.getKey())));
                                     }
                                     if (!BLEUuid.GattCharsMap.containsValue((Object) null)) {
-                                        boolean unused = BleWork.this.mReconnect = false;
-                                        BleWork.this.mSequenceCallbackSuccess.call(BleWork.this.mSequence);
+                                        boolean unused = BleWork.mReconnect = false;
+                                        BleWork.mSequenceCallbackSuccess.call(BleWork.mSequence);
                                         new NotifySetThread().execute(new Void[0]);
                                     } else {
                                         throw new BleException(1, "getCharacteristic Error !");
@@ -326,10 +326,10 @@ public class BleWork {
                     String sh2 = valueOf2.toString();
                     EpLog.m77i("[Notify]Security Type " + sh2);
                     if (valueOf2.shortValue() <= 0) {
-                        BleWork.this.mSsidLis.clear();
+                        BleWork.mSsidLis.clear();
                         BleWork.this.getSSIDList();
-                    } else if (BleWork.this.mSequenceCallbackSuccess != null) {
-                        BleWork.this.mSequenceCallbackSuccess.call(BleWork.this.mSequence);
+                    } else if (BleWork.mSequenceCallbackSuccess != null) {
+                        BleWork.mSequenceCallbackSuccess.call(BleWork.mSequence);
                     }
                 } else {
                     String sh3 = Short.valueOf(bluetoothGattCharacteristic.getIntValue(17, 0).shortValue()).toString();
@@ -342,7 +342,7 @@ public class BleWork {
                 if (i == 0) {
                     readCharacteristicData(bluetoothGattCharacteristic);
                 } else {
-                    byte unused = BleWork.this.mIndex = (byte) 0;
+                    byte unused = BleWork.mIndex = (byte) 0;
                 }
             }
 
@@ -776,40 +776,40 @@ public class BleWork {
             }
 
             private void IncrementSequence() {
-                int ordinal = BleWork.this.mSequence.ordinal();
+                int ordinal = BleWork.mSequence.ordinal();
                 jobSequence[] values = jobSequence.values();
-                BleWork.this.mSequence = values[ordinal + 1];
-                EpLog.m77i("ΔΔ mSequence = " + BleWork.this.mSequence);
+                BleWork.mSequence = values[ordinal + 1];
+                EpLog.m77i("ΔΔ mSequence = " + BleWork.mSequence);
             }
 
             public void onCharacteristicWrite(BluetoothGatt bluetoothGatt, BluetoothGattCharacteristic bluetoothGattCharacteristic, int i) {
                 BleWork.this.showStatus("Write", i);
                 if (i != 0) {
-                    byte unused = BleWork.this.mIndex = (byte) 0;
-                    if (BleWork.this.mSequence == jobSequence.INITIALIZE) {
+                    byte unused = BleWork.mIndex = (byte) 0;
+                    if (BleWork.mSequence == jobSequence.INITIALIZE) {
                         BleWork.this.failedProcessing();
-                    } else if (BleWork.this.mSequence == jobSequence.MIB_REBOOT_NW) {
-                        if (BleWork.this.mSuccess != null) {
-                            BleWork.this.mSuccess.call(BleWork.this.mSequence);
+                    } else if (BleWork.mSequence == jobSequence.MIB_REBOOT_NW) {
+                        if (BleWork.mSuccess != null) {
+                            BleWork.mSuccess.call(BleWork.mSequence);
                         }
-                    } else if (BleWork.this.mFailed != null) {
-                        BleWork.this.mFailed.call(BleWork.this.mSequence);
+                    } else if (BleWork.mFailed != null) {
+                        BleWork.mFailed.call(BleWork.mSequence);
                     }
-                } else if (BleWork.this.mSequence == jobSequence.INITIALIZE) {
+                } else if (BleWork.mSequence == jobSequence.INITIALIZE) {
                     BleWork.this.characteristicRead();
-                } else if (BleWork.this.mSequence == jobSequence.MIB_REBOOT_NW && BleWork.this.mSuccess != null) {
-                    BleWork.this.mSuccess.call(BleWork.this.mSequence);
+                } else if (BleWork.mSequence == jobSequence.MIB_REBOOT_NW && BleWork.mSuccess != null) {
+                    BleWork.mSuccess.call(BleWork.mSequence);
                 }
             }
 
             private void notifySet(@NonNull BluetoothGattCharacteristic bluetoothGattCharacteristic) {
-                if (!BleWork.this.mConnGatt.setCharacteristicNotification(bluetoothGattCharacteristic, true)) {
+                if (!BleWork.mConnGatt.setCharacteristicNotification(bluetoothGattCharacteristic, true)) {
                     EpLog.m71e("Notification set ERROR");
                 }
                 BluetoothGattDescriptor descriptor = bluetoothGattCharacteristic.getDescriptor(UUID.fromString(BLEUuid.CLIENT_CHARACTERISTIC_CONFIG));
                 descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
                 EpLog.m77i("notify set");
-                if (!BleWork.this.mConnGatt.writeDescriptor(descriptor)) {
+                if (!BleWork.mConnGatt.writeDescriptor(descriptor)) {
                     EpLog.m71e("Notification write ERROR");
                 }
             }
@@ -831,12 +831,12 @@ public class BleWork {
     }
 
     public void resetSequence() {
-        this.mSequence = jobSequence.UNINITIALIZED;
-        this.mDevice = null;
-        this.mSSIDPassword = null;
-        this.mSsidLis.clear();
-        this.mReconnect = false;
-        this.mConnGatt = null;
+        mSequence = jobSequence.UNINITIALIZED;
+        mDevice = null;
+        mSSIDPassword = null;
+        mSsidLis.clear();
+        mReconnect = false;
+        mConnGatt = null;
     }
 
     @NonNull
@@ -866,32 +866,32 @@ public class BleWork {
     }
 
     private void setSequenceCallback(BLEUtility.BleWorkCallback bleWorkCallback, BLEUtility.BleWorkCallback bleWorkCallback2) {
-        this.mSequenceCallbackSuccess = bleWorkCallback;
-        this.mSequenceCallbackFailed = bleWorkCallback2;
+        mSequenceCallbackSuccess = bleWorkCallback;
+        mSequenceCallbackFailed = bleWorkCallback2;
     }
 
     private void setNotifyCallback(BLEUtility.BleWorkCallback bleWorkCallback) {
-        this.mResposne = bleWorkCallback;
+        mResposne = bleWorkCallback;
     }
 
     private void setSSID(BLEUtility.BleWorkCallback bleWorkCallback, BLEUtility.BleWorkCallback bleWorkCallback2) {
-        this.mSuccess = bleWorkCallback;
-        this.mFailed = bleWorkCallback2;
-        this.mSequence = jobSequence.MIB_GET_MACADDRESS;
+        mSuccess = bleWorkCallback;
+        mFailed = bleWorkCallback2;
+        mSequence = jobSequence.MIB_GET_MACADDRESS;
         setSSIDWork();
     }
 
     public void disconnect(boolean z) {
-        EpLog.m77i("mSequence == " + this.mSequence + ":: " + this.mStatus);
-        this.mSequence = z ? jobSequence.DISCONNECTED : this.mSequence;
-        if (this.mConnGatt != null) {
-            int i = this.mStatus;
+        EpLog.m77i("mSequence == " + mSequence + ":: " + mStatus);
+        mSequence = z ? jobSequence.DISCONNECTED : mSequence;
+        if (mConnGatt != null) {
+            int i = mStatus;
             if (!(i == 3 || i == 0)) {
                 EpLog.m69d(" !! mConnGatt disconnect");
-                this.mConnGatt.disconnect();
+                mConnGatt.disconnect();
             }
-            EpLog.m69d(" !! mConnGatt close " + this.mSequence + " " + this.mStatus);
-            this.mReconnect = false;
+            EpLog.m69d(" !! mConnGatt close " + mSequence + " " + mStatus);
+            mReconnect = false;
             if (z) {
                 gattClose();
             }
@@ -900,10 +900,10 @@ public class BleWork {
 
     private void gattClose() {
         EpLog.m69d(" !! mConnGatt close");
-        BluetoothGatt bluetoothGatt = this.mConnGatt;
+        BluetoothGatt bluetoothGatt = mConnGatt;
         if (bluetoothGatt != null) {
             bluetoothGatt.close();
-            this.mConnGatt = null;
+            mConnGatt = null;
         }
     }
 
@@ -913,14 +913,14 @@ public class BleWork {
 
     public void connect() {
         EpLog.m77i("再接続");
-        this.mReconnect = true;
-        this.mRetry = 0;
+        mReconnect = true;
+        mRetry = 0;
         EpLog.m71e("init");
         init();
     }
 
     private void setSSIDWork() {
-        ((Activity) this.mContext).runOnUiThread(new Runnable() {
+        ((Activity) mContext).runOnUiThread(new Runnable() {
             public void run() {
                 BleWork.this.startSetSSID();
             }
@@ -928,13 +928,13 @@ public class BleWork {
     }
 
     private void notifySet(@NonNull BluetoothGattCharacteristic bluetoothGattCharacteristic) {
-        if (!this.mConnGatt.setCharacteristicNotification(bluetoothGattCharacteristic, true)) {
+        if (!mConnGatt.setCharacteristicNotification(bluetoothGattCharacteristic, true)) {
             EpLog.m71e("Notification set ERROR");
         }
         BluetoothGattDescriptor descriptor = bluetoothGattCharacteristic.getDescriptor(UUID.fromString(BLEUuid.CLIENT_CHARACTERISTIC_CONFIG));
         descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
         EpLog.m77i("notify set");
-        if (!this.mConnGatt.writeDescriptor(descriptor)) {
+        if (!mConnGatt.writeDescriptor(descriptor)) {
             EpLog.m71e(" writeDescriptor ERROR");
         }
     }
@@ -1006,7 +1006,7 @@ public class BleWork {
                 } catch (InterruptedException e) {
                     e.printStackTrace();
                 }
-                BleWork.this.mSequence = jobSequence.INITIALIZE;
+                BleWork.mSequence = jobSequence.INITIALIZE;
                 BleWork.this.checkPassword();
                 return;
             }
@@ -1016,12 +1016,12 @@ public class BleWork {
     }
 
     private void characteristicRead() {
-        EpLog.m77i("read " + this.mSequence);
-        if (this.mSequence != jobSequence.MIB_REBOOT_NW) {
+        EpLog.m77i("read " + mSequence);
+        if (mSequence != jobSequence.MIB_REBOOT_NW) {
             final int[] iArr = {0};
             this.handlerRead.postDelayed(new Runnable() {
                 public void run() {
-                    switch (C10195.$SwitchMap$com$epson$mobilephone$common$ble$BleWork$jobSequence[BleWork.this.mSequence.ordinal()]) {
+                    switch (C10195.$SwitchMap$com$epson$mobilephone$common$ble$BleWork$jobSequence[BleWork.mSequence.ordinal()]) {
                         case 1:
                         case 2:
                         case 3:
@@ -1032,7 +1032,7 @@ public class BleWork {
                         case 8:
                         case 11:
                             try {
-                                if (!((BluetoothGatt) Objects.requireNonNull(BleWork.this.mConnGatt)).readCharacteristic(BLEUuid.GattCharsMap.get(BLEUuid.CHAR_SNMP_RESPONSE_STRING))) {
+                                if (!((BluetoothGatt) Objects.requireNonNull(BleWork.mConnGatt)).readCharacteristic(BLEUuid.GattCharsMap.get(BLEUuid.CHAR_SNMP_RESPONSE_STRING))) {
                                     int[] iArr = iArr;
                                     int i = iArr[0] + 1;
                                     iArr[0] = i;
@@ -1052,13 +1052,13 @@ public class BleWork {
                                 return;
                             }
                         case 9:
-                            if (!BleWork.this.mConnGatt.readCharacteristic(BLEUuid.GattCharsMap.get(BLEUuid.CHAR_PASSWORD_STRING))) {
+                            if (!BleWork.mConnGatt.readCharacteristic(BLEUuid.GattCharsMap.get(BLEUuid.CHAR_PASSWORD_STRING))) {
                                 EpLog.m71e("FALSE !! ");
                                 return;
                             }
                             return;
                         case 10:
-                            if (!BleWork.this.mConnGatt.readCharacteristic(BLEUuid.GattCharsMap.get(BLEUuid.CHAR_VERSION_STRING))) {
+                            if (!BleWork.mConnGatt.readCharacteristic(BLEUuid.GattCharsMap.get(BLEUuid.CHAR_VERSION_STRING))) {
                                 EpLog.m71e("FALSE !! ");
                                 return;
                             }
@@ -1073,75 +1073,75 @@ public class BleWork {
 
     private boolean init() {
         int i;
-        this.mEscprlib.epsWrapperInitDriver(this.mContext.getApplicationContext(), 2);
-        if (!BLEUtility.isBLESupported(this.mContext)) {
+        mEscprlib.epsWrapperInitDriver(mContext.getApplicationContext(), 2);
+        if (!BLEUtility.isBLESupported(mContext)) {
             return false;
         }
-        BluetoothManager manager = BLEUtility.getManager(this.mContext);
+        BluetoothManager manager = BLEUtility.getManager(mContext);
         if (manager != null) {
-            this.mBTAdapter = manager.getAdapter();
+            mBTAdapter = manager.getAdapter();
         }
-        if (this.mBTAdapter == null) {
+        if (mBTAdapter == null) {
             return false;
         }
-        if (this.mDevice == null) {
-            this.mDevice = this.mSelectItem.getDevice();
-            if (this.mDevice == null) {
+        if (mDevice == null) {
+            mDevice = mSelectItem.getDevice();
+            if (mDevice == null) {
                 EpLog.m71e("mDevice is null !!!");
                 return false;
             }
         }
-        byte[] hardwareType = this.mSelectItem.getHardwareType();
+        byte[] hardwareType = mSelectItem.getHardwareType();
         if (hardwareType.length >= 3) {
             i = 4096 - ByteBuffer.wrap(new byte[]{0, 0, hardwareType[2], hardwareType[1]}).getInt();
         } else {
             i = Constants.EDAM_APPLICATIONDATA_ENTRY_LEN_MAX;
         }
         EpLog.m69d("password = " + i);
-        this.mDevicePassword = String.valueOf(i);
-        if (this.mConnGatt == null && this.mStatus == 0) {
+        mDevicePassword = String.valueOf(i);
+        if (mConnGatt == null && mStatus == 0) {
             EpLog.m77i("connectGatt");
-            this.mConnGatt = this.mDevice.connectGatt(this.mContext, false, this.mGattcallback);
-            this.mStatus = 1;
-            if (!this.mReconnect) {
-                this.mSequence = jobSequence.UNINITIALIZED;
+            mConnGatt = mDevice.connectGatt(mContext, false, mGattcallback);
+            mStatus = 1;
+            if (!mReconnect) {
+                mSequence = jobSequence.UNINITIALIZED;
             }
-        } else if (this.mConnGatt != null) {
+        } else if (mConnGatt != null) {
             EpLog.m77i("re-connect and re-discover Services");
-            this.mConnGatt.close();
-            this.mConnGatt = this.mDevice.connectGatt(this.mContext, false, this.mGattcallback);
-            this.mConnGatt.connect();
-            this.mConnGatt.discoverServices();
-            if (!this.mReconnect) {
-                this.mSequence = jobSequence.INITIALIZE;
+            mConnGatt.close();
+            mConnGatt = mDevice.connectGatt(mContext, false, mGattcallback);
+            mConnGatt.connect();
+            mConnGatt.discoverServices();
+            if (!mReconnect) {
+                mSequence = jobSequence.INITIALIZE;
             }
         } else {
             EpLog.m77i("  STATE_CONNECTING");
-            this.mConnGatt = this.mDevice.connectGatt(this.mContext, false, this.mGattcallback);
-            this.mStatus = 1;
-            if (!this.mReconnect) {
-                this.mSequence = jobSequence.DISCONNECTED;
+            mConnGatt = mDevice.connectGatt(mContext, false, mGattcallback);
+            mStatus = 1;
+            if (!mReconnect) {
+                mSequence = jobSequence.DISCONNECTED;
             }
         }
         return true;
     }
 
     public boolean init(@NonNull Context context, @NonNull ScannedDevice scannedDevice) {
-        this.mContext = context;
-        this.mSelectItem = scannedDevice;
-        this.mRetry = 0;
-        this.mSequence = jobSequence.UNINITIALIZED;
+        mContext = context;
+        mSelectItem = scannedDevice;
+        mRetry = 0;
+        mSequence = jobSequence.UNINITIALIZED;
         setSecurityType(0);
-        this.mReconnect = true;
-        this.mSSID = getSSID(this.mContext);
-        EpLog.m77i(this.mSSID);
+        mReconnect = true;
+        mSSID = getSSID(mContext);
+        EpLog.m77i(mSSID);
         EpLog.m71e("init");
         return init();
     }
 
     public void checkPassword() {
         EpLog.m76i();
-        String str = this.mDevicePassword;
+        String str = mDevicePassword;
         if (!str.isEmpty()) {
             BluetoothGattCharacteristic bluetoothGattCharacteristic = BLEUuid.GattCharsMap.get(BLEUuid.CHAR_PASSWORD_STRING);
             bluetoothGattCharacteristic.setValue(Short.parseShort(str), 18, 0);
@@ -1155,14 +1155,14 @@ public class BleWork {
         this.handlerWrite.removeCallbacks((Runnable) null);
         this.handlerWrite.postDelayed(new Runnable() {
             public void run() {
-                if (BleWork.this.mConnGatt == null) {
+                if (BleWork.mConnGatt == null) {
                     EpLog.m71e("mConnGatt  NULL !");
                 }
                 if (bluetoothGattCharacteristic == null) {
                     EpLog.m71e("characteristic  NULL !");
                 }
                 try {
-                    if (!((BluetoothGatt) Objects.requireNonNull(BleWork.this.mConnGatt)).writeCharacteristic(bluetoothGattCharacteristic)) {
+                    if (!((BluetoothGatt) Objects.requireNonNull(BleWork.mConnGatt)).writeCharacteristic(bluetoothGattCharacteristic)) {
                         int[] iArr = iArr;
                         int i = iArr[0] + 1;
                         iArr[0] = i;
@@ -1187,19 +1187,19 @@ public class BleWork {
     }
 
     public void getSSIDList() {
-        this.mInSequence = true;
-        this.mSequence = jobSequence.MIB_GET_SSID_LIST;
-        EscprLib escprLib = this.mEscprlib;
-        MIBCommand mIBCommand = this.mMibCommand;
-        byte b = (byte) (this.mIndex + 1);
-        this.mIndex = b;
+        mInSequence = true;
+        mSequence = jobSequence.MIB_GET_SSID_LIST;
+        EscprLib escprLib = mEscprlib;
+        MIBCommand mIBCommand = mMibCommand;
+        byte b = (byte) (mIndex + 1);
+        mIndex = b;
         int mibGetESSIDList = escprLib.mibGetESSIDList(mIBCommand, b);
         if (mibGetESSIDList != 0) {
             EpLog.m71e("mibGetESSIDList ret = " + mibGetESSIDList);
             return;
         }
-        byte[] bArr = new byte[this.mMibCommand.commandBlock.bufSize];
-        System.arraycopy(this.mMibCommand.commandBlock.buf, 0, bArr, 0, this.mMibCommand.commandBlock.bufSize);
+        byte[] bArr = new byte[mMibCommand.commandBlock.bufSize];
+        System.arraycopy(mMibCommand.commandBlock.buf, 0, bArr, 0, mMibCommand.commandBlock.bufSize);
         BluetoothGattCharacteristic bluetoothGattCharacteristic = BLEUuid.GattCharsMap.get(BLEUuid.CHAR_SNMP_REQUEST_STRING);
         bluetoothGattCharacteristic.setValue(bArr);
         gattWriteCharacter(bluetoothGattCharacteristic);
@@ -1211,16 +1211,16 @@ public class BleWork {
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
-        byte[] bytes = this.mSSID.getBytes(Charset.forName("UTF8"));
+        byte[] bytes = mSSID.getBytes(Charset.forName("UTF8"));
         BluetoothGattCharacteristic bluetoothGattCharacteristic = BLEUuid.GattCharsMap.get(BLEUuid.CHAR_SSID_STRING);
         bluetoothGattCharacteristic.setValue(bytes);
-        EpLog.m77i("SSID write :" + this.mSSID);
+        EpLog.m77i("SSID write :" + mSSID);
         gattWriteCharacter(bluetoothGattCharacteristic);
     }
 
     public void setSSIDType() {
-        this.mSequence = jobSequence.CHECK_SSID;
-        if (this.mConnGatt == null) {
+        mSequence = jobSequence.CHECK_SSID;
+        if (mConnGatt == null) {
             EpLog.m71e("mConnGatt  NULL !");
         }
         checkSSID();
@@ -1228,22 +1228,22 @@ public class BleWork {
 
     private void startSetSSID() {
         int i;
-        EpLog.m77i("mSequence = " + this.mSequence + " mSSID =  " + this.mSSID);
-        this.mInSequence = false;
+        EpLog.m77i("mSequence = " + mSequence + " mSSID =  " + mSSID);
+        mInSequence = false;
         String str = "";
         String str2 = "";
-        switch (this.mSequence) {
+        switch (mSequence) {
             case MIB_GET_MACADDRESS:
                 str = "epsGetMacAddress";
                 str2 = "mibGetMacadress";
-                i = this.mEscprlib.mibGetMacadress(this.mMibCommand);
+                i = mEscprlib.mibGetMacadress(mMibCommand);
                 break;
             case MIB_SET_SSID:
                 str = "epsWlanConfSSID";
                 str2 = "mibSetSSID";
-                EpLog.m77i("mSSID  " + this.mSSID);
-                if (!this.mSSID.isEmpty()) {
-                    i = this.mEscprlib.mibSetSSID(this.mMibCommand, this.mSSID);
+                EpLog.m77i("mSSID  " + mSSID);
+                if (!mSSID.isEmpty()) {
+                    i = mEscprlib.mibSetSSID(mMibCommand, mSSID);
                     break;
                 } else {
                     EpLog.m82w("set SSID :  empty");
@@ -1252,53 +1252,53 @@ public class BleWork {
             case MIB_SEC_LOGIN:
                 str = "epsAdminMibAccessLoginOperation";
                 str2 = "mibSecLogin ";
-                if (this.mEngineID == null) {
+                if (mEngineID == null) {
                     EpLog.m71e("mEngineID");
                     failedProcessing();
                 }
-                i = this.mEscprlib.mibSecLogin(this.mMibCommand, this.mEngineID);
+                i = mEscprlib.mibSecLogin(mMibCommand, mEngineID);
                 break;
             case MIB_SEC_SET_PASS:
                 str = "epsWlanCommonPassPhrase";
                 str2 = "mibSecSetPass ";
-                String str3 = this.mSSIDPassword;
-                EpLog.m77i("mSSIDPassword  " + this.mSSIDPassword);
+                String str3 = mSSIDPassword;
+                EpLog.m77i("mSSIDPassword  " + mSSIDPassword);
                 if (str3.isEmpty()) {
                     EpLog.m82w("SSIDPassword is empty");
                 }
-                if (this.mEngineID == null) {
+                if (mEngineID == null) {
                     EpLog.m71e("mEngineID");
                     failedProcessing();
                 }
-                i = this.mEscprlib.mibSecSetPassword(this.mMibCommand, this.mEngineID, str3);
+                i = mEscprlib.mibSecSetPassword(mMibCommand, mEngineID, str3);
                 break;
             case MIB_SEC_LOGOUT:
                 str = "epsAdminMibAccessLogOutOperation";
                 str2 = "mibSecLogout ";
-                if (this.mEngineID == null) {
+                if (mEngineID == null) {
                     EpLog.m71e("mEngineID");
                     failedProcessing();
                 }
-                i = this.mEscprlib.mibSecLogout(this.mMibCommand, this.mEngineID);
+                i = mEscprlib.mibSecLogout(mMibCommand, mEngineID);
                 break;
             case MIB_SET_SECURITY_TYPE:
                 str = "epsWlanSecurityType";
                 str2 = "mibSetSecurityType ";
-                if (this.mSSIDPassword == null) {
-                    this.mSSIDPassword = "";
+                if (mSSIDPassword == null) {
+                    mSSIDPassword = "";
                 }
-                int i2 = this.mSSIDPassword.isEmpty() ? 0 : 255;
+                int i2 = mSSIDPassword.isEmpty() ? 0 : 255;
                 EpLog.m77i("MIB_SET_SECURITY_TYPE SecurityType = " + i2);
-                int mibSetSecurityType = this.mEscprlib.mibSetSecurityType(this.mMibCommand, i2);
+                int mibSetSecurityType = mEscprlib.mibSetSecurityType(mMibCommand, i2);
                 if (i2 == 0) {
-                    this.mSequence = jobSequence.MIB_SEC_SKIP;
+                    mSequence = jobSequence.MIB_SEC_SKIP;
                 }
                 i = mibSetSecurityType;
                 break;
             case MIB_REBOOT_NW:
                 str = "epsBluetoothOperationSetupEnd";
                 str2 = "mibRebootNW  ";
-                i = this.mEscprlib.mibRebootNWwithBLE(this.mMibCommand);
+                i = mEscprlib.mibRebootNWwithBLE(mMibCommand);
                 break;
             default:
                 i = 0;
@@ -1309,9 +1309,9 @@ public class BleWork {
             sequenceError();
             return;
         }
-        byte[] bArr = new byte[this.mMibCommand.commandBlock.bufSize];
-        System.arraycopy(this.mMibCommand.commandBlock.buf, 0, bArr, 0, this.mMibCommand.commandBlock.bufSize);
-        EpLog.m77i("SNMP Request write :" + str + " mSequence   " + this.mSequence);
+        byte[] bArr = new byte[mMibCommand.commandBlock.bufSize];
+        System.arraycopy(mMibCommand.commandBlock.buf, 0, bArr, 0, mMibCommand.commandBlock.bufSize);
+        EpLog.m77i("SNMP Request write :" + str + " mSequence   " + mSequence);
         BluetoothGattCharacteristic bluetoothGattCharacteristic = BLEUuid.GattCharsMap.get(BLEUuid.CHAR_SNMP_REQUEST_STRING);
         bluetoothGattCharacteristic.setValue(bArr);
         gattWriteCharacter(bluetoothGattCharacteristic);
@@ -1323,9 +1323,9 @@ public class BleWork {
 
     private void failedProcessing() {
         disconnect();
-        if (this.mSequenceCallbackFailed != null) {
-            EpLog.m71e(" " + this.mSequence);
-            this.mSequenceCallbackFailed.call(this.mSequence);
+        if (mSequenceCallbackFailed != null) {
+            EpLog.m71e(" " + mSequence);
+            mSequenceCallbackFailed.call(mSequence);
         }
     }
 }

+ 141 - 141
app/src/main/java/com/epson/mobilephone/common/ble/BleWorkActivity.java

@@ -83,20 +83,20 @@ public class BleWorkActivity extends ActivityIACommon {
         setContentView((int) R.layout.activity_scan);
         setActionBar((int) R.string.BLE_select_unconfigured_printer_title, true);
         findViewById(R.id.progress_bar).setVisibility(8);
-        this.mContext = this;
+        mContext = this;
         callBackFuncs();
         getWindow().addFlags(128);
-        this.mProbePrinter = ProbePrinter.create().setContext(this.mContext);
-        this.mBleWork = BleWork.getInstace();
-        this.mBleWork.resetSequence();
+        mProbePrinter = ProbePrinter.create().setContext(mContext);
+        mBleWork = BleWork.getInstace();
+        mBleWork.resetSequence();
     }
 
     protected void onResume() {
         ArrayList parcelableArrayListExtra;
         super.onResume();
-        this.mProbePrinter.bindEpsonService();
+        mProbePrinter.bindEpsonService();
         EpLog.m77i("mSequence = " + BleWork.getInstace().mSequence);
-        if (this.mDeviceAdapter == null && BleWork.getInstace().mSequence == BleWork.jobSequence.UNINITIALIZED && (parcelableArrayListExtra = getIntent().getParcelableArrayListExtra(ScannedDevice.TYPE)) != null && parcelableArrayListExtra.size() > 0) {
+        if (mDeviceAdapter == null && BleWork.getInstace().mSequence == BleWork.jobSequence.UNINITIALIZED && (parcelableArrayListExtra = getIntent().getParcelableArrayListExtra(ScannedDevice.TYPE)) != null && parcelableArrayListExtra.size() > 0) {
             init(parcelableArrayListExtra);
         }
     }
@@ -120,11 +120,11 @@ public class BleWorkActivity extends ActivityIACommon {
 
     protected void onDestroy() {
         super.onDestroy();
-        this.mProbePrinter.unbindEpsonService();
+        mProbePrinter.unbindEpsonService();
     }
 
     private void callBackFuncs() {
-        this.mCompletion = new CallbackWork() {
+        mCompletion = new CallbackWork() {
             public void call(Object obj) {
                 if (!(obj instanceof Boolean)) {
                     EpLog.m71e(" type mismatch !");
@@ -139,27 +139,27 @@ public class BleWorkActivity extends ActivityIACommon {
                     EpLog.m77i("count = " + BleWorkActivity.this.count);
                 }
                 BleWorkActivity.this.stopCallbacks();
-                if (BleWorkActivity.this.mAlertDialog != null && BleWorkActivity.this.mAlertDialog.isShowing()) {
+                if (BleWorkActivity.mAlertDialog != null && BleWorkActivity.mAlertDialog.isShowing()) {
                     BleWorkActivity.this.runOnUiThread(new Runnable() {
                         public void run() {
                             EpLog.m77i("dismiss ");
-                            BleWorkActivity.this.mAlertDialog.dismiss();
-                            BleWorkActivity.this.mAlertDialog = null;
+                            BleWorkActivity.mAlertDialog.dismiss();
+                            BleWorkActivity.mAlertDialog = null;
                         }
                     });
                 }
-                BleWorkActivity.this.mBleWork.resetSequence();
+                BleWorkActivity.mBleWork.resetSequence();
                 BleWorkActivity.this.settingResultDailog(bool.booleanValue());
             }
         };
-        this.mNext = new CallbackWork() {
+        mNext = new CallbackWork() {
             public void call(Object obj) {
                 BleWorkActivity.this.stopWifiSearch();
-                Handler unused = BleWorkActivity.this.mWifiSearchHandler = new Handler();
+                Handler unused = BleWorkActivity.mWifiSearchHandler = new Handler();
                 BleWorkActivity.this.runOnUiThread(new Runnable() {
                     public void run() {
                         EpLog.m77i("setSSID");
-                        BleWorkActivity.this.mBleWork.setSSID(new BLEUtility.BleWorkCallback() {
+                        BleWorkActivity.mBleWork.setSSID(new BLEUtility.BleWorkCallback() {
                             public void call(Object obj) {
                                 Runnable unused = BleWorkActivity.this.runnableWifiSearch = new Runnable() {
                                     int postCount = 0;
@@ -168,53 +168,53 @@ public class BleWorkActivity extends ActivityIACommon {
                                         int i = this.postCount;
                                         if (i >= 2) {
                                             EpLog.m77i("postCount >= 2 ");
-                                            BleWorkActivity.this.mProbePrinter.interruptSearch();
-                                            if (BleWorkActivity.this.mAlertDialog != null) {
-                                                BleWorkActivity.this.mAlertDialog.dismiss();
-                                                BleWorkActivity.this.mAlertDialog = null;
+                                            BleWorkActivity.mProbePrinter.interruptSearch();
+                                            if (BleWorkActivity.mAlertDialog != null) {
+                                                BleWorkActivity.mAlertDialog.dismiss();
+                                                BleWorkActivity.mAlertDialog = null;
                                             }
-                                            if (BleWorkActivity.this.mCompletion != null) {
-                                                BleWorkActivity.this.mCompletion.call(false);
+                                            if (BleWorkActivity.mCompletion != null) {
+                                                BleWorkActivity.mCompletion.call(false);
                                                 return;
                                             }
                                             return;
                                         }
                                         if (i == 1) {
-                                            BleWorkActivity.this.mProbePrinter.setMacAddress(BleWorkActivity.this.mBleWork.getDeviceMacAddress());
-                                            BleWorkActivity.this.mProbePrinter.setBleCallback(BleWorkActivity.this.mCompletion);
+                                            BleWorkActivity.mProbePrinter.setMacAddress(BleWorkActivity.mBleWork.getDeviceMacAddress());
+                                            BleWorkActivity.mProbePrinter.setBleCallback(BleWorkActivity.mCompletion);
                                             try {
-                                                BleWorkActivity.this.mProbePrinter.search();
+                                                BleWorkActivity.mProbePrinter.search();
                                             } catch (IllegalStateException e) {
                                                 EpLog.m71e(e.getMessage());
-                                                BleWorkActivity.this.mProbePrinter.interruptSearch();
-                                                if (BleWorkActivity.this.mAlertDialog != null) {
-                                                    BleWorkActivity.this.mAlertDialog.dismiss();
-                                                    BleWorkActivity.this.mAlertDialog = null;
+                                                BleWorkActivity.mProbePrinter.interruptSearch();
+                                                if (BleWorkActivity.mAlertDialog != null) {
+                                                    BleWorkActivity.mAlertDialog.dismiss();
+                                                    BleWorkActivity.mAlertDialog = null;
                                                 }
-                                                if (BleWorkActivity.this.mCompletion != null) {
-                                                    BleWorkActivity.this.mCompletion.call(false);
+                                                if (BleWorkActivity.mCompletion != null) {
+                                                    BleWorkActivity.mCompletion.call(false);
                                                 }
                                             }
                                         }
                                         this.postCount++;
-                                        if (BleWorkActivity.this.mCompletion != null) {
+                                        if (BleWorkActivity.mCompletion != null) {
                                             StringBuilder sb = new StringBuilder();
                                             sb.append("postDelayed  postCount = ");
                                             sb.append(this.postCount);
                                             sb.append(" delay ");
                                             sb.append(this.postCount == 1 ? 10000 : BleWorkActivity.SECOND_DELAY);
                                             EpLog.m77i(sb.toString());
-                                            BleWorkActivity.this.mWifiSearchHandler.postDelayed(this, this.postCount == 1 ? 10000 : 200000);
+                                            BleWorkActivity.mWifiSearchHandler.postDelayed(this, this.postCount == 1 ? 10000 : 200000);
                                         }
                                     }
                                 };
-                                BleWorkActivity.this.mWifiSearchHandler.post(BleWorkActivity.this.runnableWifiSearch);
+                                BleWorkActivity.mWifiSearchHandler.post(BleWorkActivity.this.runnableWifiSearch);
                             }
                         }, new BLEUtility.BleWorkCallback() {
                             public void call(Object obj) {
                                 EpLog.m71e("BleWorkCallback");
-                                if (BleWorkActivity.this.mCompletion != null) {
-                                    BleWorkActivity.this.mCompletion.call(false);
+                                if (BleWorkActivity.mCompletion != null) {
+                                    BleWorkActivity.mCompletion.call(false);
                                 }
                             }
                         });
@@ -222,16 +222,16 @@ public class BleWorkActivity extends ActivityIACommon {
                 });
             }
         };
-        this.mSequenceCallbackSuccess = new BLEUtility.BleWorkCallback() {
+        mSequenceCallbackSuccess = new BLEUtility.BleWorkCallback() {
             public void call(Object obj) {
                 BleWork.jobSequence jobsequence = (BleWork.jobSequence) obj;
                 EpLog.m77i("mSequenceCallbackSuccess  " + jobsequence);
                 if (jobsequence == BleWork.jobSequence.UNINITIALIZED || jobsequence == BleWork.jobSequence.BEFORE_CHECK_SSID || jobsequence == BleWork.jobSequence.MIB_GET_MACADDRESS || jobsequence == BleWork.jobSequence.AFTER_SETTING_PASSWORD) {
                     BleWorkActivity.this.stopConnectTimeOut();
                 }
-                if (!(jobsequence == BleWork.jobSequence.UNINITIALIZED || jobsequence == BleWork.jobSequence.BEFORE_CHECK_SSID || !BleWorkActivity.this.mBleWork.getSSIDPassword().isEmpty() || BleWorkActivity.this.mAlertDialog == null || ((jobsequence == BleWork.jobSequence.CHECK_SSID && BleWorkActivity.this.mBleWork.getSecurityType() == 1) || BleWorkActivity.this.mBleWork.getSecurityType() == 255))) {
-                    BleWorkActivity.this.mAlertDialog.dismiss();
-                    BleWorkActivity.this.mAlertDialog = null;
+                if (!(jobsequence == BleWork.jobSequence.UNINITIALIZED || jobsequence == BleWork.jobSequence.BEFORE_CHECK_SSID || !BleWorkActivity.mBleWork.getSSIDPassword().isEmpty() || BleWorkActivity.mAlertDialog == null || ((jobsequence == BleWork.jobSequence.CHECK_SSID && BleWorkActivity.mBleWork.getSecurityType() == 1) || BleWorkActivity.mBleWork.getSecurityType() == 255))) {
+                    BleWorkActivity.mAlertDialog.dismiss();
+                    BleWorkActivity.mAlertDialog = null;
                     EpLog.m77i("mAlertDialog        dismiss " + jobsequence);
                 }
                 if (jobsequence == BleWork.jobSequence.CHECK_SSID) {
@@ -241,7 +241,7 @@ public class BleWorkActivity extends ActivityIACommon {
                 }
             }
         };
-        this.mSequenceCallbackFailed = new BLEUtility.BleWorkCallback() {
+        mSequenceCallbackFailed = new BLEUtility.BleWorkCallback() {
             public void call(Object obj) {
                 BleWorkActivity.this.failedDialog((BleWork.jobSequence) obj);
             }
@@ -265,10 +265,10 @@ public class BleWorkActivity extends ActivityIACommon {
     }
 
     private void stopWifiSearch() {
-        Handler handler = this.mWifiSearchHandler;
+        Handler handler = mWifiSearchHandler;
         if (handler != null) {
             handler.removeCallbacks(this.runnableWifiSearch);
-            this.mWifiSearchHandler = null;
+            mWifiSearchHandler = null;
             this.runnableWifiSearch = null;
         }
     }
@@ -276,7 +276,7 @@ public class BleWorkActivity extends ActivityIACommon {
     private void settingResultDailog(final boolean z) {
         runOnUiThread(new Runnable() {
             public void run() {
-                AlertDialog.Builder cancelable = new AlertDialog.Builder(BleWorkActivity.this.mContext).setCancelable(false);
+                AlertDialog.Builder cancelable = new AlertDialog.Builder(BleWorkActivity.mContext).setCancelable(false);
                 if (z) {
                     cancelable.setTitle(BleWorkActivity.this.getString(R.string.BLE_success_setup_printer_title));
                     cancelable.setMessage(BleWorkActivity.this.getString(R.string.BLE_success_setup_printer_msg));
@@ -289,7 +289,7 @@ public class BleWorkActivity extends ActivityIACommon {
                             } else {
                                 setUpPath = Analytics.SetUpPath.Home;
                             }
-                            Analytics.sendSetup(BleWorkActivity.this.mBleWork.getDeviceName(), setUpPath, Analytics.SetUpResult.Success);
+                            Analytics.sendSetup(BleWorkActivity.mBleWork.getDeviceName(), setUpPath, Analytics.SetUpResult.Success);
                             Intent intent = new Intent(BleWorkActivity.this, ActivityECConfiguration.class);
                             intent.putExtra(ActivityECConfiguration.INTENT_EC_BLE_CONTENT, true);
                             BleWorkActivity.this.startActivityForResult(intent, BleWorkActivity.REQUEST_CODE_EPSON_CONNECT_REGISTRATION);
@@ -301,18 +301,18 @@ public class BleWorkActivity extends ActivityIACommon {
                     cancelable.setPositiveButton(BleWorkActivity.this.getString(R.string.BLE_fail_setup_printer_other_method_button), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
                             BleWorkActivity.this.startActivity(PrinterNotFoundDialogCreator.getStartIntent(BleWorkActivity.this.getApplicationContext()));
-                            Analytics.sendSetup(BleWorkActivity.this.mBleWork.getDeviceName(), BleWorkActivity.this.getCallingActivity() != null ? Analytics.SetUpPath.Button : Analytics.SetUpPath.Home, Analytics.SetUpResult.Fail);
+                            Analytics.sendSetup(BleWorkActivity.mBleWork.getDeviceName(), BleWorkActivity.this.getCallingActivity() != null ? Analytics.SetUpPath.Button : Analytics.SetUpPath.Home, Analytics.SetUpResult.Fail);
                             BleWorkActivity.this.finish();
                         }
                     }).setNeutralButton(BleWorkActivity.this.getString(R.string.str_btn_close), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
-                            Analytics.sendSetup(BleWorkActivity.this.mBleWork.getDeviceName(), BleWorkActivity.this.getCallingActivity() != null ? Analytics.SetUpPath.Button : Analytics.SetUpPath.Home, Analytics.SetUpResult.Fail);
+                            Analytics.sendSetup(BleWorkActivity.mBleWork.getDeviceName(), BleWorkActivity.this.getCallingActivity() != null ? Analytics.SetUpPath.Button : Analytics.SetUpPath.Home, Analytics.SetUpResult.Fail);
                             BleWorkActivity.this.finish();
                         }
                     });
                 }
-                BleWorkActivity.this.mAlertDialog = cancelable.create();
-                BleWorkActivity.this.mAlertDialog.show();
+                BleWorkActivity.mAlertDialog = cancelable.create();
+                BleWorkActivity.mAlertDialog.show();
             }
         });
     }
@@ -324,25 +324,25 @@ public class BleWorkActivity extends ActivityIACommon {
     }
 
     private void waitingCommunicationDaialog() {
-        if (this.mAlertDialog != null) {
+        if (mAlertDialog != null) {
             EpLog.m77i("dismiss ");
-            this.mAlertDialog.dismiss();
-            this.mAlertDialog = null;
+            mAlertDialog.dismiss();
+            mAlertDialog = null;
         }
         this.isStopSetUpProgress = false;
-        this.mAlertDialog = new AlertDialog.Builder(this.mContext).setCancelable(false).create();
-        View inflate = LayoutInflater.from(this.mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null);
-        this.mAlertDialog.setView(inflate);
-        this.mProgressPercent = (ProgressBar) inflate.findViewById(R.id.progress_percent);
-        this.mProgressPercent.setVisibility(0);
-        this.mPercentView = (TextView) inflate.findViewById(R.id.percent);
-        this.mPercentView.setVisibility(0);
+        mAlertDialog = new AlertDialog.Builder(mContext).setCancelable(false).create();
+        View inflate = LayoutInflater.from(mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null);
+        mAlertDialog.setView(inflate);
+        mProgressPercent = (ProgressBar) inflate.findViewById(R.id.progress_percent);
+        mProgressPercent.setVisibility(0);
+        mPercentView = (TextView) inflate.findViewById(R.id.percent);
+        mPercentView.setVisibility(0);
         inflate.findViewById(R.id.space_upper).setVisibility(0);
-        this.mProgressPercent.setProgress(0);
-        this.mProgressPercent.setMax(100);
-        this.mPercentView.setText("0%");
-        this.mAlertDialog.setMessage(getResources().getString(R.string.BLE_wait_setup_complete_msg));
-        this.mAlertDialog.show();
+        mProgressPercent.setProgress(0);
+        mProgressPercent.setMax(100);
+        mPercentView.setText("0%");
+        mAlertDialog.setMessage(getResources().getString(R.string.BLE_wait_setup_complete_msg));
+        mAlertDialog.show();
         this.count = 0;
         stopSetUpProgress();
         this.setUpProgressHandler = new Handler();
@@ -353,19 +353,19 @@ public class BleWorkActivity extends ActivityIACommon {
                     EpLog.m77i("☆☆runnableSetUpProgress retuen ");
                     return;
                 }
-                EpLog.m77i("mSequence " + BleWorkActivity.this.mBleWork.mSequence);
+                EpLog.m77i("mSequence " + BleWorkActivity.mBleWork.mSequence);
                 BleWorkActivity bleWorkActivity = BleWorkActivity.this;
                 bleWorkActivity.count = bleWorkActivity.count + 1;
                 int i2 = BleWorkActivity.this.count;
                 int i3 = BleWorkActivity.TOTAL_PROGRESS_SEC;
                 if (i2 > BleWorkActivity.TOTAL_PROGRESS_SEC) {
-                    if (BleWorkActivity.this.mAlertDialog != null) {
-                        BleWorkActivity.this.mAlertDialog.dismiss();
-                        BleWorkActivity.this.mAlertDialog = null;
+                    if (BleWorkActivity.mAlertDialog != null) {
+                        BleWorkActivity.mAlertDialog.dismiss();
+                        BleWorkActivity.mAlertDialog = null;
                     }
                     EpLog.m71e("TIME OUT");
-                    BleWorkActivity.this.mCompletion.call(false);
-                    CallbackWork unused = BleWorkActivity.this.mCompletion = null;
+                    BleWorkActivity.mCompletion.call(false);
+                    CallbackWork unused = BleWorkActivity.mCompletion = null;
                     return;
                 }
                 if (BleWorkActivity.this.count <= 90) {
@@ -387,24 +387,24 @@ public class BleWorkActivity extends ActivityIACommon {
     }
 
     private void updateProgress(int i) {
-        this.mProgressPercent.setProgress(i);
-        TextView textView = this.mPercentView;
+        mProgressPercent.setProgress(i);
+        TextView textView = mPercentView;
         textView.setText(i + " %");
-        this.mProgressPercent.invalidate();
-        this.mPercentView.invalidate();
+        mProgressPercent.invalidate();
+        mPercentView.invalidate();
     }
 
     private void init(ArrayList<ScannedDevice> arrayList) {
         ListView listView = (ListView) findViewById(R.id.list);
         Collections.sort(arrayList, new ScannedDeviceComparator());
-        this.mDeviceAdapter = new DeviceAdapter(this, R.layout.listitem_device, arrayList != null ? arrayList : new ArrayList<>());
-        listView.setAdapter(this.mDeviceAdapter);
+        mDeviceAdapter = new DeviceAdapter(this, R.layout.listitem_device, arrayList != null ? arrayList : new ArrayList<>());
+        listView.setAdapter(mDeviceAdapter);
         if (arrayList.size() == 1) {
-            selectDevice((ScannedDevice) this.mDeviceAdapter.getItem(0));
+            selectDevice((ScannedDevice) mDeviceAdapter.getItem(0));
         }
         listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
-                ScannedDevice scannedDevice = (ScannedDevice) BleWorkActivity.this.mDeviceAdapter.getItem(i);
+                ScannedDevice scannedDevice = (ScannedDevice) BleWorkActivity.mDeviceAdapter.getItem(i);
                 if (scannedDevice != null) {
                     BleWorkActivity.this.selectDevice(scannedDevice);
                 }
@@ -427,43 +427,43 @@ public class BleWorkActivity extends ActivityIACommon {
     private void selectDevice(@NonNull ScannedDevice scannedDevice) {
         String displayName = scannedDevice.getDisplayName();
         BleScanWork.getInstace().stopScan();
-        this.mBleWork.resetSequence();
-        this.mBleWork.setSequenceCallback(this.mSequenceCallbackSuccess, this.mSequenceCallbackFailed);
+        mBleWork.resetSequence();
+        mBleWork.setSequenceCallback(mSequenceCallbackSuccess, mSequenceCallbackFailed);
         EpLog.m69d("              getInfoForConnectDialog");
         getInfoForConnectDialog(displayName);
-        this.mBleWork.init(this, scannedDevice);
+        mBleWork.init(this, scannedDevice);
     }
 
     private void getInfoForConnectDialog(String str) {
-        this.mAlertDialog = new AlertDialog.Builder(this).setCancelable(false).create();
-        this.mAlertDialog.setView(LayoutInflater.from(this.mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null));
+        mAlertDialog = new AlertDialog.Builder(this).setCancelable(false).create();
+        mAlertDialog.setView(LayoutInflater.from(mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null));
         String property = System.getProperty("line.separator");
-        AlertDialog alertDialog = this.mAlertDialog;
+        AlertDialog alertDialog = mAlertDialog;
         alertDialog.setMessage(str + property + property + getString(R.string.BLE_inquiry_access_point_information_msg));
         if (this.isAlive && !isFinishing()) {
-            this.mAlertDialog.show();
+            mAlertDialog.show();
         }
         setConnectTimeOut();
     }
 
     private void setConnectTimeOut() {
-        this.mTimeoutHandler = new Handler();
-        this.mTimeoutHandler.postDelayed(new Runnable() {
+        mTimeoutHandler = new Handler();
+        mTimeoutHandler.postDelayed(new Runnable() {
             public void run() {
-                EpLog.m71e(" timeout ------------" + BleWorkActivity.this.mBleWork.mSequence);
-                if (BleWorkActivity.this.mBleWork.mSequence == BleWork.jobSequence.AFTER_SETTING_PASSWORD || BleWorkActivity.this.mBleWork.mSequence == BleWork.jobSequence.MIB_GET_MACADDRESS || BleWorkActivity.this.mBleWork.mSequence == BleWork.jobSequence.BEFORE_CHECK_SSID || BleWorkActivity.this.mBleWork.mSequence == BleWork.jobSequence.UNINITIALIZED) {
-                    BleWorkActivity.this.mBleWork.failedProcessing();
+                EpLog.m71e(" timeout ------------" + BleWorkActivity.mBleWork.mSequence);
+                if (BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.AFTER_SETTING_PASSWORD || BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.MIB_GET_MACADDRESS || BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.BEFORE_CHECK_SSID || BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.UNINITIALIZED) {
+                    BleWorkActivity.mBleWork.failedProcessing();
                 }
-                BleWorkActivity.this.mBleWork.setRetryFinish();
+                BleWorkActivity.mBleWork.setRetryFinish();
             }
         }, DateUtils.MILLIS_PER_MINUTE);
     }
 
     private void stopConnectTimeOut() {
-        Handler handler = this.mTimeoutHandler;
+        Handler handler = mTimeoutHandler;
         if (handler != null) {
             handler.removeCallbacksAndMessages((Object) null);
-            this.mTimeoutHandler = null;
+            mTimeoutHandler = null;
         }
     }
 
@@ -473,8 +473,8 @@ public class BleWorkActivity extends ActivityIACommon {
                 BleWorkActivity.this.stopCallbacks();
                 BleWork.jobSequence jobsequence = jobsequence;
                 EpLog.m77i("sequence = " + jobsequence);
-                if (BleWorkActivity.this.mAlertDialog != null) {
-                    BleWorkActivity.this.mAlertDialog.dismiss();
+                if (BleWorkActivity.mAlertDialog != null) {
+                    BleWorkActivity.mAlertDialog.dismiss();
                 }
                 BleWorkActivity bleWorkActivity = BleWorkActivity.this;
                 bleWorkActivity.mAlertDialog = null;
@@ -482,13 +482,13 @@ public class BleWorkActivity extends ActivityIACommon {
                 cancelable.setMessage(BleWorkActivity.this.getString(R.string.BLE_setup_general_error_msg));
                 cancelable.setPositiveButton(BleWorkActivity.this.getString(R.string.BLE_setup_abort_button), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        Analytics.sendSetup(BleWorkActivity.this.mBleWork.getDeviceName(), BleWorkActivity.this.getCallingActivity() != null ? Analytics.SetUpPath.Button : Analytics.SetUpPath.Home, Analytics.SetUpResult.Error);
+                        Analytics.sendSetup(BleWorkActivity.mBleWork.getDeviceName(), BleWorkActivity.this.getCallingActivity() != null ? Analytics.SetUpPath.Button : Analytics.SetUpPath.Home, Analytics.SetUpResult.Error);
                         BleWorkActivity.this.finish();
                     }
                 });
                 if (BleWorkActivity.this.isAlive && !BleWorkActivity.this.isFinishing()) {
-                    BleWorkActivity.this.mAlertDialog = cancelable.create();
-                    BleWorkActivity.this.mAlertDialog.show();
+                    BleWorkActivity.mAlertDialog = cancelable.create();
+                    BleWorkActivity.mAlertDialog.show();
                 }
             }
         });
@@ -551,10 +551,10 @@ public class BleWorkActivity extends ActivityIACommon {
     private void showSSIDList() {
         runOnUiThread(new Runnable() {
             public void run() {
-                BleWorkActivity.this.mBleWork.mSequence = BleWork.jobSequence.MIB_SET_SSID;
-                BleWorkActivity.this.mBleWork.disconnect(false);
-                EpLog.m69d("sequence = " + BleWorkActivity.this.mBleWork.mSequence);
-                List<String> ssidLis = BleWorkActivity.this.mBleWork.getSsidLis();
+                BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.MIB_SET_SSID;
+                BleWorkActivity.mBleWork.disconnect(false);
+                EpLog.m69d("sequence = " + BleWorkActivity.mBleWork.mSequence);
+                List<String> ssidLis = BleWorkActivity.mBleWork.getSsidLis();
                 ssidLis.remove(BleWorkActivity.this.getResources().getText(R.string.BLE_select_SSID_manual_button).toString());
                 BleWorkActivity.this.sortSSIDlist(ssidLis);
                 ssidLis.add(BleWorkActivity.this.getResources().getText(R.string.BLE_select_SSID_manual_button).toString());
@@ -577,24 +577,24 @@ public class BleWorkActivity extends ActivityIACommon {
                             BleWorkActivity.this.setSSID();
                             return;
                         }
-                        EpLog.m77i("☆" + BleWorkActivity.this.mBleWork.mSequence + "::" + BleWorkActivity.this.mBleWork.mStatus);
-                        BleWorkActivity.this.mBleWork.setSSID(str);
-                        if (BleWorkActivity.this.mBleWork.mSequence == BleWork.jobSequence.DISCONNECTED || BleWorkActivity.this.mBleWork.mStatus == 0) {
-                            EpLog.m77i("☆☆ " + BleWorkActivity.this.mBleWork.mSequence + "::" + BleWorkActivity.this.mBleWork.mStatus);
-                            BleWorkActivity.this.mBleWork.mSequence = BleWork.jobSequence.BEFORE_CHECK_SSID;
-                            BleWorkActivity.this.mBleWork.connect();
+                        EpLog.m77i("☆" + BleWorkActivity.mBleWork.mSequence + "::" + BleWorkActivity.mBleWork.mStatus);
+                        BleWorkActivity.mBleWork.setSSID(str);
+                        if (BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.DISCONNECTED || BleWorkActivity.mBleWork.mStatus == 0) {
+                            EpLog.m77i("☆☆ " + BleWorkActivity.mBleWork.mSequence + "::" + BleWorkActivity.mBleWork.mStatus);
+                            BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.BEFORE_CHECK_SSID;
+                            BleWorkActivity.mBleWork.connect();
                             EpLog.m69d("              getInfoForConnectDialog");
-                            BleWorkActivity.this.getInfoForConnectDialog(BleWorkActivity.this.mBleWork.getDeviceName());
+                            BleWorkActivity.this.getInfoForConnectDialog(BleWorkActivity.mBleWork.getDeviceName());
                             return;
                         }
-                        EpLog.m77i("☆☆☆☆ " + BleWorkActivity.this.mBleWork.mSequence + "::" + BleWorkActivity.this.mBleWork.mStatus);
-                        BleWorkActivity.this.mBleWork.setSSIDType();
+                        EpLog.m77i("☆☆☆☆ " + BleWorkActivity.mBleWork.mSequence + "::" + BleWorkActivity.mBleWork.mStatus);
+                        BleWorkActivity.mBleWork.setSSIDType();
                     }
                 });
                 cancelable.setNegativeButton(BleWorkActivity.this.getString(R.string.BLE_setup_abort_button), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         EpLog.m76i();
-                        BleWorkActivity.this.mBleWork.disconnect(true);
+                        BleWorkActivity.mBleWork.disconnect(true);
                     }
                 });
                 cancelable.show();
@@ -649,9 +649,9 @@ public class BleWorkActivity extends ActivityIACommon {
                 cancelable.setPositiveButton(BleWorkActivity.this.getString(R.string.ok_button), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         EpLog.m77i(editText.getText().toString());
-                        BleWorkActivity.this.mBleWork.setSSID(editText.getText().toString());
-                        BleWorkActivity.this.mBleWork.setSecurityType(255);
-                        BleWorkActivity.this.mBleWork.mSequence = BleWork.jobSequence.SET_PASSWORD;
+                        BleWorkActivity.mBleWork.setSSID(editText.getText().toString());
+                        BleWorkActivity.mBleWork.setSecurityType(255);
+                        BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.SET_PASSWORD;
                         BleWorkActivity.this.setSSIDPassword();
                     }
                 });
@@ -659,19 +659,19 @@ public class BleWorkActivity extends ActivityIACommon {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         EpLog.m76i();
                         ((InputMethodManager) BleWorkActivity.this.getSystemService("input_method")).hideSoftInputFromWindow(editText.getWindowToken(), 2);
-                        if (!BleWorkActivity.this.mBleWork.getSsidLis().isEmpty()) {
-                            BleWorkActivity.this.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_SSID_LIST;
-                            BleWorkActivity.this.mBleWork.setSecurityType(0);
+                        if (!BleWorkActivity.mBleWork.getSsidLis().isEmpty()) {
+                            BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_SSID_LIST;
+                            BleWorkActivity.mBleWork.setSecurityType(0);
                             BleWorkActivity.this.showSSIDList();
                             return;
                         }
-                        BleWorkActivity.this.mBleWork.disconnect();
+                        BleWorkActivity.mBleWork.disconnect();
                     }
                 });
                 if (!BleWorkActivity.this.isFinishing()) {
-                    BleWorkActivity.this.mDialog = cancelable.create();
-                    BleWorkActivity.this.mDialog.show();
-                    BleWorkActivity.this.mDialog.getButton(-1).setEnabled(false);
+                    BleWorkActivity.mDialog = cancelable.create();
+                    BleWorkActivity.mDialog.show();
+                    BleWorkActivity.mDialog.getButton(-1).setEnabled(false);
                 }
             }
         });
@@ -679,15 +679,15 @@ public class BleWorkActivity extends ActivityIACommon {
 
     private void setSSIDPassword() {
         EpLog.m76i();
-        if (!this.mBleWork.getSSIDPassword().isEmpty() || this.mBleWork.getSecurityType() == 1 || (this.mBleWork.getSecurityType() == 255 && this.mBleWork.mSequence != BleWork.jobSequence.SET_PASSWORD)) {
+        if (!mBleWork.getSSIDPassword().isEmpty() || mBleWork.getSecurityType() == 1 || (mBleWork.getSecurityType() == 255 && mBleWork.mSequence != BleWork.jobSequence.SET_PASSWORD)) {
             runOnUiThread(new Runnable() {
                 public void run() {
                     EpLog.m77i("password mNext");
-                    BleWorkActivity.this.mNext.call("");
+                    BleWorkActivity.mNext.call("");
                     if (BleWorkActivity.this.setUpProgressHandler == null && BleWorkActivity.this.runnableSetUpProgress == null) {
-                        if (BleWorkActivity.this.mAlertDialog != null) {
-                            BleWorkActivity.this.mAlertDialog.dismiss();
-                            BleWorkActivity.this.mAlertDialog = null;
+                        if (BleWorkActivity.mAlertDialog != null) {
+                            BleWorkActivity.mAlertDialog.dismiss();
+                            BleWorkActivity.mAlertDialog = null;
                         }
                         EpLog.m69d("waitingCommunicationDaialog");
                         BleWorkActivity.this.waitingCommunicationDaialog();
@@ -698,7 +698,7 @@ public class BleWorkActivity extends ActivityIACommon {
             runOnUiThread(new Runnable() {
                 public void run() {
                     EpLog.m77i("inputs = ");
-                    final short securityType = BleWorkActivity.this.mBleWork.getSecurityType();
+                    final short securityType = BleWorkActivity.mBleWork.getSecurityType();
                     if (securityType == 7 || securityType == 10) {
                         BleWorkActivity bleWorkActivity = BleWorkActivity.this;
                         bleWorkActivity.SSIDfailedDialog(bleWorkActivity.mBleWork.mSequence);
@@ -728,9 +728,9 @@ public class BleWorkActivity extends ActivityIACommon {
                     cancelable.setPositiveButton(BleWorkActivity.this.getString(R.string.ok_button), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
                             EpLog.m77i(editText.getText().toString());
-                            BleWorkActivity.this.mBleWork.setSSIDPassword(editText.getText().toString());
-                            BleWorkActivity.this.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_MACADDRESS;
-                            BleWorkActivity.this.mBleWork.connect();
+                            BleWorkActivity.mBleWork.setSSIDPassword(editText.getText().toString());
+                            BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_MACADDRESS;
+                            BleWorkActivity.mBleWork.connect();
                             BleWorkActivity.this.setConnectTimeOut();
                             EpLog.m69d("waitingCommunicationDaialog");
                             BleWorkActivity.this.waitingCommunicationDaialog();
@@ -741,28 +741,28 @@ public class BleWorkActivity extends ActivityIACommon {
                         public void onClick(DialogInterface dialogInterface, int i) {
                             EpLog.m76i();
                             ((InputMethodManager) BleWorkActivity.this.getSystemService("input_method")).hideSoftInputFromWindow(editText.getWindowToken(), 2);
-                            if (!BleWorkActivity.this.mBleWork.getSsidLis().isEmpty()) {
-                                BleWorkActivity.this.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_SSID_LIST;
-                                BleWorkActivity.this.mBleWork.setSecurityType(0);
+                            if (!BleWorkActivity.mBleWork.getSsidLis().isEmpty()) {
+                                BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_SSID_LIST;
+                                BleWorkActivity.mBleWork.setSecurityType(0);
                                 BleWorkActivity.this.showSSIDList();
                                 return;
                             }
-                            BleWorkActivity.this.mBleWork.disconnect();
+                            BleWorkActivity.mBleWork.disconnect();
                         }
                     });
                     if (!BleWorkActivity.this.isFinishing()) {
-                        BleWorkActivity.this.mDialog = cancelable.create();
-                        BleWorkActivity.this.mDialog.show();
-                        Button button = BleWorkActivity.this.mDialog.getButton(-1);
+                        BleWorkActivity.mDialog = cancelable.create();
+                        BleWorkActivity.mDialog.show();
+                        Button button = BleWorkActivity.mDialog.getButton(-1);
                         if (securityType != 255) {
                             z = false;
                         }
                         button.setEnabled(z);
                     }
-                    EpLog.m69d("sequence = " + BleWorkActivity.this.mBleWork.mSequence);
-                    BleWorkActivity.this.mBleWork.mSequence = BleWork.jobSequence.AFTER_SETTING_PASSWORD;
-                    BleWorkActivity.this.mBleWork.disconnect(false);
-                    EpLog.m69d("sequence = " + BleWorkActivity.this.mBleWork.mSequence);
+                    EpLog.m69d("sequence = " + BleWorkActivity.mBleWork.mSequence);
+                    BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.AFTER_SETTING_PASSWORD;
+                    BleWorkActivity.mBleWork.disconnect(false);
+                    EpLog.m69d("sequence = " + BleWorkActivity.mBleWork.mSequence);
                 }
             });
         }

+ 6 - 6
app/src/main/java/com/epson/mobilephone/common/ble/DeviceAdapter.java

@@ -25,15 +25,15 @@ public class DeviceAdapter extends ArrayAdapter<ScannedDevice> {
 
     public DeviceAdapter(Context context, int i, List<ScannedDevice> list) {
         super(context, i, list);
-        this.mResId = i;
-        this.mList = list;
-        this.mInflater = (LayoutInflater) context.getSystemService("layout_inflater");
+        mResId = i;
+        mList = list;
+        mInflater = (LayoutInflater) context.getSystemService("layout_inflater");
     }
 
     public View getView(int i, View view, ViewGroup viewGroup) {
         ScannedDevice scannedDevice = (ScannedDevice) getItem(i);
         if (view == null) {
-            view = this.mInflater.inflate(this.mResId, (ViewGroup) null);
+            view = mInflater.inflate(mResId, (ViewGroup) null);
         }
         TextView textView = (TextView) view.findViewById(R.id.device_name);
         textView.setText(scannedDevice.getDisplayName());
@@ -69,7 +69,7 @@ public class DeviceAdapter extends ArrayAdapter<ScannedDevice> {
     public void update(BluetoothDevice bluetoothDevice, int i, String str, byte[] bArr) {
         if (bluetoothDevice != null && bluetoothDevice.getAddress() != null) {
             boolean z = false;
-            Iterator<ScannedDevice> it = this.mList.iterator();
+            Iterator<ScannedDevice> it = mList.iterator();
             while (true) {
                 if (!it.hasNext()) {
                     break;
@@ -82,7 +82,7 @@ public class DeviceAdapter extends ArrayAdapter<ScannedDevice> {
                 }
             }
             if (!z) {
-                this.mList.add(new ScannedDevice(bluetoothDevice, i, str, bArr));
+                mList.add(new ScannedDevice(bluetoothDevice, i, str, bArr));
             }
             notifyDataSetChanged();
         }

+ 37 - 37
app/src/main/java/com/epson/mobilephone/common/ble/ProbePrinter.java

@@ -56,15 +56,15 @@ public class ProbePrinter {
                     EpLog.m77i(" !!  確認失敗  !!");
                     ProbePrinter.this.callbackCompletion(false);
                 }
-            } else if (str3.contains(ProbePrinter.this.macAddress)) {
-                EpLog.m77i(" !!  FIND    OK    !! :" + ProbePrinter.this.macAddress + ": ◆");
+            } else if (str3.contains(ProbePrinter.macAddress)) {
+                EpLog.m77i(" !!  FIND    OK    !! :" + ProbePrinter.macAddress + ": ◆");
                 boolean unused = ProbePrinter.this.isPrinterFound = true;
                 MyPrinter myPrinter = new MyPrinter(str, str2, str3, str4);
-                Message obtainMessage = ProbePrinter.this.mHandler.obtainMessage();
+                Message obtainMessage = ProbePrinter.mHandler.obtainMessage();
                 obtainMessage.obj = myPrinter;
                 obtainMessage.what = 4;
-                ProbePrinter.this.mHandler.sendMessage(obtainMessage);
-                ProbePrinter.this.mHandler.sendEmptyMessageDelayed(2, 100);
+                ProbePrinter.mHandler.sendMessage(obtainMessage);
+                ProbePrinter.mHandler.sendEmptyMessageDelayed(2, 100);
             }
         }
 
@@ -87,10 +87,10 @@ public class ProbePrinter {
     private ServiceConnection mEpsonConnection = new ServiceConnection() {
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
             EpLog.m76i();
-            IEpsonService unused = ProbePrinter.this.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
-            if (ProbePrinter.this.mEpsonService != null) {
+            IEpsonService unused = ProbePrinter.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
+            if (ProbePrinter.mEpsonService != null) {
                 try {
-                    ProbePrinter.this.mEpsonService.registerCallback(ProbePrinter.this.mCallback);
+                    ProbePrinter.mEpsonService.registerCallback(ProbePrinter.mCallback);
                 } catch (RemoteException e) {
                     e.printStackTrace();
                 }
@@ -99,7 +99,7 @@ public class ProbePrinter {
 
         public void onServiceDisconnected(ComponentName componentName) {
             EpLog.m77i("ComponentName " + componentName);
-            IEpsonService unused = ProbePrinter.this.mEpsonService = null;
+            IEpsonService unused = ProbePrinter.mEpsonService = null;
         }
     };
     private IEpsonService mEpsonService;
@@ -148,7 +148,7 @@ public class ProbePrinter {
 
     public ProbePrinter setMacAddress(String str) {
         EpLog.m69d("★" + str + "★ ");
-        this.macAddress = str;
+        macAddress = str;
         return this;
     }
 
@@ -159,19 +159,19 @@ public class ProbePrinter {
 
     public void search() throws IllegalStateException {
         String str;
-        if (this.mEpsonService == null || this.completion == null || (str = this.macAddress) == null || str.length() != 12 || this.completion == null) {
+        if (mEpsonService == null || this.completion == null || (str = macAddress) == null || str.length() != 12 || this.completion == null) {
             EpLog.m71e("Required field is not set.");
             throw new IllegalStateException("Required field is not set.");
         }
         Context context2 = this.context;
-        context2.bindService(new Intent(context2, EpsonService.class), this.mEpsonConnection, 1);
+        context2.bindService(new Intent(context2, EpsonService.class), mEpsonConnection, 1);
         try {
             synchronized (lock) {
                 this.isPrinterFound = false;
             }
             EpLog.m69d("mEpsonService.searchPrinters");
-            this.mEpsonService.setTimeOut(180);
-            this.mEpsonService.searchPrinters((String) null, (String) null, 1);
+            mEpsonService.setTimeOut(180);
+            mEpsonService.searchPrinters((String) null, (String) null, 1);
         } catch (RemoteException e) {
             e.printStackTrace();
         }
@@ -179,11 +179,11 @@ public class ProbePrinter {
 
     public void interruptSearch() {
         EpLog.m68d();
-        this.mHandler.removeMessages(1);
-        if (this.mEpsonService != null) {
+        mHandler.removeMessages(1);
+        if (mEpsonService != null) {
             try {
                 EpLog.m77i("cancelSearchPrinter");
-                this.mEpsonService.cancelSearchPrinter();
+                mEpsonService.cancelSearchPrinter();
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
@@ -192,13 +192,13 @@ public class ProbePrinter {
     }
 
     public void bindEpsonService() {
-        if (this.mEpsonService == null) {
+        if (mEpsonService == null) {
             Context context2 = this.context;
-            context2.bindService(new Intent(context2, EpsonService.class), this.mEpsonConnection, 1);
+            context2.bindService(new Intent(context2, EpsonService.class), mEpsonConnection, 1);
         }
-        if (this.mEpsonService == null) {
+        if (mEpsonService == null) {
             EpLog.m71e("mEpsonService NULL");
-            this.mHandler.sendEmptyMessageDelayed(17, 1000);
+            mHandler.sendEmptyMessageDelayed(17, 1000);
             return;
         }
         EpLog.m77i("bindEpsonService OK !!");
@@ -206,17 +206,17 @@ public class ProbePrinter {
 
     private void unbindEpsonService() {
         EpLog.m76i();
-        if (this.mEpsonService != null) {
+        if (mEpsonService != null) {
             if (!this.isPrinterFound) {
-                this.mHandler.sendEmptyMessageDelayed(2, 200);
+                mHandler.sendEmptyMessageDelayed(2, 200);
                 EpLog.m77i("1");
             }
             try {
                 EpLog.m77i(ExifInterface.GPS_MEASUREMENT_2D);
                 EpLog.m77i("unregisterCallback");
-                this.mEpsonService.unregisterCallback(this.mCallback);
-                this.context.unbindService(this.mEpsonConnection);
-                this.mEpsonService = null;
+                mEpsonService.unregisterCallback(mCallback);
+                this.context.unbindService(mEpsonConnection);
+                mEpsonService = null;
             } catch (RemoteException unused) {
                 EpLog.m71e("unregisterCallback   mEpsonService");
             }
@@ -244,8 +244,8 @@ public class ProbePrinter {
         private MaintainPrinter2 mPrinter = MaintainPrinter2.getInstance();
 
         public printerProbeTask(Context context, MyPrinter myPrinter) {
-            this.mContext = context;
-            this.mMyPrinter = myPrinter;
+            mContext = context;
+            mMyPrinter = myPrinter;
         }
 
         protected void onPreExecute() {
@@ -253,19 +253,19 @@ public class ProbePrinter {
         }
 
         protected Integer doInBackground(Void... voidArr) {
-            int doProbePrinter = this.mPrinter.doProbePrinter(60, this.mMyPrinter.getPrinterId(), this.mMyPrinter.getIp(), 3);
+            int doProbePrinter = mPrinter.doProbePrinter(60, mMyPrinter.getPrinterId(), mMyPrinter.getIp(), 3);
             if (doProbePrinter != 0) {
                 return Integer.valueOf(doProbePrinter);
             }
-            this.mPrinter.setMSearchPos(0);
-            int doSetPrinter = this.mPrinter.doSetPrinter();
+            mPrinter.setMSearchPos(0);
+            int doSetPrinter = mPrinter.doSetPrinter();
             if (doSetPrinter != 0) {
                 return Integer.valueOf(doSetPrinter);
             }
-            this.mMyPrinter.setLang(this.mPrinter.doGetLang());
-            ExternalFileUtils instance = ExternalFileUtils.getInstance(this.mContext);
+            mMyPrinter.setLang(mPrinter.doGetLang());
+            ExternalFileUtils instance = ExternalFileUtils.getInstance(mContext);
             instance.createTempFolder(instance.getSupportedMediaDir());
-            int epsWrapperGetSupportedMedia = this.mPrinter.getMEscpLib().epsWrapperGetSupportedMedia(ExternalFileUtils.getInstance(this.mContext).getSupportedMediaDir());
+            int epsWrapperGetSupportedMedia = mPrinter.getMEscpLib().epsWrapperGetSupportedMedia(ExternalFileUtils.getInstance(mContext).getSupportedMediaDir());
             if (epsWrapperGetSupportedMedia != 0) {
                 return Integer.valueOf(epsWrapperGetSupportedMedia);
             }
@@ -287,7 +287,7 @@ public class ProbePrinter {
         protected void onPostExecute(Integer num) {
             super.onPostExecute(num);
             if (num.intValue() == 0) {
-                ProbePrinter.this.selectPrinter(this.mMyPrinter);
+                ProbePrinter.this.selectPrinter(mMyPrinter);
                 ProbePrinter.this.callbackCompletion(true);
                 return;
             }
@@ -299,7 +299,7 @@ public class ProbePrinter {
         private MyPrinter mPrinter;
 
         scanProbeTask(MyPrinter myPrinter) {
-            this.mPrinter = myPrinter;
+            mPrinter = myPrinter;
         }
 
         protected Context doInBackground(Context... contextArr) {
@@ -316,7 +316,7 @@ public class ProbePrinter {
                 z = false;
             }
             try {
-                ScanSettingHelper.recodeScannerInfo(ProbePrinter.mScanner, applicationContext, this.mPrinter);
+                ScanSettingHelper.recodeScannerInfo(ProbePrinter.mScanner, applicationContext, mPrinter);
                 EpLog.m77i("Scan 機能あり");
                 if (!z) {
                     ProbePrinter.mScanner.escanWrapperReleaseDriver();

+ 20 - 20
app/src/main/java/com/epson/mobilephone/common/ble/util/ScannedDevice.java

@@ -31,55 +31,55 @@ public class ScannedDevice implements Parcelable {
     }
 
     protected ScannedDevice(Parcel parcel) {
-        this.mDevice = (BluetoothDevice) parcel.readParcelable(BluetoothDevice.class.getClassLoader());
-        this.mRssi = parcel.readInt();
-        this.mDisplayName = parcel.readString();
-        this.mHardwareType = parcel.createByteArray();
+        mDevice = (BluetoothDevice) parcel.readParcelable(BluetoothDevice.class.getClassLoader());
+        mRssi = parcel.readInt();
+        mDisplayName = parcel.readString();
+        mHardwareType = parcel.createByteArray();
     }
 
     public void writeToParcel(Parcel parcel, int i) {
-        parcel.writeParcelable(this.mDevice, i);
-        parcel.writeInt(this.mRssi);
-        parcel.writeString(this.mDisplayName);
-        parcel.writeByteArray(this.mHardwareType);
+        parcel.writeParcelable(mDevice, i);
+        parcel.writeInt(mRssi);
+        parcel.writeString(mDisplayName);
+        parcel.writeByteArray(mHardwareType);
     }
 
     public ScannedDevice(BluetoothDevice bluetoothDevice, int i, String str, byte[] bArr) {
         if (bluetoothDevice != null) {
-            this.mDevice = bluetoothDevice;
+            mDevice = bluetoothDevice;
             if (Build.VERSION.SDK_INT >= 21) {
-                this.mDisplayName = str;
+                mDisplayName = str;
             } else {
-                this.mDisplayName = this.mDevice.getName();
+                mDisplayName = mDevice.getName();
             }
-            String str2 = this.mDisplayName;
+            String str2 = mDisplayName;
             if (str2 == null || str2.length() == 0) {
-                this.mDisplayName = UNKNOWN;
+                mDisplayName = UNKNOWN;
             }
-            this.mRssi = i;
-            this.mHardwareType = bArr;
+            mRssi = i;
+            mHardwareType = bArr;
             return;
         }
         throw new IllegalArgumentException("BluetoothDevice is null");
     }
 
     public BluetoothDevice getDevice() {
-        return this.mDevice;
+        return mDevice;
     }
 
     public int getRssi() {
-        return this.mRssi;
+        return mRssi;
     }
 
     public void setRssi(int i) {
-        this.mRssi = i;
+        mRssi = i;
     }
 
     public byte[] getHardwareType() {
-        return this.mHardwareType;
+        return mHardwareType;
     }
 
     public String getDisplayName() {
-        return this.mDisplayName;
+        return mDisplayName;
     }
 }

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

@@ -255,58 +255,58 @@ public class EscprLib {
     }
 
     public void setHanlder(Handler handler) {
-        this.mHandler = handler;
+        mHandler = handler;
     }
 
     public void findPrinterCallback(String str) {
         EpLog.m78i("called findPrinterCallback : %s", str);
-        if (this.mHandler != null) {
+        if (mHandler != null) {
             Message obtain = Message.obtain();
             obtain.what = 0;
             obtain.obj = str.toString();
-            this.mHandler.sendMessage(obtain);
+            mHandler.sendMessage(obtain);
         }
     }
 
     public void epsNotifyDataChange(String str) {
         EpLog.m78i("  @@@@@@@@@@   called epsNotifyDataChange : %s", str);
-        if (this.mHandler != null) {
+        if (mHandler != null) {
             Message obtain = Message.obtain();
             obtain.what = 0;
             obtain.obj = str.toString();
-            this.mHandler.sendMessage(obtain);
+            mHandler.sendMessage(obtain);
         }
     }
 
     public void epsNotifyContinueable(int i) {
         EpLog.m77i("called epsNotifyContinueable :" + i);
-        if (this.mHandler != null) {
+        if (mHandler != null) {
             Message obtain = Message.obtain();
             obtain.what = 1;
             obtain.arg1 = i;
-            this.mHandler.sendMessage(obtain);
+            mHandler.sendMessage(obtain);
         }
     }
 
     public void epsNotifyError(int i, int i2, boolean z) {
         EpLog.m77i("called epsNotifyError " + i + ":" + i2 + ":" + z);
-        if (this.mHandler != null) {
+        if (mHandler != null) {
             Message obtain = Message.obtain();
             obtain.what = 2;
             obtain.arg1 = i;
             obtain.arg2 = i2;
             obtain.obj = Boolean.valueOf(z);
-            this.mHandler.sendMessage(obtain);
+            mHandler.sendMessage(obtain);
         }
     }
 
     public void epsNotifyPage(int i) {
         EpLog.m77i("called epsNotifyPage :" + i);
-        if (this.mHandler != null) {
+        if (mHandler != null) {
             Message obtain = Message.obtain();
             obtain.what = 30;
             obtain.arg1 = i;
-            this.mHandler.sendMessage(obtain);
+            mHandler.sendMessage(obtain);
         }
     }
 
@@ -356,7 +356,7 @@ public class EscprLib {
     }
 
     public void setSearchStt(boolean z) {
-        this.mIsSearch = z;
+        mIsSearch = z;
     }
 
     private void findPrinterCB() {
@@ -367,10 +367,10 @@ public class EscprLib {
             EpLog.m78i(name, "EXTRACT Printer information: " + this.printerList);
             String[] split = this.printerList.split("\\|\\|");
             if (this.printerIp == null || this.printerId == null || !this.printerIp.equals(split[2]) || this.printerId.equals(split[4])) {
-                EpLog.m77i("JAVA mIsSearch == " + this.mIsSearch);
-                if (this.mIsSearch) {
-                    EpLog.m77i("JAVA mHandler == " + this.mHandler);
-                    if (this.mHandler != null) {
+                EpLog.m77i("JAVA mIsSearch == " + mIsSearch);
+                if (mIsSearch) {
+                    EpLog.m77i("JAVA mHandler == " + mHandler);
+                    if (mHandler != null) {
                         Message obtain = Message.obtain();
                         obtain.what = 0;
                         Bundle bundle = new Bundle();
@@ -389,7 +389,7 @@ public class EscprLib {
                         }
                         obtain.setData(bundle);
                         EpLog.m77i("JAVA send message");
-                        this.mHandler.sendMessage(obtain);
+                        mHandler.sendMessage(obtain);
                     }
                 }
             } else {

+ 35 - 35
app/src/main/java/com/epson/mobilephone/common/escpr/PaperSize.java

@@ -8,81 +8,81 @@ public class PaperSize {
     public int mWidth;
 
     public PaperSize() {
-        this.mWidth = 0;
-        this.mHeight = 0;
+        mWidth = 0;
+        mHeight = 0;
     }
 
     public PaperSize(int i) {
-        this.mInfo = new MediaInfo.PaperSize_constants();
-        Info_paper stringId = this.mInfo.getStringId(i);
-        this.mWidth = stringId.getPaper_width();
-        this.mHeight = stringId.getPaper_height();
-        this.mInfo.destructor();
+        mInfo = new MediaInfo.PaperSize_constants();
+        Info_paper stringId = mInfo.getStringId(i);
+        mWidth = stringId.getPaper_width();
+        mHeight = stringId.getPaper_height();
+        mInfo.destructor();
     }
 
     public void setPaperSize(int i) {
-        this.mInfo = new MediaInfo.PaperSize_constants();
-        Info_paper stringId = this.mInfo.getStringId(i);
-        this.mWidth = stringId.getPaper_width();
-        this.mHeight = stringId.getPaper_height();
-        this.mInfo.destructor();
+        mInfo = new MediaInfo.PaperSize_constants();
+        Info_paper stringId = mInfo.getStringId(i);
+        mWidth = stringId.getPaper_width();
+        mHeight = stringId.getPaper_height();
+        mInfo.destructor();
     }
 
     public int[] getPaperSizeBoder(int i) {
-        this.mInfo = new MediaInfo.PaperSize_constants();
-        Info_paper stringId = this.mInfo.getStringId(i);
+        mInfo = new MediaInfo.PaperSize_constants();
+        Info_paper stringId = mInfo.getStringId(i);
         int[] iArr = {stringId.getPaper_width_boder(), stringId.getPaper_height_boder()};
-        this.mInfo.destructor();
+        mInfo.destructor();
         return iArr;
     }
 
     public int getWidth_boder(int i) {
-        this.mInfo = new MediaInfo.PaperSize_constants();
-        int paper_width_boder = this.mInfo.getStringId(i).getPaper_width_boder();
-        this.mInfo.destructor();
+        mInfo = new MediaInfo.PaperSize_constants();
+        int paper_width_boder = mInfo.getStringId(i).getPaper_width_boder();
+        mInfo.destructor();
         return paper_width_boder;
     }
 
     public int getHeight_boder(int i) {
-        this.mInfo = new MediaInfo.PaperSize_constants();
-        int paper_height_boder = this.mInfo.getStringId(i).getPaper_height_boder();
-        this.mInfo.destructor();
+        mInfo = new MediaInfo.PaperSize_constants();
+        int paper_height_boder = mInfo.getStringId(i).getPaper_height_boder();
+        mInfo.destructor();
         return paper_height_boder;
     }
 
     public int getWidth_boderLess(int i) {
-        this.mInfo = new MediaInfo.PaperSize_constants();
-        int paper_width_boderless = this.mInfo.getStringId(i).getPaper_width_boderless();
-        this.mInfo.destructor();
+        mInfo = new MediaInfo.PaperSize_constants();
+        int paper_width_boderless = mInfo.getStringId(i).getPaper_width_boderless();
+        mInfo.destructor();
         return paper_width_boderless;
     }
 
     public int getHeight_boderLess(int i) {
-        this.mInfo = new MediaInfo.PaperSize_constants();
-        int paper_height_boderless = this.mInfo.getStringId(i).getPaper_height_boderless();
-        this.mInfo.destructor();
+        mInfo = new MediaInfo.PaperSize_constants();
+        int paper_height_boderless = mInfo.getStringId(i).getPaper_height_boderless();
+        mInfo.destructor();
         return paper_height_boderless;
     }
 
     public int getTopMargin(int i) {
-        this.mInfo = new MediaInfo.PaperSize_constants();
-        int topMargin = this.mInfo.getStringId(i).getTopMargin();
-        this.mInfo.destructor();
+        mInfo = new MediaInfo.PaperSize_constants();
+        int topMargin = mInfo.getStringId(i).getTopMargin();
+        mInfo.destructor();
         return Math.abs(topMargin);
     }
 
     public int getLeftMargin(int i) {
-        this.mInfo = new MediaInfo.PaperSize_constants();
-        int leftMargin = this.mInfo.getStringId(i).getLeftMargin();
-        this.mInfo.destructor();
+        mInfo = new MediaInfo.PaperSize_constants();
+        int leftMargin = mInfo.getStringId(i).getLeftMargin();
+        mInfo.destructor();
         return Math.abs(leftMargin);
     }
 
     public int getHeightPaper() {
-        return this.mHeight;
+        return mHeight;
     }
 
     public int getWidthPaper() {
-        return this.mWidth;
+        return mWidth;
     }
 }

+ 20 - 20
app/src/main/java/com/epson/mobilephone/common/guide/GuideWebviewFragment.java

@@ -32,32 +32,32 @@ public class GuideWebviewFragment extends Fragment {
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         if (getArguments() != null) {
-            this.mHtmlPath = getArguments().getString(ARG_PARAM1);
+            mHtmlPath = getArguments().getString(ARG_PARAM1);
         }
     }
 
     public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
         View inflate = layoutInflater.inflate(C0907R.layout.fragment_guide_webview, viewGroup, false);
-        this.mWebView = (WebView) inflate.findViewById(C0907R.C0909id.guideWebview);
-        this.mWebViewFrame = (FrameLayout) inflate.findViewById(C0907R.C0909id.guideWebViewFrame);
-        ViewGroup.MarginLayoutParams marginLayoutParams = (ViewGroup.MarginLayoutParams) this.mWebView.getLayoutParams();
-        ViewGroup.MarginLayoutParams marginLayoutParams2 = (ViewGroup.MarginLayoutParams) this.mWebViewFrame.getLayoutParams();
-        this.mWebView.getSettings().setBuiltInZoomControls(false);
-        this.mWebView.getSettings().setLoadWithOverviewMode(true);
-        this.mWebView.getSettings().setUseWideViewPort(true);
-        this.mWebView.setInitialScale(1);
-        this.mWebView.loadUrl(this.mHtmlPath);
+        mWebView = (WebView) inflate.findViewById(C0907R.C0909id.guideWebview);
+        mWebViewFrame = (FrameLayout) inflate.findViewById(C0907R.C0909id.guideWebViewFrame);
+        ViewGroup.MarginLayoutParams marginLayoutParams = (ViewGroup.MarginLayoutParams) mWebView.getLayoutParams();
+        ViewGroup.MarginLayoutParams marginLayoutParams2 = (ViewGroup.MarginLayoutParams) mWebViewFrame.getLayoutParams();
+        mWebView.getSettings().setBuiltInZoomControls(false);
+        mWebView.getSettings().setLoadWithOverviewMode(true);
+        mWebView.getSettings().setUseWideViewPort(true);
+        mWebView.setInitialScale(1);
+        mWebView.loadUrl(mHtmlPath);
         int webViewDP = Utils.getWebViewDP(getActivity(), getContext());
         marginLayoutParams.height = (int) Utils.dptopx(webViewDP, getContext());
         marginLayoutParams.width = (int) Utils.dptopx(webViewDP, getContext());
         marginLayoutParams2.height = (int) Utils.dptopx(Utils.LAYOUT_MEARGIN + webViewDP, getContext());
         marginLayoutParams2.width = (int) Utils.dptopx(webViewDP + Utils.LAYOUT_MEARGIN, getContext());
-        this.mWebView.setLayoutParams(marginLayoutParams);
-        this.mWebViewFrame.setLayoutParams(marginLayoutParams2);
+        mWebView.setLayoutParams(marginLayoutParams);
+        mWebViewFrame.setLayoutParams(marginLayoutParams2);
         inflate.findViewById(C0907R.C0909id.closeImage).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                if (GuideWebviewFragment.this.mClickListerner != null) {
-                    GuideWebviewFragment.this.mClickListerner.onClickClose();
+                if (GuideWebviewFragment.mClickListerner != null) {
+                    GuideWebviewFragment.mClickListerner.onClickClose();
                 }
             }
         });
@@ -66,27 +66,27 @@ public class GuideWebviewFragment extends Fragment {
 
     public void onPause() {
         super.onPause();
-        this.mWebView.onPause();
+        mWebView.onPause();
     }
 
     public void onResume() {
-        this.mWebView.onResume();
+        mWebView.onResume();
         super.onResume();
     }
 
     public void onDestroy() {
-        WebView webView = this.mWebView;
+        WebView webView = mWebView;
         if (webView != null) {
             webView.destroy();
         }
-        this.mWebView = null;
+        mWebView = null;
         super.onDestroy();
     }
 
     public void onAttach(Context context) {
         super.onAttach(context);
         try {
-            this.mClickListerner = (MyClickListener) context;
+            mClickListerner = (MyClickListener) context;
         } catch (ClassCastException unused) {
             throw new ClassCastException(getActivity().toString() + "must implement OnArticleSelectedListener.");
         }
@@ -94,6 +94,6 @@ public class GuideWebviewFragment extends Fragment {
 
     public void onDetach() {
         super.onDetach();
-        this.mClickListerner = null;
+        mClickListerner = null;
     }
 }

+ 36 - 36
app/src/main/java/com/epson/mobilephone/common/guide/NoticeGuideActivity.java

@@ -67,9 +67,9 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
             this.boot_group = intent.getStringExtra(KEY_BOOT_GROUP);
             this.dialog_mode = intent.getIntExtra(KEY_DIALOG_MODE, 0);
             this.version = intent.getIntExtra(KEY_GUIDE_VER, 0);
-            this.mDialogTextMessage = intent.getStringExtra(KEY_DIALOG_TITLE);
-            this.mDialogButtonYes = intent.getStringExtra(KEY_DIALOG_BUTTON_YES);
-            this.mDialogButtonNo = intent.getStringExtra(KEY_DIALOG_BUTTON_NO);
+            mDialogTextMessage = intent.getStringExtra(KEY_DIALOG_TITLE);
+            mDialogButtonYes = intent.getStringExtra(KEY_DIALOG_BUTTON_YES);
+            mDialogButtonNo = intent.getStringExtra(KEY_DIALOG_BUTTON_NO);
             if (this.boot_group != null) {
                 this.SP_KEY_GUIDE_VER += "-" + this.boot_group;
             }
@@ -80,11 +80,11 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
             }
         }
         final MyPageAdapter myPageAdapter = new MyPageAdapter();
-        this.mAdapter = new MyFragmentStatePagerAdapter(getSupportFragmentManager(), this.htmlpath);
-        this.mViewPager = (MyViewPager) findViewById(C0907R.C0909id.guideViewPager);
-        this.mViewPager.setAdapter(this.mAdapter);
-        this.mViewPager.setOffscreenPageLimit(2);
-        this.mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+        mAdapter = new MyFragmentStatePagerAdapter(getSupportFragmentManager(), this.htmlpath);
+        mViewPager = (MyViewPager) findViewById(C0907R.C0909id.guideViewPager);
+        mViewPager.setAdapter(mAdapter);
+        mViewPager.setOffscreenPageLimit(2);
+        mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             public void onPageScrollStateChanged(int i) {
             }
 
@@ -95,48 +95,48 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
                 myPageAdapter.changePage(i);
             }
         });
-        this.mPageDisplayView = (LinearLayout) findViewById(C0907R.C0909id.pageDisplayViewGroup);
-        myPageAdapter.setPageSize(this.mPageDisplayView, this.mAdapter.getCount());
-        myPageAdapter.changePage(this.mViewPager.getCurrentItem());
-        this.mGuideDialogView = (LinearLayout) findViewById(C0907R.C0909id.guide_dialog_layout);
-        this.mGrayLine_Hor = findViewById(C0907R.C0909id.guide_dialog_horizon_gray_line);
-        this.mDialogText = (TextView) findViewById(C0907R.C0909id.guide_dialog_message);
+        mPageDisplayView = (LinearLayout) findViewById(C0907R.C0909id.pageDisplayViewGroup);
+        myPageAdapter.setPageSize(mPageDisplayView, mAdapter.getCount());
+        myPageAdapter.changePage(mViewPager.getCurrentItem());
+        mGuideDialogView = (LinearLayout) findViewById(C0907R.C0909id.guide_dialog_layout);
+        mGrayLine_Hor = findViewById(C0907R.C0909id.guide_dialog_horizon_gray_line);
+        mDialogText = (TextView) findViewById(C0907R.C0909id.guide_dialog_message);
         int i = this.dialog_mode;
         if (i == DIALOG_MODE_ON || i == DIALOG_MODE_ONLY_BUTTON) {
-            this.mGuideDialogView.setVisibility(0);
-            ViewGroup.MarginLayoutParams marginLayoutParams = (ViewGroup.MarginLayoutParams) this.mGuideDialogView.getLayoutParams();
+            mGuideDialogView.setVisibility(0);
+            ViewGroup.MarginLayoutParams marginLayoutParams = (ViewGroup.MarginLayoutParams) mGuideDialogView.getLayoutParams();
             marginLayoutParams.width = (int) Utils.dptopx(Utils.getWebViewDP(this, getApplicationContext()) + Utils.LAYOUT_MEARGIN, getApplicationContext());
-            this.mGuideDialogView.setLayoutParams(marginLayoutParams);
-            this.mOK = (Button) findViewById(C0907R.C0909id.ok_button);
-            this.mCancel = (Button) findViewById(C0907R.C0909id.cancel_btn);
-            String str2 = this.mDialogButtonYes;
+            mGuideDialogView.setLayoutParams(marginLayoutParams);
+            mOK = (Button) findViewById(C0907R.C0909id.ok_button);
+            mCancel = (Button) findViewById(C0907R.C0909id.cancel_btn);
+            String str2 = mDialogButtonYes;
             if (str2 != null) {
-                this.mOK.setText(str2);
+                mOK.setText(str2);
             }
-            String str3 = this.mDialogButtonNo;
+            String str3 = mDialogButtonNo;
             if (str3 != null) {
-                this.mCancel.setText(str3);
+                mCancel.setText(str3);
             }
-            this.mOK.setOnClickListener(new View.OnClickListener() {
+            mOK.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     NoticeGuideActivity.this.setResult(-1);
                     NoticeGuideActivity.this.onClickClose();
                 }
             });
-            this.mCancel.setOnClickListener(new View.OnClickListener() {
+            mCancel.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     NoticeGuideActivity.this.setResult(0);
                     NoticeGuideActivity.this.onClickClose();
                 }
             });
-            if (this.dialog_mode == DIALOG_MODE_ON && (str = this.mDialogTextMessage) != null) {
-                this.mDialogText.setText(str);
+            if (this.dialog_mode == DIALOG_MODE_ON && (str = mDialogTextMessage) != null) {
+                mDialogText.setText(str);
             }
             if (this.dialog_mode == DIALOG_MODE_ONLY_BUTTON) {
-                this.mGrayLine_Hor.setVisibility(8);
-                this.mDialogText.setVisibility(8);
-                this.mOK.setBackground(getResources().getDrawable(C0907R.C0908drawable.rectangle_left_button));
-                this.mCancel.setBackground(getResources().getDrawable(C0907R.C0908drawable.rectangle_right_button));
+                mGrayLine_Hor.setVisibility(8);
+                mDialogText.setVisibility(8);
+                mOK.setBackground(getResources().getDrawable(C0907R.C0908drawable.rectangle_left_button));
+                mCancel.setBackground(getResources().getDrawable(C0907R.C0908drawable.rectangle_right_button));
             }
         }
     }
@@ -156,13 +156,13 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
         switch (configuration.orientation) {
             case 1:
                 if (this.dialog_mode == DIALOG_MODE_ON) {
-                    this.mGuideDialogView.setVisibility(0);
+                    mGuideDialogView.setVisibility(0);
                     break;
                 }
                 break;
             case 2:
                 if (this.dialog_mode == DIALOG_MODE_ON) {
-                    this.mGuideDialogView.setVisibility(8);
+                    mGuideDialogView.setVisibility(8);
                     break;
                 }
                 break;
@@ -198,14 +198,14 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
         }
 
         private void setPageSize(@NonNull ViewGroup viewGroup, int i) {
-            this.mPagePosition = new ImageView[i];
+            mPagePosition = new ImageView[i];
             int i2 = 0;
             while (i2 < i) {
                 ImageView imageView = new ImageView(NoticeGuideActivity.this.getApplicationContext());
                 imageView.setImageResource(C0907R.C0908drawable.cycle02);
                 int i3 = i2 + 1;
                 viewGroup.addView(imageView, i3);
-                this.mPagePosition[i2] = imageView;
+                mPagePosition[i2] = imageView;
                 i2 = i3;
             }
         }
@@ -213,7 +213,7 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
         private void changePage(int i) {
             int i2 = 0;
             while (true) {
-                ImageView[] imageViewArr = this.mPagePosition;
+                ImageView[] imageViewArr = mPagePosition;
                 if (i2 < imageViewArr.length) {
                     if (imageViewArr[i2] != null) {
                         if (i == i2) {

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

@@ -31,8 +31,8 @@ public class SecureKeyFactory {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        this.mAppContext = context.getApplicationContext();
-        this.key = navite_getKey(this.mAppContext);
+        mAppContext = context.getApplicationContext();
+        this.key = navite_getKey(mAppContext);
     }
 
     public static SecureKeyFactory getInstance(Context context) {
@@ -55,7 +55,7 @@ public class SecureKeyFactory {
 
     private Cipher getCipher() throws NoSuchPaddingException, NoSuchAlgorithmException {
         try {
-            return Cipher.getInstance("AES/ECB/PKCS5Padding", this.mSecurityProvider);
+            return Cipher.getInstance("AES/ECB/PKCS5Padding", mSecurityProvider);
         } catch (NoSuchAlgorithmException | NoSuchProviderException e) {
             e.printStackTrace();
             return Cipher.getInstance("AES/ECB/PKCS5Padding");

+ 7 - 7
app/src/main/java/com/epson/mobilephone/common/license/InfoDisplayActivity.java

@@ -39,14 +39,14 @@ public class InfoDisplayActivity extends AppCompatActivity {
             return;
         }
         ((TextView) findViewById(C1066R.C1068id.contentText)).setText(titleAndDocumentFromIntent.getDocumentString(getApplicationContext()));
-        this.mScrollView = (RestoreScrollView) findViewById(C1066R.C1068id.mainScrollView);
+        mScrollView = (RestoreScrollView) findViewById(C1066R.C1068id.mainScrollView);
         setTitle(titleAndDocumentFromIntent.getTitle(getApplicationContext()));
         ActionBar supportActionBar = getSupportActionBar();
         if (supportActionBar != null) {
             supportActionBar.setDisplayHomeAsUpEnabled(true);
         }
         if (bundle != null) {
-            this.mScrollView.setScrollY(bundle.getInt(KEY_SCROLL_Y, 0));
+            mScrollView.setScrollY(bundle.getInt(KEY_SCROLL_Y, 0));
         }
     }
 
@@ -98,7 +98,7 @@ public class InfoDisplayActivity extends AppCompatActivity {
 
     protected void onSaveInstanceState(Bundle bundle) {
         super.onSaveInstanceState(bundle);
-        bundle.putInt(KEY_SCROLL_Y, this.mScrollView.getLastY());
+        bundle.putInt(KEY_SCROLL_Y, mScrollView.getLastY());
     }
 
     @NonNull
@@ -122,18 +122,18 @@ public class InfoDisplayActivity extends AppCompatActivity {
         private final LicenseInfo mLicenseInfo;
 
         TitleAndTextInternal(int i, @NonNull LicenseInfo licenseInfo) {
-            this.mDocumentType = i;
-            this.mLicenseInfo = licenseInfo;
+            mDocumentType = i;
+            mLicenseInfo = licenseInfo;
         }
 
         @NonNull
         public String getTitle(@NonNull Context context) {
-            return context.getString(InfoDisplayActivity.getTitleStringId(this.mDocumentType));
+            return context.getString(InfoDisplayActivity.getTitleStringId(mDocumentType));
         }
 
         @NonNull
         public String getDocumentString(@NonNull Context context) {
-            return this.mLicenseInfo.getDocumentString(context, this.mDocumentType);
+            return mLicenseInfo.getDocumentString(context, mDocumentType);
         }
     }
 }

+ 10 - 10
app/src/main/java/com/epson/mobilephone/common/license/LicenseTopActivity.java

@@ -54,9 +54,9 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
             finish();
             return;
         }
-        ((TextView) findViewById(C1066R.C1068id.appNameText)).setText(this.mLicenseInfo.getApplicationName(this));
+        ((TextView) findViewById(C1066R.C1068id.appNameText)).setText(mLicenseInfo.getApplicationName(this));
         if (bundle == null) {
-            showLicenseChangeDialogIfNeeded(this, this.mLicenseInfo, this.mUserSurveyInfo);
+            showLicenseChangeDialogIfNeeded(this, mLicenseInfo, mUserSurveyInfo);
         }
     }
 
@@ -64,11 +64,11 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
         if (intent == null) {
             return false;
         }
-        this.mLicenseInfo = (LicenseInfo) intent.getSerializableExtra(KEY_LICENSE_INFO);
-        if (this.mLicenseInfo == null) {
+        mLicenseInfo = (LicenseInfo) intent.getSerializableExtra(KEY_LICENSE_INFO);
+        if (mLicenseInfo == null) {
             return false;
         }
-        this.mUserSurveyInfo = (UserSurveyInfo) intent.getSerializableExtra(KEY_USER_SURVEY_INFO);
+        mUserSurveyInfo = (UserSurveyInfo) intent.getSerializableExtra(KEY_USER_SURVEY_INFO);
         return true;
     }
 
@@ -100,7 +100,7 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
     }
 
     private void onAgree() {
-        LicenseInfo licenseInfo = this.mLicenseInfo;
+        LicenseInfo licenseInfo = mLicenseInfo;
         if (licenseInfo == null) {
             finish();
             return;
@@ -111,17 +111,17 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
     }
 
     private void startUserSurveyInvitationActivity() {
-        if (this.mLicenseInfo == null) {
+        if (mLicenseInfo == null) {
             finish();
             return;
         }
-        UserSurveyInfo userSurveyInfo = this.mUserSurveyInfo;
+        UserSurveyInfo userSurveyInfo = mUserSurveyInfo;
         if (userSurveyInfo == null) {
             finish();
         } else if (userSurveyInfo.getResponseStatus(this) >= 2) {
             finish();
         } else {
-            startActivityForResult(UserSurveyInvitationActivity.getStartWithDialogIntent(this, this.mUserSurveyInfo, this.mLicenseInfo), 2);
+            startActivityForResult(UserSurveyInvitationActivity.getStartWithDialogIntent(this, mUserSurveyInfo, mLicenseInfo), 2);
         }
     }
 
@@ -130,7 +130,7 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
     }
 
     private void startDocumentDisplayActivity(int i) {
-        LicenseInfo licenseInfo = this.mLicenseInfo;
+        LicenseInfo licenseInfo = mLicenseInfo;
         if (licenseInfo != null) {
             startActivity(InfoDisplayActivity.getStartIntent(this, licenseInfo, i));
         }

+ 4 - 4
app/src/main/java/com/epson/mobilephone/common/license/RestoreScrollView.java

@@ -9,12 +9,12 @@ public class RestoreScrollView extends ScrollView {
 
     public RestoreScrollView(Context context) {
         super(context);
-        this.mLastY = 0;
+        mLastY = 0;
     }
 
     public RestoreScrollView(Context context, AttributeSet attributeSet) {
         super(context, attributeSet);
-        this.mLastY = 0;
+        mLastY = 0;
     }
 
     public RestoreScrollView(Context context, AttributeSet attributeSet, int i) {
@@ -23,10 +23,10 @@ public class RestoreScrollView extends ScrollView {
 
     protected void onScrollChanged(int i, int i2, int i3, int i4) {
         super.onScrollChanged(i, i2, i3, i4);
-        this.mLastY = i2;
+        mLastY = i2;
     }
 
     public int getLastY() {
-        return this.mLastY;
+        return mLastY;
     }
 }

+ 6 - 6
app/src/main/java/com/epson/mobilephone/common/license/SimpleMessageDialogFragment.java

@@ -32,14 +32,14 @@ public class SimpleMessageDialogFragment extends DialogFragment {
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         Bundle arguments = getArguments();
-        this.mDialogId = arguments.getInt(PARAM_DIALOG_ID);
-        this.mMessageString = arguments.getString(PARAM_MESSAGE_STRING);
+        mDialogId = arguments.getInt(PARAM_DIALOG_ID);
+        mMessageString = arguments.getString(PARAM_MESSAGE_STRING);
     }
 
     @NonNull
     public Dialog onCreateDialog(Bundle bundle) {
         super.onCreateDialog(bundle);
-        AlertDialog create = new AlertDialog.Builder(getActivity()).setMessage(this.mMessageString).setPositiveButton(C1066R.string.f148OK, new DialogInterface.OnClickListener() {
+        AlertDialog create = new AlertDialog.Builder(getActivity()).setMessage(mMessageString).setPositiveButton(C1066R.string.f148OK, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 SimpleMessageDialogFragment.this.onOkClicked();
             }
@@ -49,13 +49,13 @@ public class SimpleMessageDialogFragment extends DialogFragment {
     }
 
     private void onOkClicked() {
-        this.mDialogCallback.onButtonClicked(this.mDialogId);
+        mDialogCallback.onButtonClicked(mDialogId);
     }
 
     public void onAttach(Activity activity) {
         super.onAttach(activity);
         try {
-            this.mDialogCallback = (DialogCallback) activity;
+            mDialogCallback = (DialogCallback) activity;
         } catch (ClassCastException unused) {
             throw new ClassCastException(activity.toString() + " must implement DialogCallback");
         }
@@ -63,6 +63,6 @@ public class SimpleMessageDialogFragment extends DialogFragment {
 
     public void onDetach() {
         super.onDetach();
-        this.mDialogCallback = null;
+        mDialogCallback = null;
     }
 }

+ 12 - 12
app/src/main/java/com/epson/mobilephone/common/license/UserSurveyInvitationActivity.java

@@ -51,13 +51,13 @@ public class UserSurveyInvitationActivity extends AppCompatActivity implements S
             }
         });
         TextView textView = (TextView) findViewById(C1066R.C1068id.analytics_content);
-        this.mDisplayChangeDialog = false;
+        mDisplayChangeDialog = false;
         Intent intent = getIntent();
         if (intent != null) {
-            this.mUserSurveyInfo = (UserSurveyInfo) intent.getSerializableExtra(PARAM_USER_SURVEY_INFO);
-            this.mLicenseInfo = (LicenseInfo) intent.getSerializableExtra(PARAM_LICENSE_INFO);
+            mUserSurveyInfo = (UserSurveyInfo) intent.getSerializableExtra(PARAM_USER_SURVEY_INFO);
+            mLicenseInfo = (LicenseInfo) intent.getSerializableExtra(PARAM_LICENSE_INFO);
             String str = null;
-            UserSurveyInfo userSurveyInfo2 = this.mUserSurveyInfo;
+            UserSurveyInfo userSurveyInfo2 = mUserSurveyInfo;
             if (userSurveyInfo2 != null) {
                 str = userSurveyInfo2.getUserSurveyInvitationText(this);
             }
@@ -65,18 +65,18 @@ public class UserSurveyInvitationActivity extends AppCompatActivity implements S
                 str = C1073Util.getStringFromRawResource(getApplicationContext(), C1066R.raw.user_survey);
             }
             textView.setText(str);
-            changeButtonText(button2, 1, this.mUserSurveyInfo, this);
-            changeButtonText(button, 0, this.mUserSurveyInfo, this);
-            updateAppNameText(this.mLicenseInfo);
-            this.mDisplayChangeDialog = intent.getBooleanExtra(PARAM_DISPLAY_CHANGE_DIALOG, false);
-            if (this.mDisplayChangeDialog && bundle == null && (userSurveyInfo = this.mUserSurveyInfo) != null && userSurveyInfo.getResponseStatus(this) == 1) {
+            changeButtonText(button2, 1, mUserSurveyInfo, this);
+            changeButtonText(button, 0, mUserSurveyInfo, this);
+            updateAppNameText(mLicenseInfo);
+            mDisplayChangeDialog = intent.getBooleanExtra(PARAM_DISPLAY_CHANGE_DIALOG, false);
+            if (mDisplayChangeDialog && bundle == null && (userSurveyInfo = mUserSurveyInfo) != null && userSurveyInfo.getResponseStatus(this) == 1) {
                 showUpdateDialog();
             }
         }
     }
 
     private void startPrivacyStatementDisplayActivity() {
-        LicenseInfo licenseInfo = this.mLicenseInfo;
+        LicenseInfo licenseInfo = mLicenseInfo;
         if (licenseInfo != null) {
             startActivity(InfoDisplayActivity.getStartIntent(this, licenseInfo, 2));
         }
@@ -101,7 +101,7 @@ public class UserSurveyInvitationActivity extends AppCompatActivity implements S
     }
 
     private void finishWithStatus(boolean z) {
-        UserSurveyInfo userSurveyInfo = this.mUserSurveyInfo;
+        UserSurveyInfo userSurveyInfo = mUserSurveyInfo;
         if (userSurveyInfo != null) {
             userSurveyInfo.setUserSurveyAgreement(this, z);
         }
@@ -110,7 +110,7 @@ public class UserSurveyInvitationActivity extends AppCompatActivity implements S
     }
 
     public void onBackPressed() {
-        if (!this.mDisplayChangeDialog) {
+        if (!mDisplayChangeDialog) {
             finishWithStatus(false);
         }
     }

+ 16 - 16
app/src/main/java/com/epson/mobilephone/common/maintain/MaintainPrinter.java

@@ -10,71 +10,71 @@ public class MaintainPrinter {
     protected int mSearchPos = 0;
 
     public void setMSearchPos(int i) {
-        this.mSearchPos = i;
+        mSearchPos = i;
     }
 
     public EscprLib getMEscpLib() {
-        return this.mEscprLib;
+        return mEscprLib;
     }
 
     public MaintainPrinterInfo getMPrinterInfor() {
-        return this.mPrinterInfor;
+        return mPrinterInfor;
     }
 
     public int getMSearchPos() {
-        return this.mSearchPos;
+        return mSearchPos;
     }
 
     public int doInitDriver(Context context, int i) {
         String path = context.getExternalFilesDir((String) null).getPath();
         EpLog.m78i("MaintainPrinter", "**********doInitDriver************:" + path);
-        return this.mEscprLib.init_driver(context, path);
+        return mEscprLib.init_driver(context, path);
     }
 
     public int doReleaseDriver() {
-        return this.mEscprLib.release_driver();
+        return mEscprLib.release_driver();
     }
 
     public int doFindPrinter(int i, int i2) {
         EpLog.m78i("MaintainPrinter", "**********Call do find printer************");
-        return this.mEscprLib.search_printer((String) null);
+        return mEscprLib.search_printer((String) null);
     }
 
     public int doGetLang() {
-        return this.mEscprLib.get_lang();
+        return mEscprLib.get_lang();
     }
 
     public String doGetIp() {
-        return this.mEscprLib.epsWrapperGetIp();
+        return mEscprLib.epsWrapperGetIp();
     }
 
     public int doCancelFindPrinter() {
-        return this.mEscprLib.cancel_search_printer();
+        return mEscprLib.cancel_search_printer();
     }
 
     public int doSetPrinter() {
-        return this.mEscprLib.set_printer(this.mSearchPos);
+        return mEscprLib.set_printer(mSearchPos);
     }
 
     public int doGetStatus() {
-        return this.mEscprLib.epsWrapperGetStatus(this.mPrinterInfor.getMStatus());
+        return mEscprLib.epsWrapperGetStatus(mPrinterInfor.getMStatus());
     }
 
     public int doDoMainteCmd(int i) {
         EpLog.m78i("MaintainPrinter", "**********doDoMainteCmd************");
-        return this.mEscprLib.epsWrapperDoMainteCmd(i);
+        return mEscprLib.epsWrapperDoMainteCmd(i);
     }
 
     public int doGetSupplyInfo() {
-        return this.mEscprLib.epsWrapperGetSupplyInfo(this.mPrinterInfor.getMSupplyInfo());
+        return mEscprLib.epsWrapperGetSupplyInfo(mPrinterInfor.getMSupplyInfo());
     }
 
     public int doGetSupplyInfoEx() {
-        return this.mEscprLib.epsWrapperGetSupplyInfo(this.mPrinterInfor.getMSupplyInfo());
+        return mEscprLib.epsWrapperGetSupplyInfo(mPrinterInfor.getMSupplyInfo());
     }
 
     public int doProbePrinter(int i, int i2, String str) {
         EpLog.m78i("MaintainPrinter", "doProbePrinter");
-        return this.mEscprLib.search_printer(str);
+        return mEscprLib.search_printer(str);
     }
 }

+ 10 - 10
app/src/main/java/com/epson/mobilephone/common/maintain/MaintainPrinterInfo.java

@@ -9,42 +9,42 @@ public class MaintainPrinterInfo {
     private EPS_SUPPLY_INFO mSupplyInfo = new EPS_SUPPLY_INFO();
 
     public EPS_SUPPLY_INFO getMSupplyInfo() {
-        return this.mSupplyInfo;
+        return mSupplyInfo;
     }
 
     public void setMInkInfor(int[] iArr) {
-        this.mSupplyInfo.ink.colors = iArr;
+        mSupplyInfo.ink.colors = iArr;
     }
 
     public String getMPrinterName() {
-        return this.mPrinterName;
+        return mPrinterName;
     }
 
     public void setMPrinterName(String str) {
-        this.mPrinterName = str;
+        mPrinterName = str;
     }
 
     public String getMLocation() {
-        return this.mLocation;
+        return mLocation;
     }
 
     public void setMLocation(String str) {
-        this.mLocation = str;
+        mLocation = str;
     }
 
     public String getMId() {
-        return this.mId;
+        return mId;
     }
 
     public void setMId(String str) {
-        this.mId = str;
+        mId = str;
     }
 
     public int[] getMStatus() {
-        return this.mStatus;
+        return mStatus;
     }
 
     public void setMStatus(int[] iArr) {
-        this.mStatus = iArr;
+        mStatus = iArr;
     }
 }

+ 29 - 29
app/src/main/java/com/epson/mobilephone/common/maintain2/MaintainPrinter2.java

@@ -25,70 +25,70 @@ public class MaintainPrinter2 {
     }
 
     public void setMSearchPos(int i) {
-        this.mSearchPos = i;
+        mSearchPos = i;
     }
 
     public EscprLib getMEscpLib() {
-        return this.mEscpLib;
+        return mEscpLib;
     }
 
     public MaintainPrinterInfo2 getMPrinterInfor() {
-        return this.mPrinterInfor;
+        return mPrinterInfor;
     }
 
     public int getMSearchPos() {
-        return this.mSearchPos;
+        return mSearchPos;
     }
 
     public int doInitDriver(Context context, int i) {
         EpLog.m78i("MaintainPrinter2", " @@@@@@@    doInitDriver                 @");
-        EpLog.m77i(this.mEscpLib.is64bit() ? "Native is operating at ☆ 64 bit !!" : "Native is operating at 32 bit");
-        return this.mEscpLib.epsWrapperInitDriver(context, i);
+        EpLog.m77i(mEscpLib.is64bit() ? "Native is operating at ☆ 64 bit !!" : "Native is operating at 32 bit");
+        return mEscpLib.epsWrapperInitDriver(context, i);
     }
 
     public int doReleaseDriver() {
         EpLog.m78i("MaintainPrinter2", " xxxxxxx    doReleaseDriver                x");
-        return this.mEscpLib.release_driver();
+        return mEscpLib.release_driver();
     }
 
     public int doFindPrinter(int i, int i2) {
         int doFindPrinter;
         synchronized (lockObj) {
             EpLog.m78i("MaintainPrinter2", "**********Call do find printer************");
-            this.mEscpLib.setSearchStt(true);
-            this.mEscpLib.resetIPAdressCheck();
+            mEscpLib.setSearchStt(true);
+            mEscpLib.resetIPAdressCheck();
             EpLog.m78i("MaintainPrinter2", "findType = " + i);
-            doFindPrinter = this.mEscpLib.doFindPrinter(i, i2);
+            doFindPrinter = mEscpLib.doFindPrinter(i, i2);
             EpLog.m78i("MaintainPrinter2", "**********Finish do find printer************");
         }
         return doFindPrinter;
     }
 
     public int doGetLang() {
-        return this.mEscpLib.get_lang();
+        return mEscpLib.get_lang();
     }
 
     public String doGetIp() {
-        return this.mEscpLib.epsWrapperGetIp();
+        return mEscpLib.epsWrapperGetIp();
     }
 
     public String doGetId() {
-        return this.mEscpLib.epsWrapperGetId();
+        return mEscpLib.epsWrapperGetId();
     }
 
     public int doCancelFindPrinter() {
-        this.mEscpLib.setSearchStt(false);
-        return this.mEscpLib.epsWrapperCancelFindPrinter();
+        mEscpLib.setSearchStt(false);
+        return mEscpLib.epsWrapperCancelFindPrinter();
     }
 
     public int doSetPrinter() {
-        return this.mEscpLib.set_printer(this.mSearchPos);
+        return mEscpLib.set_printer(mSearchPos);
     }
 
     public int doGetStatus() {
         int epsWrapperGetStatus;
         synchronized (lockObj) {
-            epsWrapperGetStatus = this.mEscpLib.epsWrapperGetStatus(this.mPrinterInfor.getMStatus());
+            epsWrapperGetStatus = mEscpLib.epsWrapperGetStatus(mPrinterInfor.getMStatus());
         }
         return epsWrapperGetStatus;
     }
@@ -97,7 +97,7 @@ public class MaintainPrinter2 {
         int epsWrapperDoMainteCmd;
         synchronized (lockObj) {
             EpLog.m78i("MaintainPrinter2", "**********doDoMainteCmd************");
-            epsWrapperDoMainteCmd = this.mEscpLib.epsWrapperDoMainteCmd(i);
+            epsWrapperDoMainteCmd = mEscpLib.epsWrapperDoMainteCmd(i);
         }
         return epsWrapperDoMainteCmd;
     }
@@ -105,7 +105,7 @@ public class MaintainPrinter2 {
     public int doGetInkInfo() {
         int epsWrapperGetInkInfo2;
         synchronized (lockObj) {
-            epsWrapperGetInkInfo2 = this.mEscpLib.epsWrapperGetInkInfo2(this.mPrinterInfor);
+            epsWrapperGetInkInfo2 = mEscpLib.epsWrapperGetInkInfo2(mPrinterInfor);
         }
         return epsWrapperGetInkInfo2;
     }
@@ -114,8 +114,8 @@ public class MaintainPrinter2 {
         int epsWrapperProbePrinter2;
         synchronized (lockObj) {
             EpLog.m78i("MaintainPrinter2", "**********Call doProbePrinter************");
-            this.mEscpLib.resetIPAdressCheck();
-            epsWrapperProbePrinter2 = this.mEscpLib.epsWrapperProbePrinter2(i, str, str2, i2);
+            mEscpLib.resetIPAdressCheck();
+            epsWrapperProbePrinter2 = mEscpLib.epsWrapperProbePrinter2(i, str, str2, i2);
             if (epsWrapperProbePrinter2 < 0) {
                 EpLog.m72e("MaintainPrinter2", "ret=" + epsWrapperProbePrinter2);
             }
@@ -129,13 +129,13 @@ public class MaintainPrinter2 {
     }
 
     public int[] getMediaInfo(int i, int i2) {
-        return this.mEscpLib.epsWrapperGetMediaInfo(i, i2);
+        return mEscpLib.epsWrapperGetMediaInfo(i, i2);
     }
 
     public int[] getPaperInfo() {
         int[] epsWrapperGetPaperInfo;
         synchronized (lockObj) {
-            epsWrapperGetPaperInfo = this.mEscpLib.epsWrapperGetPaperInfo();
+            epsWrapperGetPaperInfo = mEscpLib.epsWrapperGetPaperInfo();
         }
         return epsWrapperGetPaperInfo;
     }
@@ -143,7 +143,7 @@ public class MaintainPrinter2 {
     public int getFirmwareInfo(EnumMap<EscprLib.PrinterFirmInfo, String> enumMap) {
         int firmwareInfo;
         synchronized (lockObj) {
-            firmwareInfo = this.mEscpLib.getFirmwareInfo(enumMap);
+            firmwareInfo = mEscpLib.getFirmwareInfo(enumMap);
         }
         return firmwareInfo;
     }
@@ -151,7 +151,7 @@ public class MaintainPrinter2 {
     public int getBatteryInfo(BatteryInfo batteryInfo) {
         int batteryInfo2;
         synchronized (lockObj) {
-            batteryInfo2 = this.mEscpLib.getBatteryInfo(batteryInfo);
+            batteryInfo2 = mEscpLib.getBatteryInfo(batteryInfo);
         }
         return batteryInfo2;
     }
@@ -159,7 +159,7 @@ public class MaintainPrinter2 {
     public int getBatteryInfo(BatteryInfoEx batteryInfoEx) {
         int batteryInfoEx2;
         synchronized (lockObj) {
-            batteryInfoEx2 = this.mEscpLib.getBatteryInfoEx(batteryInfoEx);
+            batteryInfoEx2 = mEscpLib.getBatteryInfoEx(batteryInfoEx);
         }
         return batteryInfoEx2;
     }
@@ -167,7 +167,7 @@ public class MaintainPrinter2 {
     public int[] getMaintenanceBoxInformation() {
         int[] epsWrapperGetMaintenanceBoxInformation;
         synchronized (lockObj) {
-            epsWrapperGetMaintenanceBoxInformation = this.mEscpLib.epsWrapperGetMaintenanceBoxInformation();
+            epsWrapperGetMaintenanceBoxInformation = mEscpLib.epsWrapperGetMaintenanceBoxInformation();
         }
         return epsWrapperGetMaintenanceBoxInformation;
     }
@@ -175,7 +175,7 @@ public class MaintainPrinter2 {
     public int getEmaStatus(int[] iArr) {
         int epsWrapperGetEmaStatus;
         synchronized (lockObj) {
-            epsWrapperGetEmaStatus = this.mEscpLib.epsWrapperGetEmaStatus(iArr);
+            epsWrapperGetEmaStatus = mEscpLib.epsWrapperGetEmaStatus(iArr);
         }
         return epsWrapperGetEmaStatus;
     }
@@ -183,7 +183,7 @@ public class MaintainPrinter2 {
     public int setEmaStatus(int i) {
         int epsWrapperSetEmaStatus;
         synchronized (lockObj) {
-            epsWrapperSetEmaStatus = this.mEscpLib.epsWrapperSetEmaStatus(i);
+            epsWrapperSetEmaStatus = mEscpLib.epsWrapperSetEmaStatus(i);
         }
         return epsWrapperSetEmaStatus;
     }

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

@@ -18,36 +18,36 @@ public class MaintainPrinterInfo2 {
     private int[] mStatus = new int[3];
 
     public int[] getMStatus() {
-        return this.mStatus;
+        return mStatus;
     }
 
     public void setMStatus(int[] iArr) {
-        this.mStatus = iArr;
+        mStatus = iArr;
     }
 
     public int getInkNum() {
-        return this.mInkNum;
+        return mInkNum;
     }
 
     public int getInkCode(int i) {
-        if (i >= 0 && i <= this.mInkNum) {
-            return this.mInkColorCode[i];
+        if (i >= 0 && i <= mInkNum) {
+            return mInkColorCode[i];
         }
         throw new ArrayIndexOutOfBoundsException();
     }
 
     public int getInkName(int i) {
-        if (i >= 0 && i <= this.mInkNum) {
-            return this.mInkColorName[i];
+        if (i >= 0 && i <= mInkNum) {
+            return mInkColorName[i];
         }
         throw new ArrayIndexOutOfBoundsException();
     }
 
     public int getInkRemainingAmount(int i) {
-        if (i < 0 || i > this.mInkNum) {
+        if (i < 0 || i > mInkNum) {
             throw new ArrayIndexOutOfBoundsException();
         }
-        int i2 = this.mInkRemeiningAmount[i];
+        int i2 = mInkRemeiningAmount[i];
         if (i2 < 0) {
             return 0;
         }
@@ -55,10 +55,10 @@ public class MaintainPrinterInfo2 {
     }
 
     public int getInkStatus(int i) {
-        if (i < 0 || i > this.mInkNum) {
+        if (i < 0 || i > mInkNum) {
             throw new ArrayIndexOutOfBoundsException();
         }
-        int[] iArr = this.mInkStatus;
+        int[] iArr = mInkStatus;
         if (i > iArr.length) {
             return -2;
         }

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

@@ -60,7 +60,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        this.mWifiManager = (WifiManager) getApplicationContext().getApplicationContext().getSystemService("wifi");
+        mWifiManager = (WifiManager) getApplicationContext().getApplicationContext().getSystemService("wifi");
         requestWindowFeature(1);
         this.searchWiFiDirectPrinter = SearchWiFiDirectPrinterTask.getInstance(this);
     }

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

@@ -75,7 +75,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
                     }
                 case 3:
                     if (message.what == 11) {
-                        if (!ActivityConnectP2P.this.mWifiManager.isWifiEnabled()) {
+                        if (!ActivityConnectP2P.mWifiManager.isWifiEnabled()) {
                             ActivityConnectP2P.this.startActivityForResult(new Intent(ActivityConnectP2P.this, ActivityControlWiFi.class), 1);
                             return;
                         }
@@ -94,7 +94,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
                                 ActivityConnectP2P.this.p2pConnectConfig.wps.setup = 0;
                                 ActivityConnectP2P.this.status = ActivityConnectBase.Status.WIFI_CONNECTING;
                                 ActivityConnectP2P.this.setupObserver();
-                                ActivityConnectP2P.this.mHandler.sendEmptyMessage(12);
+                                ActivityConnectP2P.mHandler.sendEmptyMessage(12);
                                 break;
                             }
                         } else {
@@ -114,7 +114,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
                 ActivityConnectP2P.this.onConnectedWiFi();
             } else if (i == 12) {
                 EPLog.m86d(ActivityConnectP2P.TAG, "connect() " + ActivityConnectP2P.this.targetSsid);
-                ActivityConnectP2P.this.mWiFiP2PManager.connect(ActivityConnectP2P.this.p2pChannnel, ActivityConnectP2P.this.p2pConnectConfig, new WifiP2pManager.ActionListener() {
+                ActivityConnectP2P.mWiFiP2PManager.connect(ActivityConnectP2P.this.p2pChannnel, ActivityConnectP2P.this.p2pConnectConfig, new WifiP2pManager.ActionListener() {
                     public void onSuccess() {
                         EPLog.m86d(ActivityConnectP2P.TAG, "P2PConnect_Operation Success");
                     }
@@ -137,7 +137,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
                             ActivityConnectP2P.this.onError();
                         } else {
                             EPLog.m90w(ActivityConnectP2P.TAG, "P2PConnect_Operation BUSY");
-                            ActivityConnectP2P.this.mHandler.sendEmptyMessageDelayed(12, 1000);
+                            ActivityConnectP2P.mHandler.sendEmptyMessageDelayed(12, 1000);
                         }
                     }
                 });
@@ -168,10 +168,10 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        this.mModelDialog = (DialogProgressWiFiDirectViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressWiFiDirectViewModel.class);
-        this.mModelDialog.getDialogJob().observe(this, new Observer<Deque<String[]>>() {
+        mModelDialog = (DialogProgressWiFiDirectViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressWiFiDirectViewModel.class);
+        mModelDialog.getDialogJob().observe(this, new Observer<Deque<String[]>>() {
             public void onChanged(@Nullable Deque<String[]> deque) {
-                String[] checkQueue = ActivityConnectP2P.this.mModelDialog.checkQueue();
+                String[] checkQueue = ActivityConnectP2P.mModelDialog.checkQueue();
                 if (checkQueue != null) {
                     String str = checkQueue[0];
                     String str2 = checkQueue[1];
@@ -184,13 +184,13 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
                 }
             }
         });
-        this.mModelDialog.doShow(IDD_WIFI_WAITING);
-        this.mWiFiP2PManager = (WifiP2pManager) getSystemService("wifip2p");
-        WifiP2pManager wifiP2pManager = this.mWiFiP2PManager;
+        mModelDialog.doShow(IDD_WIFI_WAITING);
+        mWiFiP2PManager = (WifiP2pManager) getSystemService("wifip2p");
+        WifiP2pManager wifiP2pManager = mWiFiP2PManager;
         if (wifiP2pManager != null) {
             this.p2pChannnel = wifiP2pManager.initialize(this, getMainLooper(), (WifiP2pManager.ChannelListener) null);
         }
-        if (this.mWiFiP2PManager == null || this.p2pChannnel == null) {
+        if (mWiFiP2PManager == null || this.p2pChannnel == null) {
             onError();
             return;
         }
@@ -206,7 +206,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         if (Build.VERSION.SDK_INT >= 29) {
             ActivityRequestLocationPermission.requestLocationPermissionForce(this, 2);
         } else {
-            this.mHandler.sendEmptyMessage(11);
+            mHandler.sendEmptyMessage(11);
         }
     }
 
@@ -222,7 +222,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
             setLastDetailResult(1);
             finish();
         } else {
-            this.mHandler.sendEmptyMessage(11);
+            mHandler.sendEmptyMessage(11);
         }
     }
 
@@ -235,12 +235,12 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
                 if (this.targetSsid.equals(connectionInfo.printerName)) {
                     EPLog.m86d(TAG, "Already Connected!!");
                     this.status = ActivityConnectBase.Status.WIFI_CONNECTING;
-                    this.mHandler.sendEmptyMessage(10);
+                    mHandler.sendEmptyMessage(10);
                     return;
                 }
                 WifiP2pUtils.getInstance(this).disconnect();
             }
-            if (!this.searchWiFiDirectPrinter.start(2, this.mHandler, 0, this.timeout)) {
+            if (!this.searchWiFiDirectPrinter.start(2, mHandler, 0, this.timeout)) {
                 onError();
             } else {
                 this.status = ActivityConnectBase.Status.WIFI_SCANNING;
@@ -381,7 +381,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
             this.expectedPrtMacAddr = WiFiControl.p2pAddr2PtrAddrP2P(connectionInfo.p2PMacAdder, this.targetSsid);
         }
         this.status = ActivityConnectBase.Status.PRINTER_FINDING;
-        this.taskFindPrinter = new FindPrinterTask(this.mHandler, this.timeout, 1, 2);
+        this.taskFindPrinter = new FindPrinterTask(mHandler, this.timeout, 1, 2);
         this.taskFindPrinter.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
     }
 
@@ -396,9 +396,9 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
             case WIFI_CONNECTING:
                 if (this.p2pConnectConfig != null) {
                     interruptConnecting();
-                    if (this.mWiFiP2PManager != null) {
+                    if (mWiFiP2PManager != null) {
                         EPLog.m86d(TAG, "cancelConnect() " + this.targetSsid);
-                        this.mWiFiP2PManager.cancelConnect(this.p2pChannnel, (WifiP2pManager.ActionListener) null);
+                        mWiFiP2PManager.cancelConnect(this.p2pChannnel, (WifiP2pManager.ActionListener) null);
                         this.p2pConnectConfig = null;
                         break;
                     }
@@ -413,7 +413,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
                 break;
         }
         if (this.showErrorDlg) {
-            this.mModelDialog.doShow(IDD_WIFI_ERROR);
+            mModelDialog.doShow(IDD_WIFI_ERROR);
             return;
         }
         EPLog.m86d(TAG, "finish():RESULT_CANCELED");
@@ -425,7 +425,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
     private void closeWaitingDialog() {
         EPLog.m86d(TAG, "Called closeWaitingDialog()");
         try {
-            this.mModelDialog.doDismiss(IDD_WIFI_WAITING);
+            mModelDialog.doDismiss(IDD_WIFI_WAITING);
         } catch (IllegalArgumentException unused) {
             EPLog.m86d(TAG, "IDD_WIFI_WAITING already closed");
         }
@@ -508,7 +508,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
                         ActivityConnectP2P.this.searchWiFiDirectPrinter.interrupt();
                         ActivityConnectP2P.this.searchWiFiDirectPrinter = null;
                     }
-                    ActivityConnectP2P.this.mHandler.sendEmptyMessage(10);
+                    ActivityConnectP2P.mHandler.sendEmptyMessage(10);
                 }
             }
         }

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

@@ -43,9 +43,9 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
                 case 1:
                     if (message.what == 11) {
                         if (Build.VERSION.SDK_INT > 25 && !ActivityConnectSimpleAP.this.createSimpleAP) {
-                            ActivityConnectSimpleAP.this.mModelDialog.doShow(ActivityConnectSimpleAP.IDD_WIFI_SIMPLEAP);
+                            ActivityConnectSimpleAP.mModelDialog.doShow(ActivityConnectSimpleAP.IDD_WIFI_SIMPLEAP);
                             return;
-                        } else if (!ActivityConnectSimpleAP.this.mWifiManager.isWifiEnabled()) {
+                        } else if (!ActivityConnectSimpleAP.mWifiManager.isWifiEnabled()) {
                             ActivityConnectSimpleAP.this.startActivityForResult(new Intent(ActivityConnectSimpleAP.this, ActivityControlWiFi.class), 1);
                             return;
                         } else {
@@ -142,10 +142,10 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        this.mModelDialog = (DialogProgressWiFiDirectViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressWiFiDirectViewModel.class);
-        this.mModelDialog.getDialogJob().observe(this, new Observer<Deque<String[]>>() {
+        mModelDialog = (DialogProgressWiFiDirectViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressWiFiDirectViewModel.class);
+        mModelDialog.getDialogJob().observe(this, new Observer<Deque<String[]>>() {
             public void onChanged(@Nullable Deque<String[]> deque) {
-                String[] checkQueue = ActivityConnectSimpleAP.this.mModelDialog.checkQueue();
+                String[] checkQueue = ActivityConnectSimpleAP.mModelDialog.checkQueue();
                 if (checkQueue != null) {
                     String str = checkQueue[0];
                     String str2 = checkQueue[1];
@@ -158,7 +158,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
                 }
             }
         });
-        this.mModelDialog.doShow(IDD_WIFI_WAITING);
+        mModelDialog.doShow(IDD_WIFI_WAITING);
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
             this.targetSsid = extras.getString(ActivityConnectBase.APNAME);
@@ -170,7 +170,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
             this.timeout = extras.getInt(ActivityConnectBase.TIMEOUT, 30);
         }
         EPLog.m88i(TAG, "Starting connect :" + this.targetSsid + " timeout = " + this.timeout);
-        this.mHandler.sendEmptyMessage(11);
+        mHandler.sendEmptyMessage(11);
     }
 
     protected void onActivityResult(int i, int i2, Intent intent) {
@@ -197,7 +197,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
             setResult(0);
             setLastDetailResult(1);
             finish();
-        } else if (!this.searchWiFiDirectPrinter.start(1, this.mHandler, 0, this.timeout)) {
+        } else if (!this.searchWiFiDirectPrinter.start(1, mHandler, 0, this.timeout)) {
             onError();
         } else {
             this.status = ActivityConnectBase.Status.WIFI_SCANNING;
@@ -208,7 +208,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         if (this.targetSsid.equals(WiFiUtils.getInstance(this).getCurSSID())) {
             EPLog.m86d(TAG, "Already Connected!!");
             this.status = ActivityConnectBase.Status.WIFI_CONNECTING;
-            this.mHandler.sendEmptyMessage(10);
+            mHandler.sendEmptyMessage(10);
             return;
         }
         if (WifiP2pUtils.getInstance(this).isConnectedWiFiP2P()) {
@@ -217,7 +217,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         if (this.createSimpleAP) {
             this.connectingNetworkId = WiFiUtils.getInstance(this).createSimpleAP(this.targetSsid, this.targetPass);
             if (this.connectingNetworkId == -1) {
-                this.mModelDialog.doShow(IDD_WIFI_PROFILE_FAILED);
+                mModelDialog.doShow(IDD_WIFI_PROFILE_FAILED);
                 return;
             }
             this.status = ActivityConnectBase.Status.WIFI_CONNECTING;
@@ -427,7 +427,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
             this.connectingNetworkId = -1;
             WiFiUtils.getInstance(this).reConnectNetwork();
             if (this.showErrorDlg) {
-                this.mModelDialog.doShow(IDD_WIFI_ERROR);
+                mModelDialog.doShow(IDD_WIFI_ERROR);
                 return;
             }
         }
@@ -440,7 +440,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
     private void closeWaitingDialog() {
         EPLog.m86d(TAG, "Called closeWaitingDialog()");
         try {
-            this.mModelDialog.doDismiss(IDD_WIFI_WAITING);
+            mModelDialog.doDismiss(IDD_WIFI_WAITING);
         } catch (IllegalArgumentException unused) {
             EPLog.m86d(TAG, "IDD_WIFI_WATING already closed");
         }
@@ -646,7 +646,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
                 EPLog.m86d(ActivityConnectSimpleAP.TAG, "Network State Changed:" + networkInfo.toString());
                 if (networkInfo.isConnected() && ActivityConnectSimpleAP.this.targetSsid.equals(WiFiUtils.getInstance(ActivityConnectSimpleAP.this).getCurSSID())) {
                     EPLog.m88i(ActivityConnectSimpleAP.TAG, "Wi-Fi connected.");
-                    ActivityConnectSimpleAP.this.mHandler.sendEmptyMessageDelayed(10, 1000);
+                    ActivityConnectSimpleAP.mHandler.sendEmptyMessageDelayed(10, 1000);
                 }
             } else if (action.equals("android.net.wifi.supplicant.STATE_CHANGE")) {
                 SupplicantState supplicantState = (SupplicantState) intent.getParcelableExtra("newState");

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

@@ -32,7 +32,7 @@ public class ActivityControlWiFi extends Activity {
     protected void onCreate(Bundle bundle) {
         EPLog.m86d(TAG, "onCreate()");
         super.onCreate(bundle);
-        this.mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
+        mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
         requestWindowFeature(1);
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
@@ -44,7 +44,7 @@ public class ActivityControlWiFi extends Activity {
         }
         if (this.showWifiSettings) {
             WiFiUtils.showOsWifiSettings(this, 0);
-        } else if (!this.mWifiManager.isWifiEnabled()) {
+        } else if (!mWifiManager.isWifiEnabled()) {
             showDialog(0);
         } else {
             EPLog.m86d(TAG, "Already WiFi Enabled");
@@ -67,11 +67,11 @@ public class ActivityControlWiFi extends Activity {
         EPLog.m86d(TAG, "onActivityResult()");
         super.onActivityResult(i, i2, intent);
         if (i == 0) {
-            switch (this.mWifiManager.getWifiState()) {
+            switch (mWifiManager.getWifiState()) {
                 case 2:
                 case 3:
                     registerReciever();
-                    this.mWifiManager.startScan();
+                    mWifiManager.startScan();
                     return;
                 default:
                     onCancel();
@@ -95,7 +95,7 @@ public class ActivityControlWiFi extends Activity {
         return i != 0 ? super.onCreateDialog(i) : new AlertDialog.Builder(this).setPositiveButton(getString(17039370), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 ActivityControlWiFi.this.registerReciever();
-                boolean wifiEnabled = ActivityControlWiFi.this.mWifiManager.setWifiEnabled(true);
+                boolean wifiEnabled = ActivityControlWiFi.mWifiManager.setWifiEnabled(true);
                 EPLog.m86d(ActivityControlWiFi.TAG, "setWifiEnabled return " + wifiEnabled);
                 if (!wifiEnabled) {
                     WiFiUtils.showOsWifiSettings(ActivityControlWiFi.this, 0);
@@ -141,7 +141,7 @@ public class ActivityControlWiFi extends Activity {
             } else if (action.equals("android.net.wifi.STATE_CHANGE")) {
                 NetworkInfo networkInfo = (NetworkInfo) intent.getParcelableExtra("networkInfo");
                 EPLog.m86d(ActivityControlWiFi.TAG, "Network State Changed:" + networkInfo.toString());
-                if (ActivityControlWiFi.this.mWifiManager.isWifiEnabled()) {
+                if (ActivityControlWiFi.mWifiManager.isWifiEnabled()) {
                     switch (C10903.$SwitchMap$android$net$NetworkInfo$State[networkInfo.getState().ordinal()]) {
                         case 1:
                             ActivityControlWiFi.this.scannigObserver.interrunpt();

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

@@ -86,9 +86,9 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
                     }).setCancelable(false).create().show();
                     return;
                 }
-                this.mHandler.sendEmptyMessage(1);
+                mHandler.sendEmptyMessage(1);
             } else if (Build.VERSION.SDK_INT > 28) {
-                this.mHandler.sendEmptyMessage(1);
+                mHandler.sendEmptyMessage(1);
             } else {
                 onSuccess();
             }
@@ -142,7 +142,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
                     i2++;
                 } else {
                     EPLog.m86d(TAG, "PERMISSION_GRANTED " + this.requestPermission);
-                    this.mHandler.sendEmptyMessage(1);
+                    mHandler.sendEmptyMessage(1);
                     return;
                 }
             }
@@ -159,7 +159,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
         private final WeakReference<ActivityRequestLocationPermission> mActivity;
 
         innerHandler(ActivityRequestLocationPermission activityRequestLocationPermission) {
-            this.mActivity = new WeakReference<>(activityRequestLocationPermission);
+            mActivity = new WeakReference<>(activityRequestLocationPermission);
         }
 
         /* JADX WARNING: Code restructure failed: missing block: B:2:0x0009, code lost:
@@ -275,7 +275,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
                 }
             case 2:
                 if (i2 == -1) {
-                    this.mHandler.sendEmptyMessage(1);
+                    mHandler.sendEmptyMessage(1);
                     return;
                 } else if (!isNeedChangeLocationSettings(this)) {
                     onSuccess();
@@ -286,7 +286,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
                 }
             case 3:
                 if (hasLocationPermission(this)) {
-                    this.mHandler.sendEmptyMessage(1);
+                    mHandler.sendEmptyMessage(1);
                     return;
                 } else {
                     onError();

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

@@ -51,7 +51,7 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
                     }
                     return;
                 case 2:
-                    ActivityWiFiDirectManual.this.mModelDialog.doDismiss(ActivityWiFiDirectManual.IDD_WIFI_WAITING);
+                    ActivityWiFiDirectManual.mModelDialog.doDismiss(ActivityWiFiDirectManual.IDD_WIFI_WAITING);
                     ActivityWiFiDirectManual activityWiFiDirectManual = ActivityWiFiDirectManual.this;
                     Toast.makeText(activityWiFiDirectManual, activityWiFiDirectManual.getString(R.string.str_error_connecting_printer_short), 1).show();
                     return;
@@ -69,13 +69,13 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        this.mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
-        this.mModelDialog.getDialogJob().observe(this, new Observer() {
+        mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
+        mModelDialog.getDialogJob().observe(this, new Observer() {
             public final void onChanged(Object obj) {
                 ActivityWiFiDirectManual.lambda$onCreate$0(ActivityWiFiDirectManual.this, (Deque) obj);
             }
         });
-        this.mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
+        mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.wifidirect_manual, (ViewGroup) null);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(true, true);
@@ -88,8 +88,8 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
                 ActivityWiFiDirectManual.this.startActivityForResult(intent, 0);
             }
         });
-        this.mNoLcdGuidanceWebView = (WebView) findViewById(R.id.guidance_webview);
-        this.mWithLcdGuidanceView = (ViewGroup) findViewById(R.id.guidance_with_lcd);
+        mNoLcdGuidanceWebView = (WebView) findViewById(R.id.guidance_webview);
+        mWithLcdGuidanceView = (ViewGroup) findViewById(R.id.guidance_with_lcd);
         updateGuidance(getNoLcdValueFromIntent(getIntent()));
         if (!ActivityRequestLocationPermission.canAccessWiFiInfo(this, 1)) {
             ActivityRequestLocationPermission.requestLocationPermissionForce(this, 1);
@@ -112,17 +112,17 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
 
     private void updateGuidance(boolean z) {
         if (z) {
-            this.mWithLcdGuidanceView.setVisibility(8);
-            this.mNoLcdGuidanceWebView.setVisibility(0);
+            mWithLcdGuidanceView.setVisibility(8);
+            mNoLcdGuidanceWebView.setVisibility(0);
             String string = getString(R.string.path_wifidirect_guide_panelless);
             if (string == null) {
                 finish();
             } else {
-                this.mNoLcdGuidanceWebView.loadUrl(string);
+                mNoLcdGuidanceWebView.loadUrl(string);
             }
         } else {
-            this.mNoLcdGuidanceWebView.setVisibility(8);
-            this.mWithLcdGuidanceView.setVisibility(0);
+            mNoLcdGuidanceWebView.setVisibility(8);
+            mWithLcdGuidanceView.setVisibility(0);
         }
     }
 
@@ -137,8 +137,8 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
             case 0:
                 if (WiFiDirectManager.isSimpleAP(this)) {
                     ManageDefaultNetwork.getInstance(this).setDefaultNetworkSimpleAp();
-                    this.mModelDialog.doShow(IDD_WIFI_WAITING);
-                    this.taskFindPrinter = new FindPrinterTask(this.mHandler, 30, 1, 2);
+                    mModelDialog.doShow(IDD_WIFI_WAITING);
+                    this.taskFindPrinter = new FindPrinterTask(mHandler, 30, 1, 2);
                     this.taskFindPrinter.execute(new Void[0]);
                     return;
                 }

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

@@ -65,7 +65,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        this.mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
+        mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
         this.wiFiUtils = WiFiUtils.getInstance(this);
         if (engineId == null) {
             engineId = getEngineId();
@@ -84,7 +84,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
                 ActivityiPrintConnect.this.onFinishPressed();
             }
         });
-        this.mEscprLib.epsWrapperGetSetupConnectStrings(this.settingsTempAp);
+        mEscprLib.epsWrapperGetSetupConnectStrings(this.settingsTempAp);
     }
 
     public void onFinishPressed() {
@@ -262,7 +262,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
 
             protected Boolean doInBackground(Void... voidArr) {
                 ActivityiPrintConnect.this.wiFiUtils.pingWiFiDirectPrinter();
-                ActivityiPrintConnect.this.mEscprLib.epsWrapperInitDriver(192);
+                ActivityiPrintConnect.mEscprLib.epsWrapperInitDriver(192);
                 boolean z = false;
                 int i = -1;
                 int i2 = 0;
@@ -270,7 +270,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
                 while (i2 < 5) {
                     try {
                         if (!isCancelled()) {
-                            i3 = ActivityiPrintConnect.this.mEscprLib.epsWrapperGetConnectStrings(ActivityiPrintConnect.engineId, ActivityiPrintConnect.this.settingsRealAp);
+                            i3 = ActivityiPrintConnect.mEscprLib.epsWrapperGetConnectStrings(ActivityiPrintConnect.engineId, ActivityiPrintConnect.this.settingsRealAp);
                             if (!isCancelled()) {
                                 if (i3 == 0) {
                                     break;
@@ -290,10 +290,10 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
                 }
                 if (i3 == 0) {
                     EPLog.m86d(ActivityiPrintConnect.TAG, "epsWrapperGetConnectStrings ssid = " + ActivityiPrintConnect.this.settingsRealAp.ssid + " printerId = " + ActivityiPrintConnect.this.settingsRealAp.printerId);
-                    ActivityiPrintConnect.this.mEscprLib.epsWrapperStartWifiDirect(ActivityiPrintConnect.this.settingsRealAp.printerIp.toCharArray());
+                    ActivityiPrintConnect.mEscprLib.epsWrapperStartWifiDirect(ActivityiPrintConnect.this.settingsRealAp.printerIp.toCharArray());
                     synchronized (ActivityiPrintConnect.this.waitRealAp) {
                         ActivityiPrintConnect.this.registBroadcastReciever();
-                        ActivityiPrintConnect.this.mWifiManager.startScan();
+                        ActivityiPrintConnect.mWifiManager.startScan();
                         long currentTimeMillis = System.currentTimeMillis();
                         ActivityiPrintConnect.this.waitRealAp.wait(120000);
                         if (System.currentTimeMillis() - currentTimeMillis >= 120000) {
@@ -309,7 +309,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
                 ActivityiPrintConnect.this.wiFiUtils.removeSimpleAP(ActivityiPrintConnect.this.wiFiUtils.getNetworkId(ActivityiPrintConnect.this.settingsTempAp.ssid));
                 i = i3;
                 ActivityiPrintConnect.this.unRegistBroadcastReciever();
-                ActivityiPrintConnect.this.mEscprLib.epsWrapperReleaseDriver();
+                ActivityiPrintConnect.mEscprLib.epsWrapperReleaseDriver();
                 if (i == 0) {
                     z = true;
                 }
@@ -351,7 +351,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         for (int i = 0; i < 4; i++) {
             byteArrayOutputStream.write(random.nextInt());
         }
-        String macAddress = this.mWifiManager.getConnectionInfo().getMacAddress();
+        String macAddress = mWifiManager.getConnectionInfo().getMacAddress();
         if (macAddress != null) {
             EPLog.m86d(TAG, "getEngineId macAdress = " + macAddress);
             String[] split = macAddress.split(":", 6);
@@ -369,7 +369,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     private void onScanResultAvailable() {
         List<ScanResult> arrayList = new ArrayList<>();
         try {
-            arrayList = this.mWifiManager.getScanResults();
+            arrayList = mWifiManager.getScanResults();
         } catch (SecurityException e) {
             e.printStackTrace();
         }
@@ -384,7 +384,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
                 }
             }
         }
-        new WiFiScanner().startScan(this.mWifiManager);
+        new WiFiScanner().startScan(mWifiManager);
     }
 
     class NetworkStateChangeReciever extends BroadcastReceiver {

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