Browse Source

批量替换

liuyuqi-dellpc 3 years ago
parent
commit
e091ca178b
100 changed files with 928 additions and 1285 deletions
  1. 2 4
      app/src/main/java/com/epson/cameracopy/alt/BmpFileInfo.java
  2. 7 14
      app/src/main/java/com/epson/cameracopy/device/PortraitCameraView.java
  3. 8 11
      app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewActivity.java
  4. 15 18
      app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewFragment.java
  5. 15 16
      app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewOptionActivity.java
  6. 27 34
      app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintProgress.java
  7. 135 150
      app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintSettingActivity.java
  8. 92 98
      app/src/main/java/com/epson/cameracopy/p006ui/CropImageActivity.java
  9. 26 29
      app/src/main/java/com/epson/cameracopy/p006ui/DocumentSizeEditActivity.java
  10. 29 31
      app/src/main/java/com/epson/cameracopy/p006ui/DocumentSizeSettingActivity.java
  11. 10 13
      app/src/main/java/com/epson/cameracopy/p006ui/FolderSelectActivity.java
  12. 1 2
      app/src/main/java/com/epson/cameracopy/p006ui/ImageCollectView.java
  13. 1 2
      app/src/main/java/com/epson/cameracopy/p006ui/ImageFolderFile.java
  14. 2 4
      app/src/main/java/com/epson/cameracopy/p006ui/ImageFolderFileViewModel.java
  15. 18 22
      app/src/main/java/com/epson/cameracopy/p006ui/ImagePreviewActivity.java
  16. 4 4
      app/src/main/java/com/epson/cameracopy/p006ui/ItemData.java
  17. 1 1
      app/src/main/java/com/epson/cameracopy/p006ui/ItemDataAdapter.java
  18. 1 1
      app/src/main/java/com/epson/cameracopy/p006ui/MenuControl.java
  19. 4 4
      app/src/main/java/com/epson/cameracopy/p006ui/PictureResolutionDialogFragment.java
  20. 51 66
      app/src/main/java/com/epson/cameracopy/p006ui/PrintPreviewActivity.java
  21. 1 1
      app/src/main/java/com/epson/cameracopy/p006ui/SimpleMessageDialogFragment.java
  22. 1 1
      app/src/main/java/com/epson/cameracopy/printlayout/AutoManuscriptSize.java
  23. 1 2
      app/src/main/java/com/epson/cameracopy/printlayout/CustomManuscriptSize.java
  24. 1 1
      app/src/main/java/com/epson/cameracopy/printlayout/DocumentSizeInfo.java
  25. 1 1
      app/src/main/java/com/epson/cameracopy/printlayout/IdManuscriptSize.java
  26. 5 10
      app/src/main/java/com/epson/cameracopy/printlayout/ImageAndLayout.java
  27. 2 2
      app/src/main/java/com/epson/cameracopy/printlayout/ManuscriptSize.java
  28. 3 5
      app/src/main/java/com/epson/cameracopy/printlayout/PreviewView.java
  29. 1 1
      app/src/main/java/com/epson/cameracopy/printlayout/RegistedDocumentSizeList.java
  30. 2 4
      app/src/main/java/com/epson/lib/escani2/EscanI2Lib.java
  31. 4 8
      app/src/main/java/com/epson/lib/escani2/ScanSize.java
  32. 1 1
      app/src/main/java/com/epson/memcardacc/AltAlertDialogFragment.java
  33. 1 1
      app/src/main/java/com/epson/memcardacc/AltViewImageAdapter.java
  34. 1 2
      app/src/main/java/com/epson/memcardacc/CacheHashMap.java
  35. 4 8
      app/src/main/java/com/epson/memcardacc/CifsAccess.java
  36. 21 34
      app/src/main/java/com/epson/memcardacc/ConfirmReadMemcard.java
  37. 27 44
      app/src/main/java/com/epson/memcardacc/ConfirmWriteMemcard.java
  38. 7 14
      app/src/main/java/com/epson/memcardacc/CopyTask.java
  39. 10 14
      app/src/main/java/com/epson/memcardacc/DirectorySelecterActivity.java
  40. 2 4
      app/src/main/java/com/epson/memcardacc/EscprLibPrinter.java
  41. 2 4
      app/src/main/java/com/epson/memcardacc/FileConvertTask.java
  42. 7 7
      app/src/main/java/com/epson/memcardacc/ImageFileListAdapter.java
  43. 1 2
      app/src/main/java/com/epson/memcardacc/LimitedHashMap.java
  44. 1 1
      app/src/main/java/com/epson/memcardacc/LocalAlertDialogFragment.java
  45. 2 4
      app/src/main/java/com/epson/memcardacc/LocalImageSelectActivity.java
  46. 2 2
      app/src/main/java/com/epson/memcardacc/LocalProgressDialogFragment.java
  47. 2 4
      app/src/main/java/com/epson/memcardacc/MemCardWriteConvertViewModel.java
  48. 6 12
      app/src/main/java/com/epson/memcardacc/MemcardCheckTask.java
  49. 1 1
      app/src/main/java/com/epson/memcardacc/MemcardDialog.java
  50. 27 43
      app/src/main/java/com/epson/memcardacc/MemcardImageGrid.java
  51. 7 10
      app/src/main/java/com/epson/memcardacc/MemcardPhotocopyTop.java
  52. 13 20
      app/src/main/java/com/epson/memcardacc/MemcardReadProgress.java
  53. 1 1
      app/src/main/java/com/epson/memcardacc/MemcardTempAlertDialog.java
  54. 1 1
      app/src/main/java/com/epson/memcardacc/MemcardTempAlertDialogFragment.java
  55. 7 11
      app/src/main/java/com/epson/memcardacc/MemcardTop.java
  56. 16 28
      app/src/main/java/com/epson/memcardacc/MemcardTopSuper.java
  57. 13 21
      app/src/main/java/com/epson/memcardacc/MemcardWriteProgress.java
  58. 10 10
      app/src/main/java/com/epson/memcardacc/PasswordDialogFragment.java
  59. 21 29
      app/src/main/java/com/epson/memcardacc/PhotoCopyImageSelectActivity.java
  60. 3 6
      app/src/main/java/com/epson/memcardacc/PhotoCopyWriteProgress.java
  61. 2 2
      app/src/main/java/com/epson/mobilephone/common/ReviewInvitationDialog.java
  62. 6 10
      app/src/main/java/com/epson/mobilephone/common/ble/BleAsyncTask.java
  63. 2 4
      app/src/main/java/com/epson/mobilephone/common/ble/BleScanWork.java
  64. 5 10
      app/src/main/java/com/epson/mobilephone/common/ble/BleWork.java
  65. 42 49
      app/src/main/java/com/epson/mobilephone/common/ble/BleWorkActivity.java
  66. 10 11
      app/src/main/java/com/epson/mobilephone/common/ble/DeviceAdapter.java
  67. 7 14
      app/src/main/java/com/epson/mobilephone/common/ble/ProbePrinter.java
  68. 1 2
      app/src/main/java/com/epson/mobilephone/common/guide/MyViewPager.java
  69. 2 4
      app/src/main/java/com/epson/mobilephone/common/guide/NoticeGuideActivity.java
  70. 5 10
      app/src/main/java/com/epson/mobilephone/common/keyenc/SecureKeyFactory.java
  71. 2 4
      app/src/main/java/com/epson/mobilephone/common/license/InfoDisplayActivity.java
  72. 2 4
      app/src/main/java/com/epson/mobilephone/common/license/LicenseTopActivity.java
  73. 1 2
      app/src/main/java/com/epson/mobilephone/common/license/RestoreScrollView.java
  74. 1 2
      app/src/main/java/com/epson/mobilephone/common/license/UserSurveyInvitationActivity.java
  75. 1 2
      app/src/main/java/com/epson/mobilephone/common/maintain2/MaintainPrinter2.java
  76. 1 2
      app/src/main/java/com/epson/mobilephone/common/usb/UsbReciever.java
  77. 18 36
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectBase.java
  78. 8 16
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectP2P.java
  79. 10 20
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectSimpleAP.java
  80. 13 26
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityControlWiFi.java
  81. 2 4
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityRequestLocationPermission.java
  82. 7 11
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectBase.java
  83. 3 4
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectError.java
  84. 11 15
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectManual.java
  85. 7 10
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectStart.java
  86. 34 52
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityiPrintConnect.java
  87. 8 14
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityiPrintConnectStart.java
  88. 3 6
      app/src/main/java/com/epson/mobilephone/common/wifidirect/FindPrinterTask.java
  89. 1 2
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ManageDefaultNetwork.java
  90. 2 4
      app/src/main/java/com/epson/mobilephone/common/wifidirect/NfcTagParser.java
  91. 6 12
      app/src/main/java/com/epson/mobilephone/common/wifidirect/SearchWiFiDirectPrinterTask.java
  92. 1 2
      app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiNetworkManager.java
  93. 1 2
      app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiScanner.java
  94. 1 2
      app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiUtils.java
  95. 1 2
      app/src/main/java/com/epson/mobilephone/common/wifidirect/WifiP2pUtils.java
  96. 4 5
      app/src/main/java/epson/common/CustomListRowAdapter.java
  97. 5 5
      app/src/main/java/epson/common/DialogProgress.java
  98. 1 1
      app/src/main/java/epson/common/InformationGuide.java
  99. 1 1
      app/src/main/java/epson/common/IprintLicenseInfo.java
  100. 2 2
      app/src/main/java/epson/common/ReviewInvitationDialog.java

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

@@ -487,8 +487,7 @@ class BmpFileInfo {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public WritableByteChannel getWritableChannelChannel() {
+    protected WritableByteChannel getWritableChannelChannel() {
         return this.mWriteChannel;
     }
 
@@ -584,8 +583,7 @@ class BmpFileInfo {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void addSize(int i, int i2) {
+    protected void addSize(int i, int i2) {
         this.mFileSize += i;
         this.mImageDataBytes += i;
         this.mHeight += i2;

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

@@ -159,8 +159,7 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
         throw new UnsupportedOperationException("Method not decompiled: com.epson.cameracopy.device.PortraitCameraView.calculateCameraFrameSize(java.util.List, org.opencv.android.CameraBridgeViewBase$ListItemAccessor, int, int):org.opencv.core.Size");
     }
 
-    /* access modifiers changed from: package-private */
-    public Camera.Size selectPreviewSize(List<Camera.Size> list, double d) {
+    private Camera.Size selectPreviewSize(List<Camera.Size> list, double d) {
         Camera.Size size = null;
         double d2 = 0.0d;
         for (Camera.Size next : list) {
@@ -178,8 +177,7 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
         return size;
     }
 
-    /* access modifiers changed from: protected */
-    public boolean setPreviewSize(List<Camera.Size> list, Camera.Parameters parameters) {
+    protected boolean setPreviewSize(List<Camera.Size> list, Camera.Parameters parameters) {
         Point screenSize = getScreenSize();
         Camera.Size selectPreviewSize = selectPreviewSize(list, ((double) screenSize.y) / ((double) screenSize.x));
         if (selectPreviewSize == null) {
@@ -189,8 +187,7 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
         return true;
     }
 
-    /* access modifiers changed from: package-private */
-    public Point getScreenSize() {
+    private Point getScreenSize() {
         return ImageUtil.getDisplaySize(((Activity) getContext()).getWindowManager().getDefaultDisplay());
     }
 
@@ -292,8 +289,7 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
         return true;
     }
 
-    /* access modifiers changed from: package-private */
-    public void setForcusMode(Camera.Parameters parameters) {
+    private void setForcusMode(Camera.Parameters parameters) {
         boolean autoPictureMode = CameraPreviewControl.getInstance(getContext()).getAutoPictureMode();
         List<String> supportedFocusModes = parameters.getSupportedFocusModes();
         if (supportedFocusModes != null) {
@@ -489,8 +485,7 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void releaseCamera() {
+    protected void releaseCamera() {
         synchronized (this) {
             if (this.mCamera != null) {
                 this.mCamera.stopPreview();
@@ -509,8 +504,7 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
         }
     }
 
-    /* access modifiers changed from: protected */
-    public boolean connectCamera(int i, int i2) {
+    protected boolean connectCamera(int i, int i2) {
         Log.m52d(TAG, "Connecting to camera");
         if (!initializeCamera(i, i2)) {
             return false;
@@ -523,8 +517,7 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
         return true;
     }
 
-    /* access modifiers changed from: protected */
-    public void disconnectCamera() {
+    protected void disconnectCamera() {
         Log.m52d(TAG, "Disconnecting from camera");
         try {
             this.mStopThread = true;

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

@@ -20,15 +20,14 @@ public class CameraPreviewActivity extends ActivityIACommon {
         return true;
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        setContentView((int) C2135R.layout.activity_camera_preview);
-        setActionBar((int) C2135R.string.capture_title, true);
+        setContentView((int) R.layout.activity_camera_preview);
+        setActionBar((int) R.string.capture_title, true);
         if (bundle == null) {
             if (ActivityRequestPermissions.isRuntimePermissionSupported()) {
                 String[] strArr = {"android.permission.CAMERA"};
-                ActivityRequestPermissions.Permission permission = new ActivityRequestPermissions.Permission(strArr[0], new String[]{getString(C2135R.string.permission_dialog_title), getString(C2135R.string.permission_dialog_title)}, new String[]{ActivityRequestPermissions.DialogParameter.setMessage2((Context) this, getString(C2135R.string.permission_dialog_message_camera)), ActivityRequestPermissions.DialogParameter.setMessage3A((Context) this, getString(C2135R.string.permission_dialog_message_camera), getString(C2135R.string.permission_function_camera))});
+                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_camera)), ActivityRequestPermissions.DialogParameter.setMessage3A((Context) this, getString(R.string.permission_dialog_message_camera), getString(R.string.permission_function_camera))});
                 if (!ActivityRequestPermissions.checkPermission(this, strArr)) {
                     ActivityRequestPermissions.requestPermission((Activity) this, permission, 1);
                     return;
@@ -38,16 +37,14 @@ public class CameraPreviewActivity extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void prepareCameraPreviewFragment() {
+    private void prepareCameraPreviewFragment() {
         boolean booleanExtra = getIntent().getBooleanExtra(PARAM_APP_INIT, true);
         CameraPreviewFragment cameraPreviewFragment = new CameraPreviewFragment();
         cameraPreviewFragment.setAppInitFlag(booleanExtra);
-        getSupportFragmentManager().beginTransaction().add((int) C2135R.C2137id.container, (Fragment) cameraPreviewFragment).commit();
+        getSupportFragmentManager().beginTransaction().add((int) R.C2137id.container, (Fragment) cameraPreviewFragment).commit();
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         if (i == 1) {
             prepareCameraPreviewFragment();
@@ -60,7 +57,7 @@ public class CameraPreviewActivity extends ActivityIACommon {
     }
 
     public void onBackPressed() {
-        if (((CameraPreviewFragment) getSupportFragmentManager().findFragmentById(C2135R.C2137id.container)).onBackPressed()) {
+        if (((CameraPreviewFragment) getSupportFragmentManager().findFragmentById(R.C2137id.container)).onBackPressed()) {
             super.onBackPressed();
         }
     }

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

@@ -93,10 +93,10 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
     }
 
     public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
-        View inflate = layoutInflater.inflate(C2135R.layout.fragment_camera_preview, viewGroup, false);
+        View inflate = layoutInflater.inflate(R.layout.fragment_camera_preview, viewGroup, false);
         setHasOptionsMenu(true);
         setButtonListener(inflate);
-        this.mOpenCvCameraView = (OpenCvCameraView) inflate.findViewById(C2135R.C2137id.view1);
+        this.mOpenCvCameraView = (OpenCvCameraView) inflate.findViewById(R.C2137id.view1);
         if (CameraPreviewControl.hasBackCamera()) {
             this.mHasCamera = true;
             this.mOpenCvCameraView.setCvCameraViewListener((CameraBridgeViewBase.CvCameraViewListener2) this);
@@ -105,7 +105,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
             UiCommon.setButtonEnabled(this.mPhtographButton, false);
             if (bundle == null && this.noCameraDialog) {
                 this.noCameraDialog = false;
-                SimpleMessageDialogFragment.newInstance(C2135R.string.back_camera_not_exists_message).show(getFragmentManager(), "error-dialog");
+                SimpleMessageDialogFragment.newInstance(R.string.back_camera_not_exists_message).show(getFragmentManager(), "error-dialog");
             }
         }
         this.mOpenCvCameraView.setVisibility(0);
@@ -113,13 +113,13 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         this.mSensorEventListener.setDisplayRotation(this.mDisplayRotation);
         this.mSensorEventListener.setSensorManager((SensorManager) getActivity().getSystemService("sensor"));
         this.mSensorEventListener.setReferenceAccelaration(REFERENCE_ACCELARATION);
-        this.mFunctionBarView = inflate.findViewById(C2135R.C2137id.function_bar);
+        this.mFunctionBarView = inflate.findViewById(R.C2137id.function_bar);
         this.mDisplayDensity = getActivity().getResources().getDisplayMetrics().density;
         return inflate;
     }
 
     private void setButtonListener(View view) {
-        this.mPhotoSelectButton = (Button) view.findViewById(C2135R.C2137id.photo_select_button);
+        this.mPhotoSelectButton = (Button) view.findViewById(R.C2137id.photo_select_button);
         this.mPhotoSelectButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 if (!CameraPreviewFragment.this.mPictureTaking) {
@@ -127,7 +127,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
                 }
             }
         });
-        this.mPhtographButton = (Button) view.findViewById(C2135R.C2137id.photograph_button);
+        this.mPhtographButton = (Button) view.findViewById(R.C2137id.photograph_button);
         this.mPhtographButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 if (!CameraPreviewFragment.this.mPictureTaking) {
@@ -172,10 +172,10 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         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) {
-            int i = C2135R.string.camera_picture_low_message;
+            int i = R.string.camera_picture_low_message;
             List<android.graphics.Point> cameraPictureSizes = instance.getCameraPictureSizes();
             if (cameraPictureSizes == null || cameraPictureSizes.size() <= 0) {
-                i = C2135R.string.has_no_hireso_picture_message;
+                i = R.string.has_no_hireso_picture_message;
             }
             this.mCameraPictureLowResolutionDialog = SimpleMessageDialogFragment.newInstance(i);
             this.mCameraPictureLowResolutionDialog.show(getFragmentManager(), "camera-resolution-warning-dialog");
@@ -392,7 +392,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
             } else {
                 UiCommon.setButtonEnabled(this.mPhtographButton, false);
                 disableSettingButton(true);
-                SimpleMessageDialogFragment.newInstance(C2135R.string.back_camera_not_exists_message).show(getFragmentManager(), "error-dialog");
+                SimpleMessageDialogFragment.newInstance(R.string.back_camera_not_exists_message).show(getFragmentManager(), "error-dialog");
             }
             this.mPictureTaking = false;
         }
@@ -436,7 +436,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
 
     /* access modifiers changed from: private */
     public void showErrorDialog() {
-        SimpleMessageDialogFragment.newInstance(C2135R.string.file_save_error_message).show(getFragmentManager(), "error-dialog");
+        SimpleMessageDialogFragment.newInstance(R.string.file_save_error_message).show(getFragmentManager(), "error-dialog");
     }
 
     public void takePicture() {
@@ -497,21 +497,20 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         this.mPAfTime = System.currentTimeMillis();
     }
 
-    /* access modifiers changed from: package-private */
-    public void disableSettingButton(boolean z) {
+    private void disableSettingButton(boolean z) {
         this.mDisableSettingsButton = z;
         getActivity().invalidateOptionsMenu();
     }
 
     public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
         if (!this.mDisableSettingsButton) {
-            menuInflater.inflate(C2135R.C2138menu.camera_menu, menu);
+            menuInflater.inflate(R.C2138menu.camera_menu, menu);
         }
         super.onCreateOptionsMenu(menu, menuInflater);
     }
 
     public boolean onOptionsItemSelected(MenuItem menuItem) {
-        if (menuItem.getItemId() != C2135R.C2137id.camera_setting) {
+        if (menuItem.getItemId() != R.C2137id.camera_setting) {
             return super.onOptionsItemSelected(menuItem);
         }
         if (this.mPictureTaking) {
@@ -533,8 +532,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
             this.mMyOpenCvCameraView = openCvCameraView;
         }
 
-        /* access modifiers changed from: protected */
-        public Void doInBackground(Void... voidArr) {
+        protected Void doInBackground(Void... voidArr) {
             System.currentTimeMillis();
             while (!isCancelled() && this.mMyOpenCvCameraView.isInAutofocus()) {
                 try {
@@ -546,8 +544,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
             return null;
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(Void voidR) {
+        protected void onPostExecute(Void voidR) {
             CameraPreviewFragment.this.takePictureStep2();
         }
     }

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

@@ -25,14 +25,13 @@ public class CameraPreviewOptionActivity extends ActivityIACommon implements Pic
     private static final int CODE_DIRECTORY_SELECT = 1;
     PlaceholderFragment mFragment;
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        setContentView((int) C2135R.layout.activity_camera_preview_option);
-        setActionBar((int) C2135R.string.camera_option_title, true);
+        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) C2135R.C2137id.container, (Fragment) this.mFragment).commit();
+            getSupportFragmentManager().beginTransaction().add((int) R.C2137id.container, (Fragment) this.mFragment).commit();
         }
     }
 
@@ -55,32 +54,32 @@ public class CameraPreviewOptionActivity extends ActivityIACommon implements Pic
         private TextView mSaveDirectoryText;
 
         public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
-            View inflate = layoutInflater.inflate(C2135R.layout.fragment_camera_preview_option, viewGroup, false);
+            View inflate = layoutInflater.inflate(R.layout.fragment_camera_preview_option, viewGroup, false);
             this.mCameraPreviewControl = CameraPreviewControl.getInstance(getActivity());
             setHasOptionsMenu(true);
-            this.mGuideToggleButton = (Switch) inflate.findViewById(C2135R.C2137id.guideToggleButton);
+            this.mGuideToggleButton = (Switch) inflate.findViewById(R.C2137id.guideToggleButton);
             this.mGuideToggleButton.setChecked(this.mCameraPreviewControl.getGuideMode());
             this.mGuideToggleButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
                 public void onCheckedChanged(CompoundButton compoundButton, boolean z) {
                     PlaceholderFragment.this.changeAutoPhotoToggleButtonStatus(z);
                 }
             });
-            this.mAutoPhotoToggleButton = (Switch) inflate.findViewById(C2135R.C2137id.autoPictureToggleButton);
+            this.mAutoPhotoToggleButton = (Switch) inflate.findViewById(R.C2137id.autoPictureToggleButton);
             this.mAutoPhotoToggleButton.setChecked(this.mCameraPreviewControl.getAutoPictureMode());
             changeAutoPhotoToggleButtonStatus(this.mGuideToggleButton.isChecked());
-            ((LinearLayout) inflate.findViewById(C2135R.C2137id.save_directory_layout)).setOnClickListener(new View.OnClickListener() {
+            ((LinearLayout) inflate.findViewById(R.C2137id.save_directory_layout)).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     PlaceholderFragment.this.startSaveDirectoryActivity();
                 }
             });
-            this.mSaveDirectoryText = (TextView) inflate.findViewById(C2135R.C2137id.saveDirectoryText);
+            this.mSaveDirectoryText = (TextView) inflate.findViewById(R.C2137id.saveDirectoryText);
             setSaveDirectoryText(this.mCameraPreviewControl.getSaveDirecotry());
-            inflate.findViewById(C2135R.C2137id.picture_resolution_layout).setOnClickListener(new View.OnClickListener() {
+            inflate.findViewById(R.C2137id.picture_resolution_layout).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     PlaceholderFragment.this.openPictureResolutionDialog();
                 }
             });
-            this.mPictureResolutionText = (TextView) inflate.findViewById(C2135R.C2137id.pictureResolutionText);
+            this.mPictureResolutionText = (TextView) inflate.findViewById(R.C2137id.pictureResolutionText);
             setCameraPictureResolutionModeFromCameraPreviewControl();
             setPictureResolutionText();
             return inflate;
@@ -98,7 +97,7 @@ public class CameraPreviewOptionActivity extends ActivityIACommon implements Pic
 
         private void setPictureResolutionText() {
             if (this.mCameraPictureResolutionMode == 0) {
-                this.mPictureResolutionText.setText(C2135R.string.picture_size_auto);
+                this.mPictureResolutionText.setText(R.string.picture_size_auto);
                 return;
             }
             Point point = this.mCameraPictureSize;
@@ -161,18 +160,18 @@ public class CameraPreviewOptionActivity extends ActivityIACommon implements Pic
                         setSaveDirectoryText(stringExtra);
                     }
                 } else if (i2 == 1) {
-                    SimpleMessageDialogFragment.newInstance(C2135R.string.file_save_error_message).show(getFragmentManager(), "error-dialog");
+                    SimpleMessageDialogFragment.newInstance(R.string.file_save_error_message).show(getFragmentManager(), "error-dialog");
                 }
             }
         }
 
         public void onCreateOptionsMenu(Menu menu, MenuInflater menuInflater) {
-            menuInflater.inflate(C2135R.C2138menu.menu_done, menu);
+            menuInflater.inflate(R.C2138menu.menu_done, menu);
             super.onCreateOptionsMenu(menu, menuInflater);
         }
 
         public boolean onOptionsItemSelected(MenuItem menuItem) {
-            if (menuItem.getItemId() != C2135R.C2137id.menuSettingsDone) {
+            if (menuItem.getItemId() != R.C2137id.menuSettingsDone) {
                 return super.onOptionsItemSelected(menuItem);
             }
             changeValueAndFinish();

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

@@ -812,8 +812,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         throw new UnsupportedOperationException("Method not decompiled: com.epson.cameracopy.p006ui.CameraPrintProgress.init():void");
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         EPLog.m307e("Epson", "PrintProgress.java: onCreate() call");
         EPLog.m307e("Epson", "addFlags : FLAG_KEEP_SCREEN_ON ");
         getWindow().addFlags(128);
@@ -839,17 +838,17 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         }
         this.sheets = arrayList.size();
         this.isRemotePrinter = MyPrinter.isRemotePrinter(this);
-        setContentView(C2135R.layout.progress_layout);
+        setContentView(R.layout.progress_layout);
         this.context = this;
-        mProgressPercent = (ProgressBar) findViewById(C2135R.C2137id.progress_percent);
-        this.mPercent = (TextView) findViewById(C2135R.C2137id.percent);
-        mProgressCopies = (ProgressBar) findViewById(C2135R.C2137id.progress_copies);
-        this.mCopies = (TextView) findViewById(C2135R.C2137id.copies);
-        this.mPage = (TextView) findViewById(C2135R.C2137id.page);
-        mProgressPage = (ProgressBar) findViewById(C2135R.C2137id.progress_page);
+        mProgressPercent = (ProgressBar) findViewById(R.C2137id.progress_percent);
+        this.mPercent = (TextView) findViewById(R.C2137id.percent);
+        mProgressCopies = (ProgressBar) findViewById(R.C2137id.progress_copies);
+        this.mCopies = (TextView) findViewById(R.C2137id.copies);
+        this.mPage = (TextView) findViewById(R.C2137id.page);
+        mProgressPage = (ProgressBar) findViewById(R.C2137id.progress_page);
         if (this.sheets > 1) {
             TextView textView = this.mPage;
-            textView.setText(getString(C2135R.string.page) + ": " + this.curSheet + CommonDefine.SLASH + this.sheets);
+            textView.setText(getString(R.string.page) + ": " + this.curSheet + CommonDefine.SLASH + this.sheets);
             mProgressPage.setProgress((this.curSheet * 100) / this.sheets);
         } else {
             mProgressPage.setVisibility(4);
@@ -861,10 +860,10 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
             copies = 1;
         } else {
             TextView textView2 = this.mCopies;
-            textView2.setText(getString(C2135R.string.copies) + ": " + this.curCopy + CommonDefine.SLASH + copies);
+            textView2.setText(getString(R.string.copies) + ": " + this.curCopy + CommonDefine.SLASH + copies);
             mProgressCopies.setProgress((this.curCopy * 100) / copies);
         }
-        this.mCancelButton = (Button) findViewById(C2135R.C2137id.cancel_button);
+        this.mCancelButton = (Button) findViewById(R.C2137id.cancel_button);
         this.mCancelButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 CameraPrintProgress.this.CancelPrint();
@@ -872,14 +871,14 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         });
         this.bSearching = false;
         if (this.isRemotePrinter) {
-            this.percentString = getString(C2135R.string.epsonconnect_str_remote_print_file_uploading);
+            this.percentString = getString(R.string.epsonconnect_str_remote_print_file_uploading);
         } else {
-            this.percentString = getString(C2135R.string.printing);
+            this.percentString = getString(R.string.printing);
         }
         TextView textView3 = this.mPercent;
         textView3.setText(this.percentString + "         0%");
         mProgressPercent.setProgress(0);
-        findViewById(C2135R.C2137id.epsonColorImageView).setVisibility(8);
+        findViewById(R.C2137id.epsonColorImageView).setVisibility(8);
         if (this.isRemotePrinter) {
             this.mHandler.sendEmptyMessage(2);
         } else {
@@ -893,8 +892,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         this.mHandler.sendEmptyMessage(2);
     }
 
-    /* access modifiers changed from: protected */
-    public void onDestroy() {
+    protected void onDestroy() {
         super.onDestroy();
         EPLog.m307e("Epson", "PrintProgress.java: onDestroy()call");
         EPLog.m307e("Epson", "clearFlags : FLAG_KEEP_SCREEN_ON ");
@@ -906,41 +904,37 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         EPLog.m307e("Epson", "PrintProgress.java: onDestroy() finish");
     }
 
-    /* access modifiers changed from: protected */
-    public void onStop() {
+    protected void onStop() {
         super.onStop();
         if (mEpsonService == null) {
             EPLog.m307e("Epson", "set bRestartactivity = true (2)");
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         EPLog.m307e("Epson", "PrintProgress.java call onResume()");
         NfcTagUtils.enableForegroundDispatch(this, (IntentFilter[]) null, (String[][]) null);
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
         NfcTagUtils.disableForegroundDispatch(this);
     }
 
-    /* access modifiers changed from: protected */
-    public Dialog onCreateDialog(int i) {
+    protected Dialog onCreateDialog(int i) {
         switch (i) {
             case 0:
                 EPLog.m307e("Epson", "show dialog: " + curError + " cancontinue: " + isContinue);
                 removeDialog(1);
                 Integer[] stringId = MediaInfo.ErrorTable.getStringId(curError);
                 if (stringId == null) {
-                    stringId = new Integer[]{Integer.valueOf(C2135R.string.NOT_IMPLEMENT), Integer.valueOf(C2135R.string.NOT_IMPLEMENT_TITLE), 1};
+                    stringId = new Integer[]{Integer.valueOf(R.string.NOT_IMPLEMENT), Integer.valueOf(R.string.NOT_IMPLEMENT_TITLE), 1};
                 }
                 String[] replaceMessage = Utils.replaceMessage(stringId, curError, getApplicationContext());
                 if (!isContinue) {
                     EPLog.m307e("Epson", "show str_cancel button");
-                    AlertDialog.Builder negativeButton = new CustomTitleAlertDialogBuilder(this).setCancelable(false).setTitle(replaceMessage[1]).setMessage(replaceMessage[0]).setNegativeButton(getString(C2135R.string.str_cancel), new DialogInterface.OnClickListener() {
+                    AlertDialog.Builder negativeButton = new CustomTitleAlertDialogBuilder(this).setCancelable(false).setTitle(replaceMessage[1]).setMessage(replaceMessage[0]).setNegativeButton(getString(R.string.str_cancel), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
                             try {
                                 CameraPrintProgress.mEpsonService.confirmContinueable(false);
@@ -961,7 +955,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                     });
                     return negativeButton.create();
                 }
-                AlertDialog.Builder negativeButton2 = new CustomTitleAlertDialogBuilder(this).setTitle((CharSequence) replaceMessage[1]).setMessage(replaceMessage[0]).setCancelable(false).setPositiveButton(getString(C2135R.string.str_continue), new DialogInterface.OnClickListener() {
+                AlertDialog.Builder negativeButton2 = new CustomTitleAlertDialogBuilder(this).setTitle((CharSequence) replaceMessage[1]).setMessage(replaceMessage[0]).setCancelable(false).setPositiveButton(getString(R.string.str_continue), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         try {
                             if (CameraPrintProgress.curError == 109) {
@@ -977,7 +971,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                         boolean unused2 = CameraPrintProgress.this.isDialogOpen = false;
                         CameraPrintProgress.this.removeDialog(0);
                     }
-                }).setNegativeButton(getString(C2135R.string.str_cancel), new DialogInterface.OnClickListener() {
+                }).setNegativeButton(getString(R.string.str_cancel), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         boolean unused = CameraPrintProgress.this.isDialogOpen = false;
                         CameraPrintProgress.this.removeDialog(0);
@@ -1003,7 +997,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 if (this.isDialogOpen) {
                     return null;
                 }
-                AlertDialog.Builder negativeButton3 = new AlertDialog.Builder(this).setTitle((CharSequence) null).setCancelable(false).setMessage(getString(C2135R.string.str_msg_scan_cancel)).setPositiveButton(getString(C2135R.string.str_yes), new DialogInterface.OnClickListener() {
+                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);
                         try {
@@ -1026,7 +1020,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                             boolean unused = CameraPrintProgress.this.bSearching = false;
                         }
                     }
-                }).setNegativeButton(getString(C2135R.string.str_no), new DialogInterface.OnClickListener() {
+                }).setNegativeButton(getString(R.string.str_no), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         CameraPrintProgress.this.removeDialog(1);
                     }
@@ -1042,8 +1036,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         if (i == 1) {
             switch (i2) {
@@ -1085,7 +1078,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
     }
 
     public void showErrorDialog(String str, String str2) {
-        new CustomTitleAlertDialogBuilder(this).setCancelable(false).setTitle(str).setMessage(str2).setNegativeButton(getString(C2135R.string.ok_button), new DialogInterface.OnClickListener() {
+        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);

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

@@ -1731,11 +1731,10 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         return i;
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        setContentView((int) C2135R.layout.setting_layout);
-        setActionBar((int) C2135R.string.str_btn_printer_settings, true);
+        setContentView((int) R.layout.setting_layout);
+        setActionBar((int) R.string.str_btn_printer_settings, true);
         bindEpsonService();
         this.mContext = this;
         this.mRemoteSrcType = 2;
@@ -1747,31 +1746,31 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         }
         this.sheets = 1;
         this.mRemoteSrcType = 2;
-        this.printerName = (TextView) findViewById(C2135R.C2137id.printer_name);
-        this.paperSizeInfo = (TextView) findViewById(C2135R.C2137id.paper_size_info);
-        this.paperTypeInfo = (TextView) findViewById(C2135R.C2137id.paper_type_info);
-        this.layoutInfo = (TextView) findViewById(C2135R.C2137id.layout_info);
-        this.qualityInfo = (TextView) findViewById(C2135R.C2137id.quality_info);
-        this.paperSourceInfo = (TextView) findViewById(C2135R.C2137id.paper_source_info);
-        this.copies = (TextView) findViewById(C2135R.C2137id.copies);
-        this.copiesMinus = (Button) findViewById(C2135R.C2137id.copies_minus_button);
-        this.copiesPlus = (Button) findViewById(C2135R.C2137id.copies_plus_button);
+        this.printerName = (TextView) findViewById(R.C2137id.printer_name);
+        this.paperSizeInfo = (TextView) findViewById(R.C2137id.paper_size_info);
+        this.paperTypeInfo = (TextView) findViewById(R.C2137id.paper_type_info);
+        this.layoutInfo = (TextView) findViewById(R.C2137id.layout_info);
+        this.qualityInfo = (TextView) findViewById(R.C2137id.quality_info);
+        this.paperSourceInfo = (TextView) findViewById(R.C2137id.paper_source_info);
+        this.copies = (TextView) findViewById(R.C2137id.copies);
+        this.copiesMinus = (Button) findViewById(R.C2137id.copies_minus_button);
+        this.copiesPlus = (Button) findViewById(R.C2137id.copies_plus_button);
         LongTapRepeatAdapter.bless(this.copiesMinus);
         LongTapRepeatAdapter.bless(this.copiesPlus);
-        this.colorInfo = (TextView) findViewById(C2135R.C2137id.color_info);
-        this.duplexInfo = (TextView) findViewById(C2135R.C2137id.duplex_info);
-        this.feedDirectionInfo = (TextView) findViewById(C2135R.C2137id.feed_direction_info);
-        this.printDateInfo = (TextView) findViewById(C2135R.C2137id.printdate_info);
-        this.brightness = (TextView) findViewById(C2135R.C2137id.brightness);
-        this.brightnessMinus = (Button) findViewById(C2135R.C2137id.brightness_minus_button);
-        this.brightnessPlus = (Button) findViewById(C2135R.C2137id.brightness_plus_button);
-        this.contrast = (TextView) findViewById(C2135R.C2137id.contrast);
-        this.contrastMinus = (Button) findViewById(C2135R.C2137id.contrast_minus_button);
-        this.contrastPlus = (Button) findViewById(C2135R.C2137id.contrast_plus_button);
-        this.saturation = (TextView) findViewById(C2135R.C2137id.saturation);
-        this.saturationMinus = (Button) findViewById(C2135R.C2137id.saturation_minus_button);
-        this.saturationPlus = (Button) findViewById(C2135R.C2137id.saturation_plus_button);
-        this.progressGetOption = findViewById(C2135R.C2137id.progressGetOption);
+        this.colorInfo = (TextView) findViewById(R.C2137id.color_info);
+        this.duplexInfo = (TextView) findViewById(R.C2137id.duplex_info);
+        this.feedDirectionInfo = (TextView) findViewById(R.C2137id.feed_direction_info);
+        this.printDateInfo = (TextView) findViewById(R.C2137id.printdate_info);
+        this.brightness = (TextView) findViewById(R.C2137id.brightness);
+        this.brightnessMinus = (Button) findViewById(R.C2137id.brightness_minus_button);
+        this.brightnessPlus = (Button) findViewById(R.C2137id.brightness_plus_button);
+        this.contrast = (TextView) findViewById(R.C2137id.contrast);
+        this.contrastMinus = (Button) findViewById(R.C2137id.contrast_minus_button);
+        this.contrastPlus = (Button) findViewById(R.C2137id.contrast_plus_button);
+        this.saturation = (TextView) findViewById(R.C2137id.saturation);
+        this.saturationMinus = (Button) findViewById(R.C2137id.saturation_minus_button);
+        this.saturationPlus = (Button) findViewById(R.C2137id.saturation_plus_button);
+        this.progressGetOption = findViewById(R.C2137id.progressGetOption);
         this.enableShowPreview = getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).getBoolean(Constants.ENABLE_SHOW_PREVIEW, true);
         loadConfig();
         setClickListener();
@@ -1789,20 +1788,20 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     }
 
     private void updatePrinterIcon() {
-        if (this.printerName.getText().equals(getString(C2135R.string.str_lbl_title_scan))) {
-            ((ImageView) findViewById(C2135R.C2137id.imageViewPrinterLocation)).setVisibility(8);
+        if (this.printerName.getText().equals(getString(R.string.str_lbl_title_scan))) {
+            ((ImageView) findViewById(R.C2137id.imageViewPrinterLocation)).setVisibility(8);
             return;
         }
-        ((ImageView) findViewById(C2135R.C2137id.imageViewPrinterLocation)).setVisibility(0);
+        ((ImageView) findViewById(R.C2137id.imageViewPrinterLocation)).setVisibility(0);
         switch (this.printerLocation) {
             case 1:
-                ((ImageView) findViewById(C2135R.C2137id.imageViewPrinterLocation)).setImageResource(C2135R.C2136drawable.print_local);
+                ((ImageView) findViewById(R.C2137id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_local);
                 return;
             case 2:
-                ((ImageView) findViewById(C2135R.C2137id.imageViewPrinterLocation)).setImageResource(C2135R.C2136drawable.print_remote);
+                ((ImageView) findViewById(R.C2137id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_remote);
                 return;
             case 3:
-                ((ImageView) findViewById(C2135R.C2137id.imageViewPrinterLocation)).setImageResource(C2135R.C2136drawable.print_ip);
+                ((ImageView) findViewById(R.C2137id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_ip);
                 return;
             default:
                 return;
@@ -1819,24 +1818,24 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         this.saturationMinus.setOnClickListener(this);
         this.saturationPlus.setOnClickListener(this);
         if (this.isDocumentSetting) {
-            findViewById(C2135R.C2137id.page_range_setting).setOnClickListener(this);
+            findViewById(R.C2137id.page_range_setting).setOnClickListener(this);
         }
-        findViewById(C2135R.C2137id.printer).setOnClickListener(this);
-        findViewById(C2135R.C2137id.paper_size).setOnClickListener(this);
-        findViewById(C2135R.C2137id.paper_type).setOnClickListener(this);
-        findViewById(C2135R.C2137id.layout).setOnClickListener(this);
-        findViewById(C2135R.C2137id.quality).setOnClickListener(this);
-        findViewById(C2135R.C2137id.paper_source).setOnClickListener(this);
-        findViewById(C2135R.C2137id.color).setOnClickListener(this);
-        findViewById(C2135R.C2137id.duplex).setOnClickListener(this);
-        findViewById(C2135R.C2137id.feed_direction).setOnClickListener(this);
-        findViewById(C2135R.C2137id.printdate).setOnClickListener(this);
+        findViewById(R.C2137id.printer).setOnClickListener(this);
+        findViewById(R.C2137id.paper_size).setOnClickListener(this);
+        findViewById(R.C2137id.paper_type).setOnClickListener(this);
+        findViewById(R.C2137id.layout).setOnClickListener(this);
+        findViewById(R.C2137id.quality).setOnClickListener(this);
+        findViewById(R.C2137id.paper_source).setOnClickListener(this);
+        findViewById(R.C2137id.color).setOnClickListener(this);
+        findViewById(R.C2137id.duplex).setOnClickListener(this);
+        findViewById(R.C2137id.feed_direction).setOnClickListener(this);
+        findViewById(R.C2137id.printdate).setOnClickListener(this);
     }
 
     private void loadConfig() {
         MyPrinter curPrinter = MyPrinter.getCurPrinter(this);
         if (curPrinter == null || curPrinter.getName() == null) {
-            this.printerName.setText(getString(C2135R.string.str_lbl_title_scan));
+            this.printerName.setText(getString(R.string.str_lbl_title_scan));
         } else {
             this.printerName.setText(curPrinter.getUserDefName(this));
         }
@@ -1903,7 +1902,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
             this.printAll = printSetting.printAll;
             this.startValue = printSetting.startValue;
             this.endValue = printSetting.endValue;
-            ((TextView) findViewById(C2135R.C2137id.page_range_value)).setText(this.startValue + ".." + this.endValue);
+            ((TextView) findViewById(R.C2137id.page_range_value)).setText(this.startValue + ".." + this.endValue);
             return;
         }
         this.mLookupTable = new MediaInfo.PrintDate();
@@ -2073,8 +2072,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onDestroy() {
+    protected void onDestroy() {
         super.onDestroy();
         unbindEpsonService();
         EPLog.m313i("SettingScr", "onDestroy");
@@ -2113,7 +2111,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                 }
             }
             switch (view.getId()) {
-                case C2135R.C2137id.brightness_minus_button /*2131230848*/:
+                case R.C2137id.brightness_minus_button /*2131230848*/:
                     this.brightnessValue--;
                     if (this.brightnessValue <= -50) {
                         this.brightnessValue = -50;
@@ -2124,7 +2122,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     this.brightnessPlus.setEnabled(true);
                     this.brightness.setText(String.valueOf(this.brightnessValue));
                     return;
-                case C2135R.C2137id.brightness_plus_button /*2131230850*/:
+                case R.C2137id.brightness_plus_button /*2131230850*/:
                     this.brightnessValue++;
                     if (this.brightnessValue >= 50) {
                         this.brightnessValue = 50;
@@ -2135,10 +2133,10 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     this.brightnessMinus.setEnabled(true);
                     this.brightness.setText(String.valueOf(this.brightnessValue));
                     return;
-                case C2135R.C2137id.color /*2131230930*/:
-                    launchDetailScreen(this.color, C2135R.C2137id.color);
+                case R.C2137id.color /*2131230930*/:
+                    launchDetailScreen(this.color, R.C2137id.color);
                     return;
-                case C2135R.C2137id.contrast_minus_button /*2131230942*/:
+                case R.C2137id.contrast_minus_button /*2131230942*/:
                     this.contrastValue--;
                     if (this.contrastValue <= -50) {
                         this.contrastValue = -50;
@@ -2149,7 +2147,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     this.contrastPlus.setEnabled(true);
                     this.contrast.setText(String.valueOf(this.contrastValue));
                     return;
-                case C2135R.C2137id.contrast_plus_button /*2131230943*/:
+                case R.C2137id.contrast_plus_button /*2131230943*/:
                     this.contrastValue++;
                     if (this.contrastValue >= 50) {
                         this.contrastValue = 50;
@@ -2160,7 +2158,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     this.contrastMinus.setEnabled(true);
                     this.contrast.setText(String.valueOf(this.contrastValue));
                     return;
-                case C2135R.C2137id.copies_minus_button /*2131230945*/:
+                case R.C2137id.copies_minus_button /*2131230945*/:
                     this.copiesValue--;
                     if (this.copiesValue <= 1) {
                         this.copiesValue = 1;
@@ -2171,7 +2169,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     this.copiesPlus.setEnabled(true);
                     this.copies.setText(String.valueOf(this.copiesValue));
                     return;
-                case C2135R.C2137id.copies_plus_button /*2131230946*/:
+                case R.C2137id.copies_plus_button /*2131230946*/:
                     this.copiesValue++;
                     if (this.copiesValue >= 30) {
                         this.copiesValue = 30;
@@ -2182,16 +2180,16 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     this.copiesMinus.setEnabled(true);
                     this.copies.setText(String.valueOf(this.copiesValue));
                     return;
-                case C2135R.C2137id.duplex /*2131231005*/:
-                    launchDetailScreen(this.duplex, C2135R.C2137id.duplex);
+                case R.C2137id.duplex /*2131231005*/:
+                    launchDetailScreen(this.duplex, R.C2137id.duplex);
                     return;
-                case C2135R.C2137id.feed_direction /*2131231037*/:
-                    launchDetailScreen(this.feedDirection, C2135R.C2137id.feed_direction);
+                case R.C2137id.feed_direction /*2131231037*/:
+                    launchDetailScreen(this.feedDirection, R.C2137id.feed_direction);
                     return;
-                case C2135R.C2137id.layout /*2131231158*/:
-                    launchDetailScreen(this.layout, C2135R.C2137id.layout);
+                case R.C2137id.layout /*2131231158*/:
+                    launchDetailScreen(this.layout, R.C2137id.layout);
                     return;
-                case C2135R.C2137id.page_range_setting /*2131231300*/:
+                case R.C2137id.page_range_setting /*2131231300*/:
                     Intent intent = new Intent(this, PageRangeSetting.class);
                     intent.putExtra("SHEETS", this.sheets);
                     intent.putExtra("printAll", this.printAll);
@@ -2199,33 +2197,31 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     intent.putExtra("endValue", this.endValue);
                     startActivityForResult(intent, 2);
                     return;
-                case C2135R.C2137id.paper_size /*2131231306*/:
-                    launchDetailScreen(this.paperSize, C2135R.C2137id.paper_size);
+                case R.C2137id.paper_size /*2131231306*/:
+                    launchDetailScreen(this.paperSize, R.C2137id.paper_size);
                     return;
-                case C2135R.C2137id.paper_source /*2131231311*/:
+                case R.C2137id.paper_source /*2131231311*/:
                     int i = this.paperSource;
                     int[] iArr = this.paper_source_info;
                     if (iArr != null && iArr.length <= 1) {
                         i = 128;
                     }
-                    launchDetailScreen(i, C2135R.C2137id.paper_source);
+                    launchDetailScreen(i, R.C2137id.paper_source);
                     return;
-                case C2135R.C2137id.paper_type /*2131231314*/:
-                    launchDetailScreen(this.paperType, C2135R.C2137id.paper_type);
+                case R.C2137id.paper_type /*2131231314*/:
+                    launchDetailScreen(this.paperType, R.C2137id.paper_type);
                     return;
-                case C2135R.C2137id.printdate /*2131231355*/:
-                    launchDetailScreen(this.printdate, C2135R.C2137id.printdate);
+                case R.C2137id.printdate /*2131231355*/:
+                    launchDetailScreen(this.printdate, R.C2137id.printdate);
                     return;
-                case C2135R.C2137id.printer /*2131231358*/:
+                case R.C2137id.printer /*2131231358*/:
                     unbindEpsonService();
                     new AsyncTask<Void, Void, Void>() {
-                        /* access modifiers changed from: protected */
-                        public void onPreExecute() {
-                            CameraPrintSettingActivity.this.findViewById(C2135R.C2137id.printer).setClickable(false);
+                        protected void onPreExecute() {
+                            CameraPrintSettingActivity.this.findViewById(R.C2137id.printer).setClickable(false);
                         }
 
-                        /* access modifiers changed from: protected */
-                        public Void doInBackground(Void... voidArr) {
+                        protected Void doInBackground(Void... voidArr) {
                             CameraPrintSettingActivity cameraPrintSettingActivity = CameraPrintSettingActivity.this;
                             WiFiDirectManager.disconnect(cameraPrintSettingActivity, WiFiDirectManager.DEVICE_TYPE_PRINTER, cameraPrintSettingActivity.printerIp);
                             CameraPrintSettingActivity cameraPrintSettingActivity2 = CameraPrintSettingActivity.this;
@@ -2233,8 +2229,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                             return null;
                         }
 
-                        /* access modifiers changed from: protected */
-                        public void onPostExecute(Void voidR) {
+                        protected void onPostExecute(Void voidR) {
                             Intent intent = new Intent(CameraPrintSettingActivity.this, SearchPrinterScr.class);
                             Bundle bundle = new Bundle();
                             bundle.putString(Constants.PRINTER_ID, CameraPrintSettingActivity.this.printerId);
@@ -2244,14 +2239,14 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                             bundle.putString(CameraPrintSettingActivity.EXTRA_SIMPLEAP, CameraPrintSettingActivity.this.autoConnectSsid);
                             intent.putExtras(bundle);
                             CameraPrintSettingActivity.this.startActivityForResult(intent, 0);
-                            CameraPrintSettingActivity.this.findViewById(C2135R.C2137id.printer).setClickable(true);
+                            CameraPrintSettingActivity.this.findViewById(R.C2137id.printer).setClickable(true);
                         }
                     }.execute(new Void[0]);
                     return;
-                case C2135R.C2137id.quality /*2131231392*/:
-                    launchDetailScreen(this.quality, C2135R.C2137id.quality);
+                case R.C2137id.quality /*2131231392*/:
+                    launchDetailScreen(this.quality, R.C2137id.quality);
                     return;
-                case C2135R.C2137id.saturation_minus_button /*2131231425*/:
+                case R.C2137id.saturation_minus_button /*2131231425*/:
                     this.saturationValue--;
                     if (this.saturationValue <= -50) {
                         this.saturationValue = -50;
@@ -2262,7 +2257,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     this.saturationPlus.setEnabled(true);
                     this.saturation.setText(String.valueOf(this.saturationValue));
                     return;
-                case C2135R.C2137id.saturation_plus_button /*2131231426*/:
+                case R.C2137id.saturation_plus_button /*2131231426*/:
                     this.saturationValue++;
                     if (this.saturationValue >= 50) {
                         this.saturationValue = 50;
@@ -2279,8 +2274,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void launchDetailScreen(int i, int i2) {
+    private void launchDetailScreen(int i, int i2) {
         Intent intent = new Intent(this, PrinterInfoDetail.class);
         Bundle bundle = new Bundle();
         bundle.putInt("ID", i2);
@@ -2289,26 +2283,26 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         bundle.putInt("curValue", i);
         bundle.putBoolean("isDocumentSetting", this.isDocumentSetting);
         switch (i2) {
-            case C2135R.C2137id.color /*2131230930*/:
+            case R.C2137id.color /*2131230930*/:
                 bundle.putIntArray(Constants.COLOR_INFO, this.color_info);
                 break;
-            case C2135R.C2137id.duplex /*2131231005*/:
+            case R.C2137id.duplex /*2131231005*/:
                 bundle.putIntArray(Constants.DUPLEX_INFO, this.duplex_info);
                 break;
-            case C2135R.C2137id.layout /*2131231158*/:
+            case R.C2137id.layout /*2131231158*/:
                 bundle.putIntArray(Constants.LAYOUT_INFO, this.layout_info);
                 break;
-            case C2135R.C2137id.paper_size /*2131231306*/:
+            case R.C2137id.paper_size /*2131231306*/:
                 bundle.putIntArray(Constants.PAPER_SIZE_INFO, this.paper_size_info);
                 break;
-            case C2135R.C2137id.paper_source /*2131231311*/:
+            case R.C2137id.paper_source /*2131231311*/:
                 int[] iArr = this.paper_source_info;
                 bundle.putIntArray(Constants.PAPER_SOURCE_INFO, (iArr == null || iArr.length > 1) ? this.paper_source_info : new int[]{128});
                 break;
-            case C2135R.C2137id.paper_type /*2131231314*/:
+            case R.C2137id.paper_type /*2131231314*/:
                 bundle.putIntArray(Constants.PAPER_TYPE_INFO, this.paper_type_info);
                 break;
-            case C2135R.C2137id.quality /*2131231392*/:
+            case R.C2137id.quality /*2131231392*/:
                 bundle.putIntArray(Constants.PRINT_QUALITY_INFO, this.quality_info);
                 break;
         }
@@ -2316,8 +2310,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         startActivityForResult(intent, 1);
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         String callingPackage = getCallingPackage();
         EPLog.m313i(callingPackage, "requestCode = " + i + " resultCode = " + i2);
@@ -2327,25 +2320,25 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                     if (i == 1 && i2 == -1) {
                         int i3 = intent.getExtras().getInt("curValue");
                         switch (intent.getExtras().getInt("ID")) {
-                            case C2135R.C2137id.color /*2131230930*/:
+                            case R.C2137id.color /*2131230930*/:
                                 this.mLookupTable = new MediaInfo.Color();
                                 this.colorInfo.setText(getString(this.mLookupTable.getStringId(i3)));
                                 this.mLookupTable.destructor();
                                 this.color = i3;
                                 break;
-                            case C2135R.C2137id.duplex /*2131231005*/:
+                            case R.C2137id.duplex /*2131231005*/:
                                 this.mLookupTable = new MediaInfo.Duplex();
                                 this.duplexInfo.setText(getString(this.mLookupTable.getStringId(i3)));
                                 this.mLookupTable.destructor();
                                 this.duplex = i3;
                                 break;
-                            case C2135R.C2137id.feed_direction /*2131231037*/:
+                            case R.C2137id.feed_direction /*2131231037*/:
                                 this.mLookupTable = new MediaInfo.FeedDirection();
                                 this.feedDirectionInfo.setText(getString(this.mLookupTable.getStringId(i3)));
                                 this.mLookupTable.destructor();
                                 this.feedDirection = i3;
                                 break;
-                            case C2135R.C2137id.layout /*2131231158*/:
+                            case R.C2137id.layout /*2131231158*/:
                                 this.mLookupTable = new MediaInfo.Layout();
                                 this.layoutInfo.setText(getString(this.mLookupTable.getStringId(i3)));
                                 this.mLookupTable.destructor();
@@ -2353,7 +2346,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                                 this.undoFlag = false;
                                 this.mHandler.sendEmptyMessage(32);
                                 break;
-                            case C2135R.C2137id.paper_size /*2131231306*/:
+                            case R.C2137id.paper_size /*2131231306*/:
                                 this.sizeIndex = intent.getExtras().getInt("INDEX");
                                 this.mLookupTable = new MediaInfo.PaperSize();
                                 this.paperSizeInfo.setText(getString(this.mLookupTable.getStringId(i3)));
@@ -2363,7 +2356,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                                 this.undoFlag = false;
                                 this.mHandler.sendEmptyMessage(2);
                                 break;
-                            case C2135R.C2137id.paper_source /*2131231311*/:
+                            case R.C2137id.paper_source /*2131231311*/:
                                 this.mLookupTable = new MediaInfo.PaperSource();
                                 this.paperSourceInfo.setText(getString(this.mLookupTable.getStringId(i3)));
                                 this.mLookupTable.destructor();
@@ -2374,7 +2367,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                                 this.undoFlag = false;
                                 this.mHandler.sendEmptyMessage(32);
                                 break;
-                            case C2135R.C2137id.paper_type /*2131231314*/:
+                            case R.C2137id.paper_type /*2131231314*/:
                                 this.typeIndex = intent.getExtras().getInt("INDEX");
                                 this.mLookupTable = new MediaInfo.PaperType();
                                 this.paperTypeInfo.setText(getString(this.mLookupTable.getStringId(i3)));
@@ -2384,13 +2377,13 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                                 this.undoFlag = false;
                                 this.mHandler.sendEmptyMessage(3);
                                 break;
-                            case C2135R.C2137id.printdate /*2131231355*/:
+                            case R.C2137id.printdate /*2131231355*/:
                                 this.mLookupTable = new MediaInfo.PrintDate();
                                 this.printDateInfo.setText(getString(this.mLookupTable.getStringId(i3)));
                                 this.mLookupTable.destructor();
                                 this.printdate = i3;
                                 break;
-                            case C2135R.C2137id.quality /*2131231392*/:
+                            case R.C2137id.quality /*2131231392*/:
                                 this.mLookupTable = new MediaInfo.Quality();
                                 this.qualityInfo.setText(getString(this.mLookupTable.getStringId(i3)));
                                 this.mLookupTable.destructor();
@@ -2560,40 +2553,38 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         this.mHandler.sendEmptyMessageDelayed(17, 100);
     }
 
-    /* access modifiers changed from: package-private */
-    public void updateSettingView() {
+    private void updateSettingView() {
         boolean z = this.isDocumentSetting;
         setVisibilityPageRange(false);
         int[] iArr = this.color_info;
         if (iArr == null) {
-            ((ImageView) findViewById(C2135R.C2137id.color_next_screen_imv)).setVisibility(8);
+            ((ImageView) findViewById(R.C2137id.color_next_screen_imv)).setVisibility(8);
         } else if (iArr.length <= 1) {
-            ((ImageView) findViewById(C2135R.C2137id.color_next_screen_imv)).setVisibility(8);
+            ((ImageView) findViewById(R.C2137id.color_next_screen_imv)).setVisibility(8);
         } else {
-            ((ImageView) findViewById(C2135R.C2137id.color_next_screen_imv)).setVisibility(0);
+            ((ImageView) findViewById(R.C2137id.color_next_screen_imv)).setVisibility(0);
         }
         int[] iArr2 = this.duplex_info;
-        findViewById(C2135R.C2137id.duplex_view).setVisibility(8);
-        ((LinearLayout) findViewById(C2135R.C2137id.duplex)).setVisibility(8);
+        findViewById(R.C2137id.duplex_view).setVisibility(8);
+        ((LinearLayout) findViewById(R.C2137id.duplex)).setVisibility(8);
         switch (this.lang) {
             case 2:
             case 3:
-                findViewById(C2135R.C2137id.feed_direction_view).setVisibility(0);
-                findViewById(C2135R.C2137id.feed_direction).setVisibility(0);
+                findViewById(R.C2137id.feed_direction_view).setVisibility(0);
+                findViewById(R.C2137id.feed_direction).setVisibility(0);
                 break;
             default:
-                findViewById(C2135R.C2137id.feed_direction_view).setVisibility(8);
-                findViewById(C2135R.C2137id.feed_direction).setVisibility(8);
+                findViewById(R.C2137id.feed_direction_view).setVisibility(8);
+                findViewById(R.C2137id.feed_direction).setVisibility(8);
                 break;
         }
         if (!this.isDocumentSetting) {
             int i = this.printerLocation;
         }
-        findViewById(C2135R.C2137id.printdate).setVisibility(8);
+        findViewById(R.C2137id.printdate).setVisibility(8);
     }
 
-    /* access modifiers changed from: package-private */
-    public int getPrinterLang() {
+    private int getPrinterLang() {
         int i;
         IEpsonService iEpsonService;
         if (!(this.printerLocation == 2 || (iEpsonService = this.mEpsonService) == null)) {
@@ -2610,31 +2601,28 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         return i;
     }
 
-    /* access modifiers changed from: package-private */
-    public void setVisibilityPageRange(boolean z) {
+    private void setVisibilityPageRange(boolean z) {
         int i = 0;
-        findViewById(C2135R.C2137id.page_range_setting).setVisibility(z ? 0 : 8);
-        View findViewById = findViewById(C2135R.C2137id.page_range_separator);
+        findViewById(R.C2137id.page_range_setting).setVisibility(z ? 0 : 8);
+        View findViewById = findViewById(R.C2137id.page_range_separator);
         if (!z) {
             i = 8;
         }
         findViewById.setVisibility(i);
     }
 
-    /* access modifiers changed from: package-private */
-    public void setClickablePageRange(boolean z) {
-        findViewById(C2135R.C2137id.page_range_setting).setClickable(z);
+    private void setClickablePageRange(boolean z) {
+        findViewById(R.C2137id.page_range_setting).setClickable(z);
         int i = 0;
-        findViewById(C2135R.C2137id.page_range_next_screen_imv).setVisibility(z ? 0 : 8);
-        View findViewById = findViewById(C2135R.C2137id.page_range_value);
+        findViewById(R.C2137id.page_range_next_screen_imv).setVisibility(z ? 0 : 8);
+        View findViewById = findViewById(R.C2137id.page_range_value);
         if (!z) {
             i = 8;
         }
         findViewById.setVisibility(i);
     }
 
-    /* access modifiers changed from: package-private */
-    public void resetSettings() {
+    private void resetSettings() {
         this.printerDeviceId = null;
         this.printerId = null;
         this.printerEmailAddress = null;
@@ -2649,8 +2637,8 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         this.quality_info = null;
         this.duplex_info = null;
         this.autoConnectSsid = "";
-        this.printerName.setText(getString(C2135R.string.str_lbl_title_scan));
-        ((ImageView) findViewById(C2135R.C2137id.imageViewPrinterLocation)).setVisibility(8);
+        this.printerName.setText(getString(R.string.str_lbl_title_scan));
+        ((ImageView) findViewById(R.C2137id.imageViewPrinterLocation)).setVisibility(8);
         updateSettingView();
         setScreenState(true);
     }
@@ -2679,20 +2667,20 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         } else {
             this.progressGetOption.setVisibility(0);
         }
-        findViewById(C2135R.C2137id.printer).setClickable(bool.booleanValue());
-        findViewById(C2135R.C2137id.paper_size).setClickable(bool.booleanValue());
-        findViewById(C2135R.C2137id.paper_type).setClickable(bool.booleanValue());
-        findViewById(C2135R.C2137id.layout).setClickable(bool.booleanValue());
-        findViewById(C2135R.C2137id.quality).setClickable(bool.booleanValue());
-        findViewById(C2135R.C2137id.paper_source).setClickable(bool.booleanValue());
-        findViewById(C2135R.C2137id.color).setClickable(bool.booleanValue());
-        findViewById(C2135R.C2137id.duplex).setClickable(bool.booleanValue());
-        findViewById(C2135R.C2137id.feed_direction).setClickable(bool.booleanValue());
-        findViewById(C2135R.C2137id.printdate).setClickable(bool.booleanValue());
+        findViewById(R.C2137id.printer).setClickable(bool.booleanValue());
+        findViewById(R.C2137id.paper_size).setClickable(bool.booleanValue());
+        findViewById(R.C2137id.paper_type).setClickable(bool.booleanValue());
+        findViewById(R.C2137id.layout).setClickable(bool.booleanValue());
+        findViewById(R.C2137id.quality).setClickable(bool.booleanValue());
+        findViewById(R.C2137id.paper_source).setClickable(bool.booleanValue());
+        findViewById(R.C2137id.color).setClickable(bool.booleanValue());
+        findViewById(R.C2137id.duplex).setClickable(bool.booleanValue());
+        findViewById(R.C2137id.feed_direction).setClickable(bool.booleanValue());
+        findViewById(R.C2137id.printdate).setClickable(bool.booleanValue());
     }
 
     public void showErrorDialog(String str, String str2) {
-        new CustomTitleAlertDialogBuilder(this).setCancelable(false).setTitle(str).setMessage(str2).setNegativeButton(getString(C2135R.string.ok_button), new DialogInterface.OnClickListener() {
+        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) {
                 CameraPrintSettingActivity.this.setScreenState(true);
                 dialogInterface.cancel();
@@ -2701,8 +2689,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         updateSupportedMediaFile(true);
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         EPLog.m307e("SettingScr", "onResume()");
         if (this.printerId != null && this.printerLocation == 1 && this.isRetryAfterConnectSimpleAp) {
@@ -2715,8 +2702,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         EPLog.m305d("SettingScr", "onPause");
         super.onPause();
         if (isFinishing()) {
@@ -2727,12 +2713,12 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     }
 
     public boolean onCreateOptionsMenu(Menu menu) {
-        getMenuInflater().inflate(C2135R.C2138menu.menu_done, menu);
+        getMenuInflater().inflate(R.C2138menu.menu_done, menu);
         return super.onCreateOptionsMenu(menu);
     }
 
     public boolean onOptionsItemSelected(MenuItem menuItem) {
-        if (menuItem.getItemId() != C2135R.C2137id.menuSettingsDone) {
+        if (menuItem.getItemId() != R.C2137id.menuSettingsDone) {
             return super.onOptionsItemSelected(menuItem);
         }
         saveChanged();
@@ -2741,8 +2727,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         return true;
     }
 
-    /* access modifiers changed from: protected */
-    public void deleteLongTapMessage() {
+    protected void deleteLongTapMessage() {
         MotionEvent obtain = MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis() + 10, 1, 0.0f, 0.0f, 0);
         this.copiesMinus.dispatchTouchEvent(obtain);
         this.copiesPlus.dispatchTouchEvent(obtain);

+ 92 - 98
app/src/main/java/com/epson/cameracopy/p006ui/CropImageActivity.java

@@ -222,70 +222,69 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
     public void onStopTrackingTouch(SeekBar seekBar) {
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        setContentView((int) C2135R.layout.activity_crop_image);
+        setContentView((int) R.layout.activity_crop_image);
         this.mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
         this.mModelDialog.getDialogJob().observe(this, new Observer() {
             public final void onChanged(Object obj) {
                 CropImageActivity.lambda$onCreate$0(CropImageActivity.this, (Deque) obj);
             }
         });
-        setActionBar((int) C2135R.string.crop_image_title, true);
+        setActionBar((int) R.string.crop_image_title, true);
         mActivity = new WeakReference<>(this);
         mCropImageActivity = (CropImageActivity) mActivity.get();
         this.mModelDialog.doShow(DIALOG_PROGRESS);
         this.mPaperSize = new Size(0.0d, 0.0d);
         GetPaperInfo();
         this.mDaemonView = new DaemonView(this);
-        this.mCropImageFrameLayout = (FrameLayout) findViewById(C2135R.C2137id.crop_image_frame_layout);
+        this.mCropImageFrameLayout = (FrameLayout) findViewById(R.C2137id.crop_image_frame_layout);
         this.mCropImageFrameLayout.addView(this.mDaemonView);
-        this.mImageCollectLayout = (RelativeLayout) findViewById(C2135R.C2137id.ImageCollectLayout);
-        this.mImageCollectPreviewLayout = (LinearLayout) findViewById(C2135R.C2137id.ImageCollectPreviewLayout);
-        this.mImageCollectView = (ImageCollectView) this.mImageCollectPreviewLayout.findViewById(C2135R.C2137id.ImageCollectView);
+        this.mImageCollectLayout = (RelativeLayout) findViewById(R.C2137id.ImageCollectLayout);
+        this.mImageCollectPreviewLayout = (LinearLayout) findViewById(R.C2137id.ImageCollectPreviewLayout);
+        this.mImageCollectView = (ImageCollectView) this.mImageCollectPreviewLayout.findViewById(R.C2137id.ImageCollectView);
         this.mImageCollectView.SetHandler(mHandler);
-        this.mImageCollectPaperSizeInfo = (TextView) this.mImageCollectPreviewLayout.findViewById(C2135R.C2137id.ImageCollectPaperSizeInfo);
+        this.mImageCollectPaperSizeInfo = (TextView) this.mImageCollectPreviewLayout.findViewById(R.C2137id.ImageCollectPaperSizeInfo);
         this.mImageCollectPaperSizeInfo.setSingleLine(true);
         this.mImageCollectPaperSizeInfo.setEllipsize(TextUtils.TruncateAt.END);
         this.mImageCollectPaperSizeInfo.setText(getDocumentSizeText());
-        this.mImageCollectPalletButton = (Button) this.mImageCollectPreviewLayout.findViewById(C2135R.C2137id.ImageCollectPalletButton);
+        this.mImageCollectPalletButton = (Button) this.mImageCollectPreviewLayout.findViewById(R.C2137id.ImageCollectPalletButton);
         this.mImageCollectPalletButton.setOnClickListener(this);
         this.mImageCollectPalletButton.setVisibility(4);
-        this.mImageCollectSwitchLayout = (LinearLayout) findViewById(C2135R.C2137id.ImageCollectSwitchLayout);
-        this.mImageCollectSwitch = (RadioGroup) findViewById(C2135R.C2137id.ImageCollectSwitch);
-        this.mImageCollectSwitchLeft = (RadioButton) findViewById(C2135R.C2137id.ImageCollectSwitchLeft);
+        this.mImageCollectSwitchLayout = (LinearLayout) findViewById(R.C2137id.ImageCollectSwitchLayout);
+        this.mImageCollectSwitch = (RadioGroup) findViewById(R.C2137id.ImageCollectSwitch);
+        this.mImageCollectSwitchLeft = (RadioButton) findViewById(R.C2137id.ImageCollectSwitchLeft);
         this.mImageCollectSwitchLeft.setOnClickListener(this);
-        this.mImageCollectSwitchMiddle = (RadioButton) findViewById(C2135R.C2137id.ImageCollectSwitchMiddle);
+        this.mImageCollectSwitchMiddle = (RadioButton) findViewById(R.C2137id.ImageCollectSwitchMiddle);
         this.mImageCollectSwitchMiddle.setOnClickListener(this);
-        this.mImageCollectSwitchRight = (RadioButton) findViewById(C2135R.C2137id.ImageCollectSwitchRight);
+        this.mImageCollectSwitchRight = (RadioButton) findViewById(R.C2137id.ImageCollectSwitchRight);
         this.mImageCollectSwitchRight.setOnClickListener(this);
-        this.mImageCollectPalletLayout = (LinearLayout) findViewById(C2135R.C2137id.ImageCollectPalletLayout);
-        this.mImageCollectAdjustmentBrightness = (LinearLayout) findViewById(C2135R.C2137id.ImageCollectAdjustmentBrightness);
-        this.mImageCollectAdjustmentBrightnessTitle = (TextView) this.mImageCollectAdjustmentBrightness.findViewById(C2135R.C2137id.AdjustmentBarTitle);
-        this.mImageCollectAdjustmentBrightnessTitle.setText(C2135R.string.brightness);
-        this.mImageCollectAdjustmentBrightnessSeekBar = (SeekBar) this.mImageCollectAdjustmentBrightness.findViewById(C2135R.C2137id.AdjustmentBarSeekBar);
+        this.mImageCollectPalletLayout = (LinearLayout) findViewById(R.C2137id.ImageCollectPalletLayout);
+        this.mImageCollectAdjustmentBrightness = (LinearLayout) findViewById(R.C2137id.ImageCollectAdjustmentBrightness);
+        this.mImageCollectAdjustmentBrightnessTitle = (TextView) this.mImageCollectAdjustmentBrightness.findViewById(R.C2137id.AdjustmentBarTitle);
+        this.mImageCollectAdjustmentBrightnessTitle.setText(R.string.brightness);
+        this.mImageCollectAdjustmentBrightnessSeekBar = (SeekBar) this.mImageCollectAdjustmentBrightness.findViewById(R.C2137id.AdjustmentBarSeekBar);
         this.mImageCollectAdjustmentBrightnessSeekBar.setOnSeekBarChangeListener(this);
-        this.mImageCollectAdjustmentContrast = (LinearLayout) findViewById(C2135R.C2137id.ImageCollectAdjustmentContrast);
-        this.mImageCollectAdjustmentContrastTitle = (TextView) this.mImageCollectAdjustmentContrast.findViewById(C2135R.C2137id.AdjustmentBarTitle);
-        this.mImageCollectAdjustmentContrastTitle.setText(C2135R.string.contrast);
-        this.mImageCollectAdjustmentContrastSeekBar = (SeekBar) this.mImageCollectAdjustmentContrast.findViewById(C2135R.C2137id.AdjustmentBarSeekBar);
+        this.mImageCollectAdjustmentContrast = (LinearLayout) findViewById(R.C2137id.ImageCollectAdjustmentContrast);
+        this.mImageCollectAdjustmentContrastTitle = (TextView) this.mImageCollectAdjustmentContrast.findViewById(R.C2137id.AdjustmentBarTitle);
+        this.mImageCollectAdjustmentContrastTitle.setText(R.string.contrast);
+        this.mImageCollectAdjustmentContrastSeekBar = (SeekBar) this.mImageCollectAdjustmentContrast.findViewById(R.C2137id.AdjustmentBarSeekBar);
         this.mImageCollectAdjustmentContrastSeekBar.setOnSeekBarChangeListener(this);
-        this.mImageCollectAdjustmentSaturation = (LinearLayout) findViewById(C2135R.C2137id.ImageCollectAdjustmentSaturation);
-        this.mImageCollectAdjustmentSaturationTitle = (TextView) this.mImageCollectAdjustmentSaturation.findViewById(C2135R.C2137id.AdjustmentBarTitle);
-        this.mImageCollectAdjustmentSaturationTitle.setText(C2135R.string.saturation);
-        this.mImageCollectAdjustmentSaturationSeekBar = (SeekBar) this.mImageCollectAdjustmentSaturation.findViewById(C2135R.C2137id.AdjustmentBarSeekBar);
+        this.mImageCollectAdjustmentSaturation = (LinearLayout) findViewById(R.C2137id.ImageCollectAdjustmentSaturation);
+        this.mImageCollectAdjustmentSaturationTitle = (TextView) this.mImageCollectAdjustmentSaturation.findViewById(R.C2137id.AdjustmentBarTitle);
+        this.mImageCollectAdjustmentSaturationTitle.setText(R.string.saturation);
+        this.mImageCollectAdjustmentSaturationSeekBar = (SeekBar) this.mImageCollectAdjustmentSaturation.findViewById(R.C2137id.AdjustmentBarSeekBar);
         this.mImageCollectAdjustmentSaturationSeekBar.setOnSeekBarChangeListener(this);
-        this.mImageCollectAdjustmentSwitch = (RadioGroup) findViewById(C2135R.C2137id.AdjustmentModeSwitch);
-        this.mImageCollectAdjustmentSwitchLeft = (RadioButton) findViewById(C2135R.C2137id.AdjustmentModeSwitchLeft);
+        this.mImageCollectAdjustmentSwitch = (RadioGroup) findViewById(R.C2137id.AdjustmentModeSwitch);
+        this.mImageCollectAdjustmentSwitchLeft = (RadioButton) findViewById(R.C2137id.AdjustmentModeSwitchLeft);
         this.mImageCollectAdjustmentSwitchLeft.setOnClickListener(this);
-        this.mImageCollectAdjustmentSwitchRight = (RadioButton) findViewById(C2135R.C2137id.AdjustmentModeSwitchRight);
+        this.mImageCollectAdjustmentSwitchRight = (RadioButton) findViewById(R.C2137id.AdjustmentModeSwitchRight);
         this.mImageCollectAdjustmentSwitchRight.setOnClickListener(this);
-        this.mCropImageHeader = findViewById(C2135R.C2137id.navigation_bar);
-        this.mToolBartLayout = (LinearLayout) findViewById(C2135R.C2137id.tool_bar);
-        this.mToolbarCropImage = (LinearLayout) this.mToolBartLayout.findViewById(C2135R.C2137id.ImageCollectToolbarCropImage);
-        this.mToolbarEnhanceText = (LinearLayout) this.mToolBartLayout.findViewById(C2135R.C2137id.ImageCollectToolbarEnhanceText);
-        this.mToolbarColorAdjustment = (LinearLayout) this.mToolBartLayout.findViewById(C2135R.C2137id.ImageCollectToolbarColorAdjustment);
+        this.mCropImageHeader = findViewById(R.C2137id.navigation_bar);
+        this.mToolBartLayout = (LinearLayout) findViewById(R.C2137id.tool_bar);
+        this.mToolbarCropImage = (LinearLayout) this.mToolBartLayout.findViewById(R.C2137id.ImageCollectToolbarCropImage);
+        this.mToolbarEnhanceText = (LinearLayout) this.mToolBartLayout.findViewById(R.C2137id.ImageCollectToolbarEnhanceText);
+        this.mToolbarColorAdjustment = (LinearLayout) this.mToolBartLayout.findViewById(R.C2137id.ImageCollectToolbarColorAdjustment);
         this.mCropImageHeader.setOnTouchListener(this);
         this.mCropImageHeader.setOnClickListener(this);
         this.mToolbarCropImage.setOnTouchListener(this);
@@ -343,7 +342,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
                 if (cropImageActivity.mCropImageMessageShow) {
                     EpLog.m69d("TOAST");
                     cropImageActivity.mCropImageMessageShow = false;
-                    cropImageActivity.ToastMessage(cropImageActivity.getString(C2135R.string.crop_image_message));
+                    cropImageActivity.ToastMessage(cropImageActivity.getString(R.string.crop_image_message));
                 }
             }
         }
@@ -381,8 +380,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onDestroy() {
+    protected void onDestroy() {
         releaseResource();
         super.onDestroy();
     }
@@ -415,18 +413,15 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onSaveInstanceState(Bundle bundle) {
+    protected void onSaveInstanceState(Bundle bundle) {
         super.onSaveInstanceState(bundle);
     }
 
-    /* access modifiers changed from: protected */
-    public void onRestoreInstanceState(Bundle bundle) {
+    protected void onRestoreInstanceState(Bundle bundle) {
         super.onRestoreInstanceState(bundle);
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         if (i == 3) {
             GetPaperInfo();
             this.mImageCollectPaperSizeInfo.setText(getDocumentSizeText());
@@ -438,60 +433,60 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
 
     public void onClick(View view) {
         switch (view.getId()) {
-            case C2135R.C2137id.AdjustmentModeSwitchLeft /*2131230725*/:
-                if (this.mImageCollectAdjustmentSwitchId != C2135R.C2137id.AdjustmentModeSwitchLeft) {
-                    this.mImageCollectAdjustmentSwitchId = C2135R.C2137id.AdjustmentModeSwitchLeft;
+            case R.C2137id.AdjustmentModeSwitchLeft /*2131230725*/:
+                if (this.mImageCollectAdjustmentSwitchId != R.C2137id.AdjustmentModeSwitchLeft) {
+                    this.mImageCollectAdjustmentSwitchId = R.C2137id.AdjustmentModeSwitchLeft;
                     AdjustmentModeSwitchALL();
                     return;
                 }
                 return;
-            case C2135R.C2137id.AdjustmentModeSwitchRight /*2131230726*/:
-                if (this.mImageCollectAdjustmentSwitchId != C2135R.C2137id.AdjustmentModeSwitchRight) {
-                    this.mImageCollectAdjustmentSwitchId = C2135R.C2137id.AdjustmentModeSwitchRight;
+            case R.C2137id.AdjustmentModeSwitchRight /*2131230726*/:
+                if (this.mImageCollectAdjustmentSwitchId != R.C2137id.AdjustmentModeSwitchRight) {
+                    this.mImageCollectAdjustmentSwitchId = R.C2137id.AdjustmentModeSwitchRight;
                     AdjustmentModeSwitchPART();
                     return;
                 }
                 return;
-            case C2135R.C2137id.ImageCollectPalletButton /*2131230737*/:
+            case R.C2137id.ImageCollectPalletButton /*2131230737*/:
                 palletShow();
                 return;
-            case C2135R.C2137id.ImageCollectSwitchLeft /*2131230744*/:
-                if (this.mImageCollectSwitchId != C2135R.C2137id.ImageCollectSwitchLeft) {
-                    this.mImageCollectSwitchId = C2135R.C2137id.ImageCollectSwitchLeft;
+            case R.C2137id.ImageCollectSwitchLeft /*2131230744*/:
+                if (this.mImageCollectSwitchId != R.C2137id.ImageCollectSwitchLeft) {
+                    this.mImageCollectSwitchId = R.C2137id.ImageCollectSwitchLeft;
                     ImageCollectSwitchPWC(1);
                     return;
                 }
                 return;
-            case C2135R.C2137id.ImageCollectSwitchMiddle /*2131230745*/:
-                if (this.mImageCollectSwitchId != C2135R.C2137id.ImageCollectSwitchMiddle) {
-                    this.mImageCollectSwitchId = C2135R.C2137id.ImageCollectSwitchMiddle;
+            case R.C2137id.ImageCollectSwitchMiddle /*2131230745*/:
+                if (this.mImageCollectSwitchId != R.C2137id.ImageCollectSwitchMiddle) {
+                    this.mImageCollectSwitchId = R.C2137id.ImageCollectSwitchMiddle;
                     ImageCollectSwitchPWC(2);
                     return;
                 }
                 return;
-            case C2135R.C2137id.ImageCollectSwitchRight /*2131230746*/:
-                if (this.mImageCollectSwitchId != C2135R.C2137id.ImageCollectSwitchRight) {
-                    this.mImageCollectSwitchId = C2135R.C2137id.ImageCollectSwitchRight;
+            case R.C2137id.ImageCollectSwitchRight /*2131230746*/:
+                if (this.mImageCollectSwitchId != R.C2137id.ImageCollectSwitchRight) {
+                    this.mImageCollectSwitchId = R.C2137id.ImageCollectSwitchRight;
                     ImageCollectSwitchCROP();
                     return;
                 }
                 return;
-            case C2135R.C2137id.color_adjustment_button /*2131230932*/:
+            case R.C2137id.color_adjustment_button /*2131230932*/:
                 activityModeChange(2);
                 InitBCSC();
                 return;
-            case C2135R.C2137id.document_size_button /*2131230996*/:
+            case R.C2137id.document_size_button /*2131230996*/:
                 this.mImageCollectView.MessageOff();
                 setDocumentSize();
                 return;
-            case C2135R.C2137id.execute_button /*2131231032*/:
+            case R.C2137id.execute_button /*2131231032*/:
                 int i = this.mActivityMode;
                 if (i == 0) {
                     this.mImageCollectView.MessageOff();
                     mHandler.sendEmptyMessage(MSG_PREVIEW_CROP);
                     return;
                 } else if (i == 1) {
-                    MessageBox(101, -1, C2135R.string.finish_adjustment_message, MSG_PREVIEW_PRINT_PREVIEW_EXECUTE);
+                    MessageBox(101, -1, R.string.finish_adjustment_message, MSG_PREVIEW_PRINT_PREVIEW_EXECUTE);
                     return;
                 } else if (i == 2) {
                     boolean z = false;
@@ -502,7 +497,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
                         z = true;
                     }
                     if (z) {
-                        MessageBox(101, -1, (int) C2135R.string.finish_color_adjustment_message, (int) MSG_SDIC_BCSC_FIX_PROC, (int) MSG_SDIC_BCSC_FIX_CANCEL);
+                        MessageBox(101, -1, (int) R.string.finish_color_adjustment_message, (int) MSG_SDIC_BCSC_FIX_PROC, (int) MSG_SDIC_BCSC_FIX_CANCEL);
                         return;
                     }
                     activityModeChange(1);
@@ -512,10 +507,10 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
                 } else {
                     return;
                 }
-            case C2135R.C2137id.reset_button /*2131231403*/:
-                MessageBox(101, -1, C2135R.string.reset_color_adjustment_message, MSG_SDIC_BCSC_RESET);
+            case R.C2137id.reset_button /*2131231403*/:
+                MessageBox(101, -1, R.string.reset_color_adjustment_message, MSG_SDIC_BCSC_RESET);
                 return;
-            case C2135R.C2137id.save_button /*2131231436*/:
+            case R.C2137id.save_button /*2131231436*/:
                 mHandler.sendEmptyMessage(MSG_PREVIEW_SAVE_EXECUTE);
                 return;
             default:
@@ -712,7 +707,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
                 }).start();
                 return;
             case MSG_SDIC_PWC_FINISH /*812*/:
-                this.mImageCollectSwitchId = C2135R.C2137id.ImageCollectSwitchLeft;
+                this.mImageCollectSwitchId = R.C2137id.ImageCollectSwitchLeft;
                 this.mImageCollectSwitch.check(this.mImageCollectSwitchId);
                 this.mImageType = 2;
                 activityModeChange(1);
@@ -745,7 +740,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
             case MSG_PREVIEW_SAVE_EXECUTE /*831*/:
                 if (ActivityRequestPermissions.isRuntimePermissionSupported()) {
                     String[] strArr = {"android.permission.WRITE_EXTERNAL_STORAGE"};
-                    ActivityRequestPermissions.Permission permission = new ActivityRequestPermissions.Permission(strArr[0], new String[]{getString(C2135R.string.permission_dialog_title), getString(C2135R.string.permission_dialog_title)}, new String[]{ActivityRequestPermissions.DialogParameter.setMessage2((Context) this, getString(C2135R.string.permission_dialog_message_storage)), ActivityRequestPermissions.DialogParameter.setMessage3A((Context) this, getString(C2135R.string.permission_dialog_message_storage), getString(C2135R.string.permission_function_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))});
                     if (!ActivityRequestPermissions.checkPermission(this, strArr)) {
                         ActivityRequestPermissions.requestPermission((Activity) this, permission, 4);
                         return;
@@ -757,9 +752,9 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
                 mHandler.sendEmptyMessage(MSG_PREVIEW_LOAD_DIALOG_DISMISS);
                 String GetSavePath = this.mImageCollect.GetSavePath(false);
                 if (GetSavePath != null) {
-                    str = String.format(getString(C2135R.string.image_save_message), new Object[]{GetSavePath});
+                    str = String.format(getString(R.string.image_save_message), new Object[]{GetSavePath});
                 } else {
-                    str = getString(C2135R.string.file_save_error_message);
+                    str = getString(R.string.file_save_error_message);
                 }
                 MessageBox(102, -1, str, -1, -1);
                 return;
@@ -824,11 +819,11 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
     }
 
     private void AdjustmentModeSwitchPART() {
-        AdjustmentModeProc(true, true, C2135R.string.start_adjustment_partly_message, 3);
+        AdjustmentModeProc(true, true, R.string.start_adjustment_partly_message, 3);
     }
 
     private void AdjustmentModeSwitchEXECUTE() {
-        if (this.mImageCollectAdjustmentSwitch.getCheckedRadioButtonId() == C2135R.C2137id.AdjustmentModeSwitchRight) {
+        if (this.mImageCollectAdjustmentSwitch.getCheckedRadioButtonId() == R.C2137id.AdjustmentModeSwitchRight) {
             AdjustmentModeProc(false, true, 0, 3);
         } else {
             AdjustmentModeProc(true, true, 0, 2);
@@ -852,7 +847,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
         this.mImageCollect.ResetPreviewImageBCSC();
         this.mBcscType = this.mImageType;
         this.mImageCollect.MakePreviewImageBCSC_Init(this.mBcscType, true);
-        if (this.mImageCollectAdjustmentSwitch.getCheckedRadioButtonId() == C2135R.C2137id.AdjustmentModeSwitchRight) {
+        if (this.mImageCollectAdjustmentSwitch.getCheckedRadioButtonId() == R.C2137id.AdjustmentModeSwitchRight) {
             this.mImageCollectView.SetViewMode(3);
         } else {
             this.mImageCollectView.SetViewMode(2);
@@ -907,7 +902,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
     }
 
     private void PreviewImageBCSC() {
-        if (this.mImageCollectAdjustmentSwitch.getCheckedRadioButtonId() == C2135R.C2137id.AdjustmentModeSwitchLeft) {
+        if (this.mImageCollectAdjustmentSwitch.getCheckedRadioButtonId() == R.C2137id.AdjustmentModeSwitchLeft) {
             this.mMaskType = 7;
         } else {
             this.mMaskType = 8;
@@ -934,8 +929,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void setDocumentSize() {
+    protected void setDocumentSize() {
         startActivityForResult(new Intent(this, DocumentSizeSettingActivity.class), 3);
     }
 
@@ -1072,12 +1066,12 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
             };
         }
         if (i == 101) {
-            builder.setPositiveButton(C2135R.string.str_yes, r5);
-            builder.setNegativeButton(C2135R.string.str_no, r4);
+            builder.setPositiveButton(R.string.str_yes, r5);
+            builder.setNegativeButton(R.string.str_no, r4);
         } else if (i == 102) {
-            builder.setPositiveButton(C2135R.string.str_ok, r5);
+            builder.setPositiveButton(R.string.str_ok, r5);
         } else if (i == 103) {
-            builder.setNegativeButton(C2135R.string.str_cancel, r4);
+            builder.setNegativeButton(R.string.str_cancel, r4);
         }
         this.mMessageDialog = builder.create();
         this.mMessageDialog.show();
@@ -1120,14 +1114,14 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
             this.mImageCollectPalletButton.setVisibility(4);
             this.mImageCollectSwitchLayout.setVisibility(8);
             this.mImageCollectPalletLayout.setVisibility(8);
-            setTitle(C2135R.string.crop_image_title);
+            setTitle(R.string.crop_image_title);
             this.mToolbarCropImage.setVisibility(0);
             this.mToolbarEnhanceText.setVisibility(8);
             this.mToolbarColorAdjustment.setVisibility(8);
-            this.mButtonDocSize = (Button) this.mToolbarCropImage.findViewById(C2135R.C2137id.document_size_button);
+            this.mButtonDocSize = (Button) this.mToolbarCropImage.findViewById(R.C2137id.document_size_button);
             this.mButtonDocSize.setOnClickListener(this);
-            this.mButtonExecute = (Button) this.mToolbarCropImage.findViewById(C2135R.C2137id.execute_button);
-            this.mButtonExecute.setText(C2135R.string.execute_button);
+            this.mButtonExecute = (Button) this.mToolbarCropImage.findViewById(R.C2137id.execute_button);
+            this.mButtonExecute.setText(R.string.execute_button);
             this.mButtonExecute.setOnClickListener(this);
             this.mImageCollectView.SetViewMode(0);
             boolean[] zArr = this.mSaveApprovalTable;
@@ -1142,16 +1136,16 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
             this.mImageCollectPalletButton.setVisibility(4);
             this.mImageCollectSwitchLayout.setVisibility(0);
             this.mImageCollectPalletLayout.setVisibility(8);
-            setTitle(C2135R.string.enhance_text_title);
+            setTitle(R.string.enhance_text_title);
             this.mToolbarCropImage.setVisibility(8);
             this.mToolbarEnhanceText.setVisibility(0);
             this.mToolbarColorAdjustment.setVisibility(8);
-            this.mButtonSave = (Button) this.mToolbarEnhanceText.findViewById(C2135R.C2137id.save_button);
+            this.mButtonSave = (Button) this.mToolbarEnhanceText.findViewById(R.C2137id.save_button);
             this.mButtonSave.setOnClickListener(this);
-            this.mButtonColorAdjustment = (Button) this.mToolbarEnhanceText.findViewById(C2135R.C2137id.color_adjustment_button);
+            this.mButtonColorAdjustment = (Button) this.mToolbarEnhanceText.findViewById(R.C2137id.color_adjustment_button);
             this.mButtonColorAdjustment.setOnClickListener(this);
-            this.mButtonExecute = (Button) this.mToolbarEnhanceText.findViewById(C2135R.C2137id.execute_button);
-            this.mButtonExecute.setText(C2135R.string.print_preview_button);
+            this.mButtonExecute = (Button) this.mToolbarEnhanceText.findViewById(R.C2137id.execute_button);
+            this.mButtonExecute.setText(R.string.print_preview_button);
             this.mButtonExecute.setOnClickListener(this);
             this.mImageCollectView.SetViewMode(1);
         } else if (i == 2) {
@@ -1161,17 +1155,17 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
             this.mImageCollectPalletButton.setText("▼");
             this.mImageCollectSwitchLayout.setVisibility(8);
             this.mImageCollectPalletLayout.setVisibility(0);
-            setTitle(C2135R.string.color_adjustment_title);
+            setTitle(R.string.color_adjustment_title);
             this.mToolbarCropImage.setVisibility(8);
             this.mToolbarEnhanceText.setVisibility(8);
             this.mToolbarColorAdjustment.setVisibility(0);
-            this.mButtonReset = (Button) this.mToolbarColorAdjustment.findViewById(C2135R.C2137id.reset_button);
+            this.mButtonReset = (Button) this.mToolbarColorAdjustment.findViewById(R.C2137id.reset_button);
             this.mButtonReset.setOnClickListener(this);
             UiCommon.setButtonEnabled(this.mButtonReset, false);
-            this.mButtonExecute = (Button) this.mToolbarColorAdjustment.findViewById(C2135R.C2137id.execute_button);
-            this.mButtonExecute.setText(C2135R.string.execute_button);
+            this.mButtonExecute = (Button) this.mToolbarColorAdjustment.findViewById(R.C2137id.execute_button);
+            this.mButtonExecute.setText(R.string.execute_button);
             this.mButtonExecute.setOnClickListener(this);
-            this.mImageCollectAdjustmentSwitchId = C2135R.C2137id.AdjustmentModeSwitchLeft;
+            this.mImageCollectAdjustmentSwitchId = R.C2137id.AdjustmentModeSwitchLeft;
             this.mImageCollectAdjustmentSwitch.check(this.mImageCollectAdjustmentSwitchId);
             AdjustmentModeSwitchALL();
             this.mImageCollectView.SetViewMode(2);
@@ -1188,7 +1182,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
     }
 
     private void showDialog(String str) {
-        this.mProgressDialog = DialogProgress.newInstance(str, 0, getString(C2135R.string.processing_image_message));
+        this.mProgressDialog = DialogProgress.newInstance(str, 0, getString(R.string.processing_image_message));
         this.mProgressDialog.setCancelable(false);
         this.mProgressDialog.show(getSupportFragmentManager(), str);
     }

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

@@ -38,22 +38,21 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
     private Button mWidthInc;
     private TextView mWidthText;
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        setContentView((int) C2135R.layout.activity_document_size_edit);
-        setActionBar((int) C2135R.string.document_size_edit_title, true);
-        this.mScale = (RadioGroup) findViewById(C2135R.C2137id.document_size_scale);
+        setContentView((int) R.layout.activity_document_size_edit);
+        setActionBar((int) R.string.document_size_edit_title, true);
+        this.mScale = (RadioGroup) findViewById(R.C2137id.document_size_scale);
         this.mScale.setOnCheckedChangeListener(this);
-        this.mWidthText = (TextView) findViewById(C2135R.C2137id.width);
-        this.mWidthDec = (Button) findViewById(C2135R.C2137id.width_dec_button);
+        this.mWidthText = (TextView) findViewById(R.C2137id.width);
+        this.mWidthDec = (Button) findViewById(R.C2137id.width_dec_button);
         this.mWidthDec.setOnClickListener(this);
-        this.mWidthInc = (Button) findViewById(C2135R.C2137id.width_inc_button);
+        this.mWidthInc = (Button) findViewById(R.C2137id.width_inc_button);
         this.mWidthInc.setOnClickListener(this);
-        this.mHeightText = (TextView) findViewById(C2135R.C2137id.height);
-        this.mHeightDec = (Button) findViewById(C2135R.C2137id.height_dec_button);
+        this.mHeightText = (TextView) findViewById(R.C2137id.height);
+        this.mHeightDec = (Button) findViewById(R.C2137id.height_dec_button);
         this.mHeightDec.setOnClickListener(this);
-        this.mHeightInc = (Button) findViewById(C2135R.C2137id.height_inc_button);
+        this.mHeightInc = (Button) findViewById(R.C2137id.height_inc_button);
         this.mHeightInc.setOnClickListener(this);
         LongTapRepeatAdapter.bless(this.mWidthDec);
         LongTapRepeatAdapter.bless(this.mWidthInc);
@@ -62,8 +61,7 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
         setDocumentSize();
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
         if (isFinishing()) {
             deleteLongTapMessage();
@@ -72,16 +70,16 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
 
     public void onClick(View view) {
         switch (view.getId()) {
-            case C2135R.C2137id.height_dec_button /*2131231100*/:
+            case R.C2137id.height_dec_button /*2131231100*/:
                 decHeight();
                 return;
-            case C2135R.C2137id.height_inc_button /*2131231101*/:
+            case R.C2137id.height_inc_button /*2131231101*/:
                 incHeight();
                 return;
-            case C2135R.C2137id.width_dec_button /*2131231633*/:
+            case R.C2137id.width_dec_button /*2131231633*/:
                 decWidth();
                 return;
-            case C2135R.C2137id.width_inc_button /*2131231634*/:
+            case R.C2137id.width_inc_button /*2131231634*/:
                 incWidth();
                 return;
             default:
@@ -91,10 +89,10 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
 
     public void onCheckedChanged(RadioGroup radioGroup, int i) {
         if (i != -1) {
-            if (i == C2135R.C2137id.inch_button) {
+            if (i == R.C2137id.inch_button) {
                 this.mInch = true;
                 convertDocumentSize();
-            } else if (i == C2135R.C2137id.mm_button) {
+            } else if (i == R.C2137id.mm_button) {
                 this.mInch = false;
                 convertDocumentSize();
             }
@@ -105,10 +103,10 @@ 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(C2135R.C2137id.et_document_size)).setText(this.mDocumentSizeInfo.getDocSizeName(this));
+        ((EditText) findViewById(R.C2137id.et_document_size)).setText(this.mDocumentSizeInfo.getDocSizeName(this));
         this.mInch = this.mDocumentSizeInfo.getScaleId() == 2;
         if (this.mInch) {
-            this.mScale.check(C2135R.C2137id.inch_button);
+            this.mScale.check(R.C2137id.inch_button);
             this.mWidth = this.mDocumentSizeInfo.getWidth();
             double roundDownValue = getRoundDownValue(this.mWidth, 1);
             TextView textView = this.mWidthText;
@@ -119,7 +117,7 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
             textView2.setText(String.valueOf(roundDownValue2) + " in");
             return;
         }
-        this.mScale.check(C2135R.C2137id.mm_button);
+        this.mScale.check(R.C2137id.mm_button);
         this.mWidth = this.mDocumentSizeInfo.getWidth();
         TextView textView3 = this.mWidthText;
         textView3.setText(String.valueOf((int) getRoundDownValue(this.mWidth, 0)) + " mm");
@@ -262,9 +260,9 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
     }
 
     private void checkDocumentSize() {
-        String obj = ((EditText) findViewById(C2135R.C2137id.et_document_size)).getText().toString();
+        String obj = ((EditText) findViewById(R.C2137id.et_document_size)).getText().toString();
         if (obj.isEmpty()) {
-            SimpleMessageDialogFragment.newInstance(C2135R.string.no_name_documentsize_message).show(getSupportFragmentManager(), "error-dialog");
+            SimpleMessageDialogFragment.newInstance(R.string.no_name_documentsize_message).show(getSupportFragmentManager(), "error-dialog");
             return;
         }
         this.mDocumentSizeInfo.setDocSizeName(obj);
@@ -273,7 +271,7 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
         this.mDocumentSizeInfo.setHeight(getRoundDownValue(this.mHeight, 1));
         RegistedDocumentSizeList instance = RegistedDocumentSizeList.getInstance(this);
         if (instance.isExistDocumentSizeName(obj, this.mPosition)) {
-            SimpleMessageDialogFragment.newInstance(C2135R.string.exist_documentsize_message).show(getSupportFragmentManager(), "error-dialog");
+            SimpleMessageDialogFragment.newInstance(R.string.exist_documentsize_message).show(getSupportFragmentManager(), "error-dialog");
             return;
         }
         int i = this.mPosition;
@@ -296,21 +294,20 @@ public class DocumentSizeEditActivity extends ActivityIACommon implements View.O
 
     public boolean onCreateOptionsMenu(Menu menu) {
         if (this.mDocumentSizeInfo.getPaperId() == -2) {
-            getMenuInflater().inflate(C2135R.C2138menu.menu_done, menu);
+            getMenuInflater().inflate(R.C2138menu.menu_done, menu);
         }
         return super.onCreateOptionsMenu(menu);
     }
 
     public boolean onOptionsItemSelected(MenuItem menuItem) {
-        if (menuItem.getItemId() != C2135R.C2137id.menuSettingsDone) {
+        if (menuItem.getItemId() != R.C2137id.menuSettingsDone) {
             return super.onOptionsItemSelected(menuItem);
         }
         checkDocumentSize();
         return true;
     }
 
-    /* access modifiers changed from: protected */
-    public void deleteLongTapMessage() {
+    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);

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

@@ -36,12 +36,11 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
     public void doNegativeClick(int i) {
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        setContentView((int) C2135R.layout.activity_document_size_setting);
-        setActionBar((int) C2135R.string.document_size_title, true);
-        this.mListView = (ListView) findViewById(C2135R.C2137id.docsize_list);
+        setContentView((int) R.layout.activity_document_size_setting);
+        setActionBar((int) R.string.document_size_title, true);
+        this.mListView = (ListView) findViewById(R.C2137id.docsize_list);
         this.mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
                 DocumentSizeSettingActivity documentSizeSettingActivity = DocumentSizeSettingActivity.this;
@@ -50,74 +49,73 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
         });
         this.mSelectListAdapter = new SelectListAdapter();
         this.mListView.setAdapter(this.mSelectListAdapter);
-        this.mSelect = (Button) findViewById(C2135R.C2137id.select_button);
+        this.mSelect = (Button) findViewById(R.C2137id.select_button);
         this.mSelect.setOnClickListener(this);
-        this.mEdit = (Button) findViewById(C2135R.C2137id.edit_button);
+        this.mEdit = (Button) findViewById(R.C2137id.edit_button);
         this.mEdit.setOnClickListener(this);
-        this.mDelete = (Button) findViewById(C2135R.C2137id.delete_button);
+        this.mDelete = (Button) findViewById(R.C2137id.delete_button);
         this.mDelete.setOnClickListener(this);
-        this.mAdd = (Button) findViewById(C2135R.C2137id.add_button);
+        this.mAdd = (Button) findViewById(R.C2137id.add_button);
         this.mAdd.setOnClickListener(this);
-        this.mClear = (Button) findViewById(C2135R.C2137id.clear_button);
+        this.mClear = (Button) findViewById(R.C2137id.clear_button);
         this.mClear.setOnClickListener(this);
     }
 
-    /* access modifiers changed from: protected */
-    public void onStart() {
+    protected void onStart() {
         super.onStart();
         this.mSelectListAdapter.reload();
     }
 
     public void onClick(View view) {
         switch (view.getId()) {
-            case C2135R.C2137id.add_button /*2131230807*/:
+            case R.C2137id.add_button /*2131230807*/:
                 addNewDocumentSize();
                 break;
-            case C2135R.C2137id.clear_button /*2131230914*/:
+            case R.C2137id.clear_button /*2131230914*/:
                 resetDocumentSizeList();
                 break;
-            case C2135R.C2137id.delete_button /*2131230979*/:
+            case R.C2137id.delete_button /*2131230979*/:
                 deleteDocumentSize();
                 break;
-            case C2135R.C2137id.edit_button /*2131231009*/:
+            case R.C2137id.edit_button /*2131231009*/:
                 editDocumentSize(this.mSelectPos);
                 break;
-            case C2135R.C2137id.select_button /*2131231472*/:
+            case R.C2137id.select_button /*2131231472*/:
                 selectDocumentSize(this.mSelectPos);
                 break;
         }
-        findViewById(C2135R.C2137id.document_size_menu).setVisibility(4);
+        findViewById(R.C2137id.document_size_menu).setVisibility(4);
     }
 
     public void onSelectDocsizeList(Object obj, View view, int i) {
         this.mSelectPos = i;
-        if (findViewById(C2135R.C2137id.document_size_menu).getVisibility() != 0) {
+        if (findViewById(R.C2137id.document_size_menu).getVisibility() != 0) {
             DocumentSizeInfo documentSizeInfo = (DocumentSizeInfo) obj;
-            ((TextView) findViewById(C2135R.C2137id.menu_text)).setText(documentSizeInfo.getDocSizeName(this));
+            ((TextView) findViewById(R.C2137id.menu_text)).setText(documentSizeInfo.getDocSizeName(this));
             boolean z = true;
             this.mEdit.setEnabled(documentSizeInfo.getPaperId() == -2);
             if (documentSizeInfo.getPaperId() == -1) {
                 z = false;
             }
             this.mDelete.setEnabled(z);
-            findViewById(C2135R.C2137id.document_size_menu).setVisibility(0);
+            findViewById(R.C2137id.document_size_menu).setVisibility(0);
             return;
         }
-        findViewById(C2135R.C2137id.document_size_menu).setVisibility(4);
+        findViewById(R.C2137id.document_size_menu).setVisibility(4);
     }
 
     private void addNewDocumentSize() {
         DocumentSizeInfo documentSizeInfo = new DocumentSizeInfo();
         String country = Locale.getDefault().getCountry();
         if (country.equals(Locale.US.getCountry()) || country.equals(Locale.CANADA.getCountry())) {
-            documentSizeInfo.setDocSizeName(getString(C2135R.string.new_document_size));
+            documentSizeInfo.setDocSizeName(getString(R.string.new_document_size));
             documentSizeInfo.setScaleId(2);
             documentSizeInfo.setWidth(8.5d);
             documentSizeInfo.setHeight(11.0d);
             documentSizeInfo.setPaperId(-2);
             documentSizeInfo.setDocSizeNameId(0);
         } else {
-            documentSizeInfo.setDocSizeName(getString(C2135R.string.new_document_size));
+            documentSizeInfo.setDocSizeName(getString(R.string.new_document_size));
             documentSizeInfo.setScaleId(1);
             documentSizeInfo.setWidth(210.0d);
             documentSizeInfo.setHeight(297.0d);
@@ -144,7 +142,7 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
 
     private void deleteDocumentSize() {
         Bundle bundle = new Bundle();
-        bundle.putString("message", getString(C2135R.string.delete_documentsize_message));
+        bundle.putString("message", getString(R.string.delete_documentsize_message));
         bundle.putInt("id", this.ID_DIALOG_DELETE);
         NotifyDialogFragment notifyDialogFragment = new NotifyDialogFragment();
         notifyDialogFragment.setArguments(bundle);
@@ -153,7 +151,7 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
 
     private void resetDocumentSizeList() {
         Bundle bundle = new Bundle();
-        bundle.putString("message", getString(C2135R.string.reset_documentsize_message));
+        bundle.putString("message", getString(R.string.reset_documentsize_message));
         bundle.putInt("id", this.ID_DIALOG_RESET);
         NotifyDialogFragment notifyDialogFragment = new NotifyDialogFragment();
         notifyDialogFragment.setArguments(bundle);
@@ -200,15 +198,15 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
 
         public View getView(int i, View view, ViewGroup viewGroup) {
             if (view == null) {
-                view = DocumentSizeSettingActivity.this.getLayoutInflater().inflate(C2135R.layout.select_list_row, viewGroup, false);
+                view = DocumentSizeSettingActivity.this.getLayoutInflater().inflate(R.layout.select_list_row, viewGroup, false);
             }
             RegistedDocumentSizeList registedDocumentSizeList = this.mRegistedDocumentSizeList;
             if (registedDocumentSizeList == null) {
                 return view;
             }
             DocumentSizeInfo item = registedDocumentSizeList.getItem(i);
-            ((TextView) view.findViewById(C2135R.C2137id.docsize_name)).setText(item.getDocSizeName(DocumentSizeSettingActivity.this));
-            ImageView imageView = (ImageView) view.findViewById(C2135R.C2137id.current_docsize_image);
+            ((TextView) view.findViewById(R.C2137id.docsize_name)).setText(item.getDocSizeName(DocumentSizeSettingActivity.this));
+            ImageView imageView = (ImageView) view.findViewById(R.C2137id.current_docsize_image);
             if (this.mRegistedDocumentSizeList.isSelected(item)) {
                 imageView.setVisibility(0);
             } else {
@@ -236,12 +234,12 @@ public class DocumentSizeSettingActivity extends ActivityIACommon implements Vie
             final int i = getArguments().getInt("id");
             AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
             builder.setMessage(string);
-            builder.setPositiveButton(C2135R.string.yes_button, new DialogInterface.OnClickListener() {
+            builder.setPositiveButton(R.string.yes_button, new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
                     ((DocumentSizeSettingActivity) NotifyDialogFragment.this.getActivity()).doPositiveClick(i);
                 }
             });
-            builder.setNegativeButton(C2135R.string.no_button, new DialogInterface.OnClickListener() {
+            builder.setNegativeButton(R.string.no_button, new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
                     ((DocumentSizeSettingActivity) NotifyDialogFragment.this.getActivity()).doNegativeClick(i);
                 }

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

@@ -60,16 +60,15 @@ public class FolderSelectActivity extends ActivityIACommon implements View.OnCli
     public void onClick(View view) {
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        setContentView((int) C2135R.layout.activity_folder_select);
-        setActionBar((int) C2135R.string.folder_selector_title, true);
+        setContentView((int) R.layout.activity_folder_select);
+        setActionBar((int) R.string.folder_selector_title, true);
         mActivity = new WeakReference<>(this);
         mFolderSelectActivity = (FolderSelectActivity) mActivity.get();
-        this.mFolderSelectBase = (LinearLayout) findViewById(C2135R.C2137id.folder_select_base);
-        this.mFolderSelectCurrent = (LinearLayout) findViewById(C2135R.C2137id.folder_select_current);
-        this.mFolderSelectText = (TextView) findViewById(C2135R.C2137id.folder_select_text);
+        this.mFolderSelectBase = (LinearLayout) findViewById(R.C2137id.folder_select_base);
+        this.mFolderSelectCurrent = (LinearLayout) findViewById(R.C2137id.folder_select_current);
+        this.mFolderSelectText = (TextView) findViewById(R.C2137id.folder_select_text);
         this.mMenuControl = new MenuControl(this, 1);
         this.mRootFolder = Environment.getExternalStorageDirectory().getAbsolutePath();
         this.mItemDataList = new ArrayList<>();
@@ -77,7 +76,7 @@ public class FolderSelectActivity extends ActivityIACommon implements View.OnCli
         updateListView();
         if (ActivityRequestPermissions.isRuntimePermissionSupported()) {
             String[] strArr = {"android.permission.WRITE_EXTERNAL_STORAGE"};
-            ActivityRequestPermissions.Permission permission = new ActivityRequestPermissions.Permission(strArr[0], new String[]{getString(C2135R.string.permission_dialog_title), getString(C2135R.string.permission_dialog_title)}, new String[]{ActivityRequestPermissions.DialogParameter.setMessage2((Context) this, getString(C2135R.string.permission_dialog_message_storage)), ActivityRequestPermissions.DialogParameter.setMessage3A((Context) this, getString(C2135R.string.permission_dialog_message_storage), getString(C2135R.string.permission_function_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))});
             if (!ActivityRequestPermissions.checkPermission(this, strArr)) {
                 ActivityRequestPermissions.requestPermission((Activity) this, permission, 1);
                 return;
@@ -86,8 +85,7 @@ public class FolderSelectActivity extends ActivityIACommon implements View.OnCli
         initFolder();
     }
 
-    /* access modifiers changed from: package-private */
-    public void initFolder() {
+    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();
@@ -97,8 +95,7 @@ public class FolderSelectActivity extends ActivityIACommon implements View.OnCli
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         if (i == 1) {
             if (i2 != -1) {
@@ -141,7 +138,7 @@ public class FolderSelectActivity extends ActivityIACommon implements View.OnCli
     }
 
     public boolean onOptionsItemSelected(MenuItem menuItem) {
-        if (menuItem.getItemId() != C2135R.C2137id.f337ok) {
+        if (menuItem.getItemId() != R.C2137id.f337ok) {
             return super.onOptionsItemSelected(menuItem);
         }
         onActionbarMenuidOkClicked((View) null);

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

@@ -571,8 +571,7 @@ public class ImageCollectView extends View {
         return pointFArr;
     }
 
-    /* access modifiers changed from: protected */
-    public void onSizeChanged(int i, int i2, int i3, int i4) {
+    protected void onSizeChanged(int i, int i2, int i3, int i4) {
         int i5;
         Context context = this.mContext;
         if (context != null) {

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

@@ -63,8 +63,7 @@ class ImageFolderFile implements ImagePreviewFile, Serializable {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public boolean prepareImage(@NonNull Context context) {
+    private boolean prepareImage(@NonNull Context context) {
         this.mConvertFilename = null;
         deleteTemporaryFile();
         if (!ImageUtil.isHEIFFormat(this.mImageFolderFileName)) {

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

@@ -33,13 +33,11 @@ public class ImageFolderFileViewModel extends AndroidViewModel {
 
         public void setImageFolderFile(@NonNull final ImageFolderFile imageFolderFile) {
             new AsyncTask<Void, Void, ImageFolderFile>() {
-                /* access modifiers changed from: protected */
-                public void onPostExecute(ImageFolderFile imageFolderFile) {
+                protected void onPostExecute(ImageFolderFile imageFolderFile) {
                     ImageFolderFileViewModel.this.mImageFolderFileLiveData.setValue(imageFolderFile);
                 }
 
-                /* access modifiers changed from: protected */
-                public ImageFolderFile doInBackground(Void... voidArr) {
+                protected ImageFolderFile doInBackground(Void... voidArr) {
                     ImageFolderFile imageFolderFile = imageFolderFile;
                     if (imageFolderFile == null) {
                         return null;

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

@@ -55,11 +55,10 @@ public class ImagePreviewActivity extends ActivityIACommon {
         return true;
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        setContentView((int) C2135R.layout.activity_picture_view);
-        setActionBar((int) C2135R.string.image_preview_title, true);
+        setContentView((int) R.layout.activity_picture_view);
+        setActionBar((int) R.string.image_preview_title, true);
         if (bundle == null) {
             Intent intent = getIntent();
             if (intent == null) {
@@ -77,27 +76,24 @@ public class ImagePreviewActivity extends ActivityIACommon {
                 finish();
             } else if (cameraFile == null || new File(cameraFile.getValidFileName()).exists()) {
                 this.mFragment = PlaceholderFragment.getInstance(stringExtra, cameraFile);
-                getSupportFragmentManager().beginTransaction().add((int) C2135R.C2137id.container, (Fragment) this.mFragment).commit();
+                getSupportFragmentManager().beginTransaction().add((int) R.C2137id.container, (Fragment) this.mFragment).commit();
             } else {
                 finish();
             }
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
         NfcTagUtils.disableForegroundDispatch(this);
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         NfcTagUtils.enableForegroundDispatch(this, (IntentFilter[]) null, (String[][]) null);
     }
 
-    /* access modifiers changed from: protected */
-    public void onNewIntent(Intent intent) {
+    protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         CommonMessage.showInvalidPrintMessageIfEpsonNfcPrinter(this, intent);
     }
@@ -203,19 +199,19 @@ public class ImagePreviewActivity extends ActivityIACommon {
         }
 
         public View onCreateView(LayoutInflater layoutInflater, ViewGroup viewGroup, Bundle bundle) {
-            View inflate = layoutInflater.inflate(C2135R.layout.fragment_image_preview_view, viewGroup, false);
-            this.mImageView = (ScalableImageView) inflate.findViewById(C2135R.C2137id.preview_view);
-            this.mProgressBar = (ProgressBar) inflate.findViewById(C2135R.C2137id.progressBar);
-            this.mSaveButton = (Button) inflate.findViewById(C2135R.C2137id.save_button);
+            View inflate = layoutInflater.inflate(R.layout.fragment_image_preview_view, viewGroup, false);
+            this.mImageView = (ScalableImageView) inflate.findViewById(R.C2137id.preview_view);
+            this.mProgressBar = (ProgressBar) inflate.findViewById(R.C2137id.progressBar);
+            this.mSaveButton = (Button) inflate.findViewById(R.C2137id.save_button);
             this.mSaveButton.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     if (!PlaceholderFragment.this.checkProgress()) {
                         if (ActivityRequestPermissions.isRuntimePermissionSupported()) {
                             String[] strArr = {"android.permission.WRITE_EXTERNAL_STORAGE"};
-                            String[] strArr2 = {PlaceholderFragment.this.getString(C2135R.string.permission_dialog_title), PlaceholderFragment.this.getString(C2135R.string.permission_dialog_title)};
+                            String[] strArr2 = {PlaceholderFragment.this.getString(R.string.permission_dialog_title), PlaceholderFragment.this.getString(R.string.permission_dialog_title)};
                             PlaceholderFragment placeholderFragment = PlaceholderFragment.this;
                             PlaceholderFragment placeholderFragment2 = PlaceholderFragment.this;
-                            ActivityRequestPermissions.Permission permission = new ActivityRequestPermissions.Permission(strArr[0], strArr2, new String[]{ActivityRequestPermissions.DialogParameter.setMessage2((Fragment) placeholderFragment, placeholderFragment.getString(C2135R.string.permission_dialog_message_storage)), ActivityRequestPermissions.DialogParameter.setMessage3A((Fragment) placeholderFragment2, placeholderFragment2.getString(C2135R.string.permission_dialog_message_storage), PlaceholderFragment.this.getString(C2135R.string.permission_function_storage))});
+                            ActivityRequestPermissions.Permission permission = new ActivityRequestPermissions.Permission(strArr[0], strArr2, new String[]{ActivityRequestPermissions.DialogParameter.setMessage2((Fragment) placeholderFragment, placeholderFragment.getString(R.string.permission_dialog_message_storage)), ActivityRequestPermissions.DialogParameter.setMessage3A((Fragment) placeholderFragment2, placeholderFragment2.getString(R.string.permission_dialog_message_storage), PlaceholderFragment.this.getString(R.string.permission_function_storage))});
                             if (!ActivityRequestPermissions.checkPermission(PlaceholderFragment.this.getActivity(), strArr)) {
                                 ActivityRequestPermissions.requestPermission((Fragment) PlaceholderFragment.this, permission, 2);
                                 return;
@@ -225,14 +221,14 @@ public class ImagePreviewActivity extends ActivityIACommon {
                     }
                 }
             });
-            ((Button) inflate.findViewById(C2135R.C2137id.print_button)).setOnClickListener(new View.OnClickListener() {
+            ((Button) inflate.findViewById(R.C2137id.print_button)).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     if (!PlaceholderFragment.this.checkProgress()) {
                         PlaceholderFragment.this.startPrintPreviewActivity();
                     }
                 }
             });
-            ((Button) inflate.findViewById(C2135R.C2137id.retouch_button)).setOnClickListener(new View.OnClickListener() {
+            ((Button) inflate.findViewById(R.C2137id.retouch_button)).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     if (!PlaceholderFragment.this.checkProgress()) {
                         PlaceholderFragment.this.startImageCollectActivity();
@@ -276,7 +272,7 @@ public class ImagePreviewActivity extends ActivityIACommon {
         private boolean requestWritePermissionIfNeeded() {
             if (ActivityRequestPermissions.isRuntimePermissionSupported()) {
                 String[] strArr = {"android.permission.WRITE_EXTERNAL_STORAGE"};
-                ActivityRequestPermissions.Permission permission = new ActivityRequestPermissions.Permission(strArr[0], new String[]{getString(C2135R.string.permission_dialog_title), getString(C2135R.string.permission_dialog_title)}, new String[]{ActivityRequestPermissions.DialogParameter.setMessage2((Fragment) this, getString(C2135R.string.permission_dialog_message_storage)), ActivityRequestPermissions.DialogParameter.setMessage3A((Fragment) this, getString(C2135R.string.permission_dialog_message_storage), getString(C2135R.string.permission_function_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((Fragment) this, getString(R.string.permission_dialog_message_storage)), ActivityRequestPermissions.DialogParameter.setMessage3A((Fragment) this, getString(R.string.permission_dialog_message_storage), getString(R.string.permission_function_storage))});
                 if (!ActivityRequestPermissions.checkPermission(getActivity(), strArr)) {
                     ActivityRequestPermissions.requestPermission((Fragment) this, permission, 3);
                     return true;
@@ -325,7 +321,7 @@ public class ImagePreviewActivity extends ActivityIACommon {
             UiCommon.setButtonEnabled(this.mSaveButton, false);
             if (!this.mImagePreviewFile.doSave(CameraPreviewControl.getInstance(getActivity()).getSaveDirecotry())) {
                 UiCommon.setButtonEnabled(this.mSaveButton, true);
-                SimpleMessageDialogFragment.newInstance(C2135R.string.file_save_error_message).show(getFragmentManager(), "error-dialog");
+                SimpleMessageDialogFragment.newInstance(R.string.file_save_error_message).show(getFragmentManager(), "error-dialog");
                 return;
             }
             File file = new File(this.mImagePreviewFile.getPrintFileName());
@@ -418,7 +414,7 @@ public class ImagePreviewActivity extends ActivityIACommon {
 
         public Dialog onCreateDialog(Bundle bundle) {
             super.onCreateDialog(bundle);
-            return new AlertDialog.Builder(getActivity()).setMessage(getResources().getString(C2135R.string.image_save_message, new Object[]{this.mFileName})).setPositiveButton(C2135R.string.ok_button, new DialogInterface.OnClickListener() {
+            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() {
                 public void onClick(DialogInterface dialogInterface, int i) {
                 }
             }).create();

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

@@ -18,14 +18,14 @@ class ItemData {
     }
 
     public void DrawItem(int i, View view, ViewGroup viewGroup) {
-        ImageView imageView = (ImageView) view.findViewById(C2135R.C2137id.file_item_image);
-        TextView textView = (TextView) view.findViewById(C2135R.C2137id.file_item_text);
+        ImageView imageView = (ImageView) view.findViewById(R.C2137id.file_item_image);
+        TextView textView = (TextView) view.findViewById(R.C2137id.file_item_text);
         if (this.mFileName != null) {
-            imageView.setImageResource(C2135R.C2136drawable.folder);
+            imageView.setImageResource(R.C2136drawable.folder);
             textView.setText(this.mFileName);
             return;
         }
-        imageView.setImageResource(C2135R.C2136drawable.parent_folder);
+        imageView.setImageResource(R.C2136drawable.parent_folder);
         textView.setText("");
     }
 }

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

@@ -21,7 +21,7 @@ class ItemDataAdapter extends ArrayAdapter<ItemData> {
 
     public View getView(int i, View view, ViewGroup viewGroup) {
         if (view == null) {
-            view = this.mLayoutInflater.inflate(C2135R.layout.file_select_row, (ViewGroup) null);
+            view = this.mLayoutInflater.inflate(R.layout.file_select_row, (ViewGroup) null);
         }
         ItemData itemData = (ItemData) getItem(i);
         if (itemData != null) {

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

@@ -24,7 +24,7 @@ class MenuControl {
 
     public void CreateMenu(Menu menu) {
         if (this.mMenuMode != 0) {
-            this.mMenuInflater.inflate(C2135R.C2138menu.menu_ok, menu);
+            this.mMenuInflater.inflate(R.C2138menu.menu_ok, menu);
         }
     }
 

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

@@ -117,7 +117,7 @@ public class PictureResolutionDialogFragment extends DialogFragment {
 
     private CharSequence[] getPictureSizeStrList(List<Point> list) {
         String[] strArr = new String[((list != null ? list.size() : 0) + 1)];
-        strArr[0] = getActivity().getResources().getString(C2135R.string.picture_size_auto);
+        strArr[0] = getActivity().getResources().getString(R.string.picture_size_auto);
         if (list == null) {
             return strArr;
         }
@@ -158,10 +158,10 @@ public class PictureResolutionDialogFragment extends DialogFragment {
 
         public View getView(int i, View view, ViewGroup viewGroup) {
             if (view == null) {
-                view = this.mLayoutInflater.inflate(C2135R.layout.select_list_row, viewGroup, false);
+                view = this.mLayoutInflater.inflate(R.layout.select_list_row, viewGroup, false);
             }
-            ((TextView) view.findViewById(C2135R.C2137id.docsize_name)).setText((CharSequence) getItem(i));
-            ImageView imageView = (ImageView) view.findViewById(C2135R.C2137id.current_docsize_image);
+            ((TextView) view.findViewById(R.C2137id.docsize_name)).setText((CharSequence) getItem(i));
+            ImageView imageView = (ImageView) view.findViewById(R.C2137id.current_docsize_image);
             if (i != this.mSelectNumber) {
                 imageView.setVisibility(4);
             } else {

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

@@ -163,7 +163,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                                     PrintPreviewActivity.this.disablePrintButton();
                                 }
                                 PrintPreviewActivity printPreviewActivity = PrintPreviewActivity.this;
-                                Toast.makeText(printPreviewActivity, printPreviewActivity.getString(C2135R.string.file_size_notsupport), 1).show();
+                                Toast.makeText(printPreviewActivity, printPreviewActivity.getString(R.string.file_size_notsupport), 1).show();
                                 break;
                             case 8:
                                 PrintPreviewActivity.this.updateManuscriptScaleText(((Double) message.obj).doubleValue());
@@ -197,10 +197,9 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     private AllReloadTask reloadTask = null;
     private Button rotateButton = null;
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        setContentView((int) C2135R.layout.activity_camera_print_preview);
+        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() {
             public final void onChanged(Object obj) {
@@ -215,7 +214,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                 }
             }
         });
-        setActionBar((int) C2135R.string.print_title, true);
+        setActionBar((int) R.string.print_title, true);
         ExternalFileUtils.getInstance(this).initPrintDir();
         getImageListFromIntent();
         EPImageList ePImageList = this.mImageList;
@@ -223,24 +222,24 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             finish();
             return;
         }
-        this.mPreviewView = (PreviewView) findViewById(C2135R.C2137id.previewImageView);
-        this.papersizeTextView = (TextView) findViewById(C2135R.C2137id.paper_size_text);
+        this.mPreviewView = (PreviewView) findViewById(R.C2137id.previewImageView);
+        this.papersizeTextView = (TextView) findViewById(R.C2137id.paper_size_text);
         this.papersizeTextView.setOnClickListener(this);
-        this.mPrintTargetSizeText = (TextView) findViewById(C2135R.C2137id.printtarget_size_text);
+        this.mPrintTargetSizeText = (TextView) findViewById(R.C2137id.printtarget_size_text);
         this.mPrintTargetSizeText.setOnClickListener(this);
-        this.mScaleText = (TextView) findViewById(C2135R.C2137id.scale_text);
+        this.mScaleText = (TextView) findViewById(R.C2137id.scale_text);
         this.mScaleText.setOnClickListener(this);
-        this.paperMissmath = (ImageView) findViewById(C2135R.C2137id.icon_papermissmatch);
+        this.paperMissmath = (ImageView) findViewById(R.C2137id.icon_papermissmatch);
         this.paperMissmath.setOnClickListener(this);
-        this.mOriginalImageSizeButton = (Button) findViewById(C2135R.C2137id.paper_size_button);
+        this.mOriginalImageSizeButton = (Button) findViewById(R.C2137id.paper_size_button);
         this.mOriginalImageSizeButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 PrintPreviewActivity.this.startOrgImageSizeActivity();
             }
         });
-        this.rotateButton = (Button) findViewById(C2135R.C2137id.rotate_button);
+        this.rotateButton = (Button) findViewById(R.C2137id.rotate_button);
         this.rotateButton.setOnClickListener(this);
-        this.printButton = (Button) findViewById(C2135R.C2137id.print_button);
+        this.printButton = (Button) findViewById(R.C2137id.print_button);
         this.printButton.setOnClickListener(this);
         this.mPreviewView.setImage(this.mImageList.get(0).loadImageFileName);
         loadPrinterSettingAndChangeView(true);
@@ -279,14 +278,13 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     private void checkSizeSetMessage() {
         Intent intent = getIntent();
         if (intent != null && intent.getBooleanExtra(PARAM_DISPLAY_SIZE_SET_MESSAGE, false)) {
-            Toast makeText = Toast.makeText(this, getString(C2135R.string.manuscript_size_set_message), 1);
+            Toast makeText = Toast.makeText(this, getString(R.string.manuscript_size_set_message), 1);
             makeText.setGravity(8, 0, 0);
             makeText.show();
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void startOrgImageSizeActivity() {
+    protected void startOrgImageSizeActivity() {
         startActivityForResult(new Intent(this, DocumentSizeSettingActivity.class), 3);
     }
 
@@ -321,7 +319,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     private void updateParaSizeText() {
         String string = getString(new MediaInfo.PaperSize().getStringId(this.currentPaperSize));
         TextView textView = this.papersizeTextView;
-        textView.setText(getString(C2135R.string.paper_size) + ": " + string);
+        textView.setText(getString(R.string.paper_size) + ": " + string);
     }
 
     private boolean updateManuscriptSize() {
@@ -330,9 +328,9 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         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(C2135R.string.document_size), this.mManuscriptSize.getSizeName(this), Float.valueOf(documentSize.x), Float.valueOf(documentSize.y), this.mManuscriptSize.getUnitStr(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)}));
         } else {
-            this.mPrintTargetSizeText.setText(String.format(Locale.US, "%s: %s", new Object[]{getString(C2135R.string.document_size), this.mManuscriptSize.getSizeName(this)}));
+            this.mPrintTargetSizeText.setText(String.format(Locale.US, "%s: %s", new Object[]{getString(R.string.document_size), this.mManuscriptSize.getSizeName(this)}));
         }
         return z;
     }
@@ -340,7 +338,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     /* access modifiers changed from: private */
     public 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(C2135R.string.magnification), Double.valueOf(100.0d * d), Double.valueOf(((double) physicalSize.x) * d), Double.valueOf(((double) physicalSize.y) * d), this.mManuscriptSize.getUnitStr(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)}));
     }
 
     /* access modifiers changed from: private */
@@ -352,7 +350,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         boolean z4 = false;
         SharedPreferences sharedPreferences = getSharedPreferences("PrintSetting", 0);
         if (sharedPreferences != null) {
-            String string = sharedPreferences.getString(Constants.PRINTER_NAME, getString(C2135R.string.str_lbl_title_scan));
+            String string = sharedPreferences.getString(Constants.PRINTER_NAME, getString(R.string.str_lbl_title_scan));
             PrintSetting printSetting = new PrintSetting(this, PrintSetting.Kind.cameracopy);
             printSetting.loadSettings();
             this.printerId = sharedPreferences.getString(Constants.PRINTER_ID, (String) null);
@@ -426,7 +424,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:6:0x0014, code lost:
-        r0 = (r0 = getSharedPreferences("PrintSetting", 0)).getString(epson.common.Constants.PRINTER_NAME, getString(epson.print.C2135R.string.str_lbl_title_scan));
+        r0 = (r0 = getSharedPreferences("PrintSetting", 0)).getString(epson.common.Constants.PRINTER_NAME, getString(epson.print.R.string.str_lbl_title_scan));
      */
     /* Code decompiled incorrectly, please refer to instructions dump. */
     private boolean isPrinterChanged() {
@@ -461,8 +459,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         throw new UnsupportedOperationException("Method not decompiled: com.epson.cameracopy.p006ui.PrintPreviewActivity.isPrinterChanged():boolean");
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         switch (i) {
             case 1:
@@ -504,8 +501,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onRestart() {
+    protected void onRestart() {
         super.onRestart();
         PreviewView previewView = this.mPreviewView;
         if (previewView != null) {
@@ -513,16 +509,14 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         NfcTagUtils.enableForegroundDispatch(this, (IntentFilter[]) null, (String[][]) null);
         this.paperMissmath.setVisibility(4);
         this.paperSourceInfo.start(this, this.mHandler);
     }
 
-    /* access modifiers changed from: protected */
-    public void onNewIntent(Intent intent) {
+    protected void onNewIntent(Intent intent) {
         NfcTagUtils.EpsonNfcConnectInfo parseNECTag;
         super.onNewIntent(intent);
         String action = intent.getAction();
@@ -536,8 +530,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onDestroy() {
+    protected void onDestroy() {
         EPLog.m316v("ActivityImageViewSelect", "onDestroy");
         super.onDestroy();
         IEpsonService iEpsonService = this.mEpsonService;
@@ -552,8 +545,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         EPLog.m305d("ActivityImageViewSelect", "onPause");
         super.onPause();
         if (isFinishing()) {
@@ -575,16 +567,14 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         this.paperSourceInfo.stop();
     }
 
-    /* access modifiers changed from: protected */
-    public void onStop() {
+    protected void onStop() {
         if (isFinishing()) {
             new PrintSetting(this, PrintSetting.Kind.cameracopy).resetPrintSettings();
         }
         super.onStop();
     }
 
-    /* access modifiers changed from: package-private */
-    public void check3GAndStartPrint() {
+    private void check3GAndStartPrint() {
         this.mHandler.sendEmptyMessage(5);
     }
 
@@ -620,9 +610,9 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     public void updatePaperDisplay(Message message) {
         this.aPaperSourceSetting = message.getData().getParcelableArrayList(PaperSourceInfo.KEY_PAPERSOURCEINFO);
         if (this.aPaperSourceSetting != null) {
-            this.papersizeTextView.setTextColor(getResources().getColor(C2135R.color.epson_blue));
-            this.mPrintTargetSizeText.setTextColor(getResources().getColor(C2135R.color.epson_blue));
-            this.mScaleText.setTextColor(getResources().getColor(C2135R.color.epson_blue));
+            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));
             PrintSetting printSetting = new PrintSetting(this, PrintSetting.Kind.cameracopy);
             printSetting.loadSettings();
             if (this.paperSourceInfo.checkPaperMissmatch(printSetting, this.aPaperSourceSetting)) {
@@ -636,9 +626,9 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     }
 
     private void setPaperSizeDisplayForNoPapaerInfoPrinter() {
-        this.papersizeTextView.setTextColor(getResources().getColor(C2135R.color.all_black));
-        this.mPrintTargetSizeText.setTextColor(getResources().getColor(C2135R.color.all_black));
-        this.mScaleText.setTextColor(getResources().getColor(C2135R.color.all_black));
+        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));
         this.paperMissmath.setVisibility(4);
     }
 
@@ -648,7 +638,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     }
 
     private void showDialog(String str) {
-        DialogProgress newInstance = DialogProgress.newInstance(str, 0, getString(C2135R.string.str_load));
+        DialogProgress newInstance = DialogProgress.newInstance(str, 0, getString(R.string.str_load));
         newInstance.setCancelable(false);
         newInstance.show(getSupportFragmentManager(), str);
     }
@@ -662,9 +652,9 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
 
     public void onClick(View view) {
         switch (view.getId()) {
-            case C2135R.C2137id.icon_papermissmatch /*2131231117*/:
-            case C2135R.C2137id.paper_size_text /*2131231310*/:
-            case C2135R.C2137id.printtarget_size_text /*2131231374*/:
+            case R.C2137id.icon_papermissmatch /*2131231117*/:
+            case R.C2137id.paper_size_text /*2131231310*/:
+            case R.C2137id.printtarget_size_text /*2131231374*/:
                 if (this.aPaperSourceSetting != null) {
                     Intent intent = new Intent();
                     intent.setClass(this, PaperSourceSettingScr.class);
@@ -675,21 +665,21 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                 }
                 callPrintSetting();
                 return;
-            case C2135R.C2137id.print_button /*2131231336*/:
+            case R.C2137id.print_button /*2131231336*/:
                 this.mIsRemotePrinter = isRemotePrinter();
                 if (this.mIsRemotePrinter && this.enableShowWarning) {
                     AlertDialog.Builder cancelable = new AlertDialog.Builder(this).setCancelable(false);
-                    cancelable.setMessage(getString(C2135R.string.epsonconnect_str_remote_print_warning) + "\n\n" + getString(C2135R.string.epsonconnect_str_remote_print_warning2)).setPositiveButton(getString(C2135R.string.str_yes), new DialogInterface.OnClickListener() {
+                    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) {
                             PrintPreviewActivity.this.check3GAndStartPrint();
                         }
-                    }).setNegativeButton(getString(C2135R.string.str_no), new DialogInterface.OnClickListener() {
+                    }).setNegativeButton(getString(R.string.str_no), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
                         }
                     }).show();
                     return;
-                } else if (this.currentPrinterName.equalsIgnoreCase(getString(C2135R.string.str_lbl_title_scan))) {
-                    new AlertDialog.Builder(this).setCancelable(false).setTitle(C2135R.string.printer_notselect_title).setMessage(getString(C2135R.string.printer_notselect_warning)).setPositiveButton(getString(C2135R.string.str_ok), new DialogInterface.OnClickListener() {
+                } else if (this.currentPrinterName.equalsIgnoreCase(getString(R.string.str_lbl_title_scan))) {
+                    new AlertDialog.Builder(this).setCancelable(false).setTitle(R.string.printer_notselect_title).setMessage(getString(R.string.printer_notselect_warning)).setPositiveButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
                         }
                     }).show();
@@ -698,7 +688,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
                     check3GAndStartPrint();
                     return;
                 }
-            case C2135R.C2137id.rotate_button /*2131231420*/:
+            case R.C2137id.rotate_button /*2131231420*/:
                 this.mPreviewView.rotateImageR90();
                 this.mPreviewView.update();
                 return;
@@ -708,7 +698,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     }
 
     public boolean onOptionsItemSelected(MenuItem menuItem) {
-        if (menuItem.getItemId() == C2135R.C2137id.Menu_Show_PrintSettings) {
+        if (menuItem.getItemId() == R.C2137id.Menu_Show_PrintSettings) {
             callPrintSetting();
         }
         return super.onOptionsItemSelected(menuItem);
@@ -716,7 +706,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
 
     public boolean onCreateOptionsMenu(Menu menu) {
         super.onCreateOptionsMenu(menu);
-        getMenuInflater().inflate(C2135R.C2138menu.print_menu, menu);
+        getMenuInflater().inflate(R.C2138menu.print_menu, menu);
         return true;
     }
 
@@ -749,14 +739,12 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         super.onConfigurationChanged(configuration);
     }
 
-    /* access modifiers changed from: protected */
-    public void onRestoreInstanceState(Bundle bundle) {
+    protected void onRestoreInstanceState(Bundle bundle) {
         super.onRestoreInstanceState(bundle);
         this.mPreviewView.restoreInstanceState(bundle, KEY_PREVIEW_VIEW);
     }
 
-    /* access modifiers changed from: protected */
-    public void onSaveInstanceState(Bundle bundle) {
+    protected void onSaveInstanceState(Bundle bundle) {
         this.mPreviewView.saveInstanceState(bundle, KEY_PREVIEW_VIEW);
         super.onSaveInstanceState(bundle);
     }
@@ -774,13 +762,11 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         public AllReloadTask() {
         }
 
-        /* access modifiers changed from: protected */
-        public void onPreExecute() {
+        protected void onPreExecute() {
             PrintPreviewActivity.this.showProgressDialog();
         }
 
-        /* access modifiers changed from: protected */
-        public Boolean doInBackground(Void... voidArr) {
+        protected Boolean doInBackground(Void... voidArr) {
             System.gc();
             int i = 0;
             do {
@@ -812,8 +798,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             return true;
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(Boolean bool) {
+        protected void onPostExecute(Boolean bool) {
             PrintPreviewActivity.this.loadPrinterSettingAndChangeView(false);
             PrintPreviewActivity.this.dismissProgressDialog();
             if (PrintPreviewActivity.this.bAutoStartPrint) {

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

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

+ 1 - 1
app/src/main/java/com/epson/cameracopy/printlayout/AutoManuscriptSize.java

@@ -29,6 +29,6 @@ class AutoManuscriptSize extends IdManuscriptSize {
     }
 
     public String getSizeName(Context context) {
-        return context.getString(C2135R.string.papersize_auto);
+        return context.getString(R.string.papersize_auto);
     }
 }

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

@@ -39,8 +39,7 @@ class CustomManuscriptSize implements ManuscriptSize.ManuscriptTypeAdapter {
         return new PointF((float) this.mWidth, (float) this.mHeight);
     }
 
-    /* access modifiers changed from: protected */
-    public int lengthToPixel(double d, int i) {
+    protected int lengthToPixel(double d, int i) {
         switch (this.mDocumentSizeInfo.getScaleId()) {
             case 1:
                 return (int) (((d * ((double) i)) / 25.4d) + 0.5d);

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

@@ -21,7 +21,7 @@ public class DocumentSizeInfo implements Parcelable, Serializable {
         }
     };
     public static final int DOCSIZE_NAME_USER_DEFINE = 0;
-    private static final int[] DOCUMENT_SIZE_NAME = {C2135R.string.papersize_auto, C2135R.string.papersize_auto, C2135R.string.papersize_a3, C2135R.string.papersize_a4, C2135R.string.papersize_a5, C2135R.string.papersize_a6, C2135R.string.papersize_b4, C2135R.string.papersize_b5, C2135R.string.papersize_b6, C2135R.string.papersize_letter, C2135R.string.papersize_legal, C2135R.string.papersize_postcard, C2135R.string.papersize_10x15, C2135R.string.papersize_l, C2135R.string.papersize_2l, C2135R.string.papersize_card, C2135R.string.papersize_buzcard, C2135R.string.papersize_passport};
+    private static final int[] DOCUMENT_SIZE_NAME = {R.string.papersize_auto, R.string.papersize_auto, R.string.papersize_a3, R.string.papersize_a4, R.string.papersize_a5, R.string.papersize_a6, R.string.papersize_b4, R.string.papersize_b5, R.string.papersize_b6, R.string.papersize_letter, R.string.papersize_legal, R.string.papersize_postcard, R.string.papersize_10x15, R.string.papersize_l, R.string.papersize_2l, R.string.papersize_card, R.string.papersize_buzcard, R.string.papersize_passport};
     public static final double PAPER_A4_HEIGHT = 297.0d;
     public static final double PAPER_A4_WIDTH = 210.0d;
     public static final int PAPER_AUTO = -1;

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

@@ -47,7 +47,7 @@ class IdManuscriptSize implements ManuscriptSize.ManuscriptTypeAdapter {
     }
 
     public String getSizeName(Context context) {
-        if (this.mDocumentSizeInfo.getDocSizeName(context).equalsIgnoreCase(context.getString(C2135R.string.papersize_passport))) {
+        if (this.mDocumentSizeInfo.getDocSizeName(context).equalsIgnoreCase(context.getString(R.string.papersize_passport))) {
             return this.mDocumentSizeInfo.getDocSizeName(context);
         }
         return context.getString(new MediaInfo.PaperSize().getStringId(this.mDocumentSizeInfo.getPaperId()));

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

@@ -121,8 +121,7 @@ public class ImageAndLayout implements Parcelable {
         return this.mOrgFilename;
     }
 
-    /* access modifiers changed from: package-private */
-    public double[] getExRate(int[] iArr) {
+    private double[] getExRate(int[] iArr) {
         int i;
         int i2;
         double[] dArr = {1.0d, 1.0d};
@@ -251,13 +250,11 @@ public class ImageAndLayout implements Parcelable {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public Size getPrintImageSize(double[] dArr) {
+    private Size getPrintImageSize(double[] dArr) {
         return new Size(this.mPrintTargetWidth * dArr[0], this.mPrintTargetHeight * dArr[1]);
     }
 
-    /* access modifiers changed from: package-private */
-    public Mat getPrintMat(int[] iArr, int i, Mat mat) {
+    private Mat getPrintMat(int[] iArr, int i, Mat mat) {
         switch (i & 3) {
             case 1:
                 Mat mat2 = new Mat(2, 3, 6);
@@ -402,8 +399,7 @@ public class ImageAndLayout implements Parcelable {
         return false;
     }
 
-    /* access modifiers changed from: package-private */
-    public Mat make24BitMatFromGrayMat(Mat mat) {
+    private Mat make24BitMatFromGrayMat(Mat mat) {
         Mat mat2 = new Mat(mat.height(), mat.width(), CvType.CV_8UC3);
         Core.mixChannels(Arrays.asList(new Mat[]{mat}), Arrays.asList(new Mat[]{mat2}), new MatOfInt(0, 0, 0, 1, 0, 2));
         return mat2;
@@ -573,8 +569,7 @@ public class ImageAndLayout implements Parcelable {
         return i % 4;
     }
 
-    /* access modifiers changed from: package-private */
-    public void setInterpolation(int i) {
+    private void setInterpolation(int i) {
         this.mInterpolation = i;
     }
 }

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

@@ -91,9 +91,9 @@ public class ManuscriptSize {
 
     public String getUnitStr(Context context) {
         if (getUnitType(context) == 2) {
-            return context.getString(C2135R.string.unit_inch);
+            return context.getString(R.string.unit_inch);
         }
-        return context.getString(C2135R.string.unit_mm);
+        return context.getString(R.string.unit_mm);
     }
 
     private void setManuscriptPixlSize(String str) {

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

@@ -103,8 +103,7 @@ public class PreviewView extends View {
         return false;
     }
 
-    /* access modifiers changed from: protected */
-    public void onDraw(Canvas canvas) {
+    protected void onDraw(Canvas canvas) {
         Rect previewPaperRect = this.mPreviewPosition.getPreviewPaperRect();
         if (previewPaperRect != null) {
             this.mPaint.setColor(-1);
@@ -198,7 +197,7 @@ public class PreviewView extends View {
     }
 
     private void drawOutsidePaperArea(Canvas canvas, Rect rect) {
-        this.mPaint.setColor(getResources().getColor(C2135R.color.background_preview));
+        this.mPaint.setColor(getResources().getColor(R.color.background_preview));
         if (this.mIsMoving) {
             this.mPaint.setAlpha(221);
         }
@@ -211,8 +210,7 @@ public class PreviewView extends View {
         canvas.drawRect((float) rect.right, 0.0f, width, height, this.mPaint);
     }
 
-    /* access modifiers changed from: protected */
-    public void onSizeChanged(int i, int i2, int i3, int i4) {
+    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) {

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

@@ -17,7 +17,7 @@ public class RegistedDocumentSizeList {
     private static final int[] DOCSIZE_NAME_ID = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17};
     private static final double[] PAPER_SIZE_HEIGHT = {297.0d, 420.0d, 297.0d, 210.0d, 148.0d, 364.0d, 257.0d, 182.0d, 11.0d, 14.0d, 148.0d, 152.0d, 127.0d, 178.0d, 86.0d, 91.0d, 182.0d};
     private static final int[] PAPER_SIZE_ID = {-1, 62, 0, 3, 4, 63, 5, 46, 1, 2, 16, 10, 15, 28, 35, 36, 46};
-    private static final int[] PAPER_SIZE_NAME = {C2135R.string.papersize_auto, C2135R.string.papersize_a3, C2135R.string.papersize_a4, C2135R.string.papersize_a5, C2135R.string.papersize_a6, C2135R.string.papersize_b4, C2135R.string.papersize_b5, C2135R.string.papersize_b6, C2135R.string.papersize_letter, C2135R.string.papersize_legal, C2135R.string.papersize_postcard, C2135R.string.papersize_10x15, C2135R.string.papersize_l, C2135R.string.papersize_2l, C2135R.string.papersize_card, C2135R.string.papersize_buzcard, C2135R.string.papersize_passport};
+    private static final int[] PAPER_SIZE_NAME = {R.string.papersize_auto, R.string.papersize_a3, R.string.papersize_a4, R.string.papersize_a5, R.string.papersize_a6, R.string.papersize_b4, R.string.papersize_b5, R.string.papersize_b6, R.string.papersize_letter, R.string.papersize_legal, R.string.papersize_postcard, R.string.papersize_10x15, R.string.papersize_l, R.string.papersize_2l, R.string.papersize_card, R.string.papersize_buzcard, R.string.papersize_passport};
     private static final int[] PAPER_SIZE_SCALE = {1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 1, 1, 1, 1, 1, 1, 1};
     private static final double[] PAPER_SIZE_WIDTH = {210.0d, 297.0d, 210.0d, 148.0d, 105.0d, 257.0d, 182.0d, 128.0d, 8.5d, 8.5d, 100.0d, 102.0d, 89.0d, 127.0d, 54.0d, 55.0d, 128.0d};
     private static final String REGISTED_DOCUMENTSIZE_LIST_FILENAME = "registed_documentsize.bin";

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

@@ -100,8 +100,7 @@ public class EscanI2Lib {
         return false;
     }
 
-    /* access modifiers changed from: package-private */
-    public int trunsErrorCode(int i, boolean z) {
+    private int trunsErrorCode(int i, boolean z) {
         if (i == -5007) {
             return -211;
         }
@@ -465,8 +464,7 @@ public class EscanI2Lib {
         return sEscanI2NativeInterface.getCapability(scannerI2Capability);
     }
 
-    /* access modifiers changed from: package-private */
-    public void updatePages(int i, int i2) {
+    private void updatePages(int i, int i2) {
         synchronized (this.mObserverLock) {
             if (this.mObserver != null) {
                 this.mObserver.update(i, i2);

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

@@ -203,15 +203,13 @@ public class ScanSize implements Serializable {
         return getSize(scannerI2Info, scanI2Params.inputUnit, scanI2Params.resolutionMain, scanI2Params.resolutionSub);
     }
 
-    /* access modifiers changed from: package-private */
-    public int[] getSize(ScannerI2Info scannerI2Info, EscanI2Lib.InputUnit inputUnit, int i, int i2) {
+    private int[] getSize(ScannerI2Info scannerI2Info, EscanI2Lib.InputUnit inputUnit, int i, int i2) {
         int[] pixel = getPixel(scannerI2Info, inputUnit, i, i2);
         int[] offset = getOffset(scannerI2Info, inputUnit, i, i2);
         return new int[]{pixel[0], pixel[1], offset[0], offset[1]};
     }
 
-    /* access modifiers changed from: package-private */
-    public int[] getPixel(ScannerI2Info scannerI2Info, EscanI2Lib.InputUnit inputUnit, int i, int i2) {
+    private int[] getPixel(ScannerI2Info scannerI2Info, EscanI2Lib.InputUnit inputUnit, int i, int i2) {
         if (this.mSizeType == PaperSize.MAX) {
             return scannerI2Info.getSensorPixelSize(inputUnit, i, i2);
         }
@@ -233,8 +231,7 @@ public class ScanSize implements Serializable {
         return iArr;
     }
 
-    /* access modifiers changed from: package-private */
-    public int[] getOffset(ScannerI2Info scannerI2Info, EscanI2Lib.InputUnit inputUnit, int i, int i2) {
+    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) {
@@ -246,8 +243,7 @@ public class ScanSize implements Serializable {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public int calcOffset(int i, int i2, int i3) {
+    private int calcOffset(int i, int i2, int i3) {
         switch (i) {
             case 1:
                 return (i3 - i2) / 2;

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

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

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

@@ -35,7 +35,7 @@ public class AltViewImageAdapter extends BaseAdapter implements CommonDefine {
         options.inPurgeable = true;
         options.inScaled = false;
         try {
-            this.mSelectPictureBitmap = BitmapFactory.decodeResource(this.mContext.getResources(), C2135R.C2136drawable.select_picture, options);
+            this.mSelectPictureBitmap = BitmapFactory.decodeResource(this.mContext.getResources(), R.C2136drawable.select_picture, options);
         } catch (OutOfMemoryError e) {
             EPLog.m307e(TAG, "BitmapFactory.decodeResource Error " + e.getMessage());
         }

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

@@ -11,8 +11,7 @@ class CacheHashMap<K, V> extends LinkedHashMap<K, V> {
     CacheHashMap() {
     }
 
-    /* access modifiers changed from: protected */
-    public boolean removeEldestEntry(Map.Entry<K, V> entry) {
+    protected boolean removeEldestEntry(Map.Entry<K, V> entry) {
         return size() > 1024;
     }
 }

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

@@ -102,8 +102,7 @@ public class CifsAccess {
         throw new UnsupportedOperationException("Method not decompiled: com.epson.memcardacc.CifsAccess.init(java.lang.String, int):int");
     }
 
-    /* access modifiers changed from: protected */
-    public void freeCifsLib() {
+    protected void freeCifsLib() {
         CifsLib cifsLib = sCifsLib;
         if (cifsLib != null) {
             cifsLib.free();
@@ -116,8 +115,7 @@ public class CifsAccess {
         releaseCifsLibSemaphore();
     }
 
-    /* access modifiers changed from: protected */
-    public synchronized boolean acquireCifsLibSemaphore() {
+    protected synchronized boolean acquireCifsLibSemaphore() {
         try {
             if (!getCifsLibSemaphore().tryAcquire(60, TimeUnit.SECONDS)) {
                 EPLog.m318w("CifsAccess", "cifsSemaphore.tryAcquire() can not get semaphore.");
@@ -131,8 +129,7 @@ public class CifsAccess {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public synchronized void releaseCifsLibSemaphore() {
+    protected synchronized void releaseCifsLibSemaphore() {
         if (this.mGotCifsLibSemaphore) {
             getCifsLibSemaphore().release();
             this.mGotCifsLibSemaphore = false;
@@ -319,8 +316,7 @@ public class CifsAccess {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public boolean checkCifsLibStatus() {
+    protected boolean checkCifsLibStatus() {
         return this.mGotCifsLibSemaphore && sCifsLib != null;
     }
 

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

@@ -69,21 +69,20 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
     public void onPositiveClick(String str) {
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        setContentView((int) C2135R.layout.activity_confirm_read_memcard);
+        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() {
             public final void onChanged(Object obj) {
                 ConfirmReadMemcard.lambda$onCreate$0(ConfirmReadMemcard.this, (Deque) obj);
             }
         });
-        setActionBar((int) C2135R.string.memcard_title_copy_confirm, true);
-        this.mFileNumText = (TextView) findViewById(C2135R.C2137id.textFileNumber);
-        this.mFileSizeText = (TextView) findViewById(C2135R.C2137id.textFileSize);
+        setActionBar((int) R.string.memcard_title_copy_confirm, true);
+        this.mFileNumText = (TextView) findViewById(R.C2137id.textFileNumber);
+        this.mFileSizeText = (TextView) findViewById(R.C2137id.textFileSize);
         this.mFileSizeText.setText(CommonDefine.QUESTION_MARK);
-        this.mCopyTargetPathText = (TextView) findViewById(C2135R.C2137id.textWriteFolder);
+        this.mCopyTargetPathText = (TextView) findViewById(R.C2137id.textWriteFolder);
         Intent intent = getIntent();
         this.mImageList = intent.getStringArrayListExtra(KEY_IMAGE_LIST);
         if (this.mImageList == null) {
@@ -91,7 +90,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         }
         this.mMemcardStorageType = intent.getIntExtra("memcard_storage_type", 1);
         int size = this.mImageList.size();
-        this.mFileNumText.setText(String.format(getResources().getString(C2135R.string.memcard_file_num_format), new Object[]{Integer.valueOf(size)}));
+        this.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;
     }
@@ -110,8 +109,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
             this.isTryConnectSimpleAp = false;
@@ -130,14 +128,12 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         EPLog.m305d(LOG_TAG, "onPause()");
         super.onPause();
     }
 
-    /* access modifiers changed from: protected */
-    public void onStop() {
+    protected void onStop() {
         EPLog.m305d(LOG_TAG, "onStop()");
         super.onStop();
         if (!this.isKeepSimleApConnect) {
@@ -145,8 +141,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onDestroy() {
+    protected void onDestroy() {
         this.mTotalFileSizeCalcTask.cancel(true);
         super.onDestroy();
     }
@@ -170,7 +165,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
             str2 = "";
         }
         EPLog.m313i(LOG_TAG, "outdir: " + this.mCopyTargetFolderName);
-        this.mCopyTargetPathText.setText(String.format(getResources().getString(C2135R.string.memcard_folder_save_to_format), new Object[]{str2}));
+        this.mCopyTargetPathText.setText(String.format(getResources().getString(R.string.memcard_folder_save_to_format), new Object[]{str2}));
     }
 
     private String getTargetFolderName() {
@@ -209,7 +204,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
 
     public void updateFileSize(long j) {
         this.mTotalFileSize = j;
-        this.mFileSizeText.setText(String.format(getResources().getString(C2135R.string.memcard_total_file_size_format), new Object[]{Double.valueOf(((double) this.mTotalFileSize) / 1000000.0d)}));
+        this.mFileSizeText.setText(String.format(getResources().getString(R.string.memcard_total_file_size_format), new Object[]{Double.valueOf(((double) this.mTotalFileSize) / 1000000.0d)}));
     }
 
     /* access modifiers changed from: private */
@@ -426,8 +421,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         switch (i) {
             case 1:
                 this.isKeepSimleApConnect = false;
@@ -507,8 +501,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         TotalFileSizeCalcTask() {
         }
 
-        /* access modifiers changed from: protected */
-        public synchronized Long doInBackground(Void... voidArr) {
+        protected synchronized Long doInBackground(Void... voidArr) {
             if (this.mCifsAccess.initDefault(ConfirmReadMemcard.this, 1) == 0) {
                 return -1L;
             }
@@ -540,8 +533,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
             }
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(Long l) {
+        protected void onPostExecute(Long l) {
             if (l != null) {
                 if (l.longValue() == 0) {
                     ConfirmReadMemcard.this.localShowDialog(ConfirmReadMemcard.DIALOG_COPY_RESULT_CANCEL);
@@ -554,8 +546,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
             ConfirmReadMemcard.this.mModelDialog.doDismiss(ConfirmReadMemcard.DIALOG_PROGRESS);
         }
 
-        /* access modifiers changed from: protected */
-        public void onPreExecute() {
+        protected void onPreExecute() {
             ConfirmReadMemcard.this.mModelDialog.doShow(ConfirmReadMemcard.DIALOG_PROGRESS);
         }
     }
@@ -564,8 +555,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         CheckAndNextActivityTask() {
         }
 
-        /* access modifiers changed from: protected */
-        public Integer doInBackground(Void... voidArr) {
+        protected Integer doInBackground(Void... voidArr) {
             if (ConfirmReadMemcard.this.mCopyTargetFolderName == null) {
                 return 100;
             }
@@ -589,13 +579,11 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
             }
         }
 
-        /* access modifiers changed from: protected */
-        public void onCancelled() {
+        protected void onCancelled() {
             ConfirmReadMemcard.this.mModelDialog.doDismiss(ConfirmReadMemcard.DIALOG_PROGRESS);
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(Integer num) {
+        protected void onPostExecute(Integer num) {
             ConfirmReadMemcard.this.mModelDialog.doDismiss(ConfirmReadMemcard.DIALOG_PROGRESS);
             switch (num.intValue()) {
                 case 0:
@@ -615,8 +603,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
             }
         }
 
-        /* access modifiers changed from: protected */
-        public void onPreExecute() {
+        protected void onPreExecute() {
             ConfirmReadMemcard.this.mModelDialog.doShow(ConfirmReadMemcard.DIALOG_PROGRESS);
             if (ConfirmReadMemcard.this.mCopyTargetFolderName == null) {
                 ConfirmReadMemcard.this.setTargetDirectory(MemcardConfig.DEFAULT_READER_LOCAL_DIRECTORY);

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

@@ -78,24 +78,23 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         return intent;
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        setContentView((int) C2135R.layout.activity_confirm_write_memcard);
+        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() {
             public final void onChanged(Object obj) {
                 ConfirmWriteMemcard.lambda$onCreate$0(ConfirmWriteMemcard.this, (Deque) obj);
             }
         });
-        setActionBar((int) C2135R.string.memcard_title_copy_confirm, true);
-        this.mFileNumText = (TextView) findViewById(C2135R.C2137id.textFileNumber);
-        this.mFileSizeText = (TextView) findViewById(C2135R.C2137id.textFileSize);
-        this.mCopyTargetPrinter = (TextView) findViewById(C2135R.C2137id.textWritePrt);
-        this.mCopyTargetPathText = (TextView) findViewById(C2135R.C2137id.textWriteFolder);
+        setActionBar((int) R.string.memcard_title_copy_confirm, true);
+        this.mFileNumText = (TextView) findViewById(R.C2137id.textFileNumber);
+        this.mFileSizeText = (TextView) findViewById(R.C2137id.textFileSize);
+        this.mCopyTargetPrinter = (TextView) findViewById(R.C2137id.textWritePrt);
+        this.mCopyTargetPathText = (TextView) findViewById(R.C2137id.textWriteFolder);
         this.mCopyTargetPathText.setText("");
         this.mImageList = null;
-        this.mCopyTargetPrinter.setText(String.format(getResources().getString(C2135R.string.memcard_printer_save_to_format), new Object[]{MyPrinter.getCurPrinter(this).getName()}));
+        this.mCopyTargetPrinter.setText(String.format(getResources().getString(R.string.memcard_printer_save_to_format), new Object[]{MyPrinter.getCurPrinter(this).getName()}));
         this.doDirectoryNameTask = true;
         observeImageConvertFromIntent(getIntent());
     }
@@ -159,12 +158,11 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
     }
 
     private void updateFileInfo(@Nullable ArrayList<String> arrayList) {
-        this.mFileNumText.setText(String.format(getResources().getString(C2135R.string.memcard_file_num_format), new Object[]{Integer.valueOf(arrayList != null ? arrayList.size() : 0)}));
-        this.mFileSizeText.setText(String.format(getResources().getString(C2135R.string.memcard_total_file_size_format), new Object[]{Double.valueOf(((double) this.mTotalFileSize) / 1000000.0d)}));
+        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)}));
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         EPLog.m305d(LOG_TAG, "onResume()");
         super.onResume();
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
@@ -184,16 +182,14 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
         if (isFinishing()) {
             deleteTemporallyFile();
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onStop() {
+    protected void onStop() {
         EPLog.m305d(LOG_TAG, "onStop()");
         super.onStop();
         if (!this.isKeepSimleApConnect) {
@@ -201,20 +197,18 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void setWriteDirName(String str) {
+    private void setWriteDirName(String str) {
         this.mCopyTargetFolderName = str;
         if (str != null && this.mCopyTargetFolderName != null) {
             runOnUiThread(new Runnable() {
                 public void run() {
-                    ConfirmWriteMemcard.this.mCopyTargetPathText.setText(String.format(ConfirmWriteMemcard.this.getResources().getString(C2135R.string.memcard_folder_save_to_format), new Object[]{ConfirmWriteMemcard.this.mCopyTargetFolderName}));
+                    ConfirmWriteMemcard.this.mCopyTargetPathText.setText(String.format(ConfirmWriteMemcard.this.getResources().getString(R.string.memcard_folder_save_to_format), new Object[]{ConfirmWriteMemcard.this.mCopyTargetFolderName}));
                 }
             });
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public boolean isWirteDirNameDetermined() {
+    private boolean isWirteDirNameDetermined() {
         String str = this.mCopyTargetFolderName;
         return str != null && str.length() > 0;
     }
@@ -264,8 +258,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public String cifsGetTargetFoldername() {
+    private String cifsGetTargetFoldername() {
         CifsAccess instance = CifsAccess.getInstance();
         try {
             if (instance.initDefault(this, 1) == 0) {
@@ -317,8 +310,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         this.isKeepSimleApConnect = true;
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         if (i == 1) {
             this.isKeepSimleApConnect = false;
             if (i2 == -2) {
@@ -336,8 +328,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         this.mImageList.size();
     }
 
-    /* access modifiers changed from: package-private */
-    public void localShowDialog(String str) {
+    private void localShowDialog(String str) {
         this.mModelDialog.doShow(str);
     }
 
@@ -618,15 +609,13 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
     }
 
     class DirectoryNameTask extends AsyncTask<Void, Integer, String> {
-        /* access modifiers changed from: protected */
-        public void onProgressUpdate(Integer... numArr) {
+        protected void onProgressUpdate(Integer... numArr) {
         }
 
         DirectoryNameTask() {
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(String str) {
+        protected void onPostExecute(String str) {
             if (str == null) {
                 ConfirmWriteMemcard.this.setWriteDirName("");
             } else {
@@ -635,13 +624,11 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
             ConfirmWriteMemcard.this.mModelDialog.doDismiss(ConfirmWriteMemcard.DIALOG_TARGET_DIRECTORY_NAME_TASK);
         }
 
-        /* access modifiers changed from: protected */
-        public void onPreExecute() {
+        protected void onPreExecute() {
             ConfirmWriteMemcard.this.mModelDialog.doShow(ConfirmWriteMemcard.DIALOG_TARGET_DIRECTORY_NAME_TASK);
         }
 
-        /* access modifiers changed from: protected */
-        public String doInBackground(Void... voidArr) {
+        protected String doInBackground(Void... voidArr) {
             return ConfirmWriteMemcard.this.cifsGetTargetFoldername();
         }
     }
@@ -650,8 +637,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         CheckAndNextActivityTask() {
         }
 
-        /* access modifiers changed from: protected */
-        public Integer doInBackground(Void... voidArr) {
+        protected Integer doInBackground(Void... voidArr) {
             if (isCancelled()) {
                 return -1;
             }
@@ -676,13 +662,11 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
             }
         }
 
-        /* access modifiers changed from: protected */
-        public void onCancelled() {
+        protected void onCancelled() {
             ConfirmWriteMemcard.this.mModelDialog.doDismiss(ConfirmWriteMemcard.DIALOG_CHECK_AND_NEXT);
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(Integer num) {
+        protected void onPostExecute(Integer num) {
             ConfirmWriteMemcard.this.mModelDialog.doDismiss(ConfirmWriteMemcard.DIALOG_CHECK_AND_NEXT);
             int intValue = num.intValue();
             switch (intValue) {
@@ -712,8 +696,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
             }
         }
 
-        /* access modifiers changed from: protected */
-        public void onPreExecute() {
+        protected void onPreExecute() {
             ConfirmWriteMemcard.this.mModelDialog.doShow(ConfirmWriteMemcard.DIALOG_CHECK_AND_NEXT);
         }
     }

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

@@ -37,31 +37,26 @@ class CopyTask extends AsyncTaskExecutor<Void, Integer, Integer> {
         this.mEscprCheck = z;
     }
 
-    /* access modifiers changed from: protected */
-    public void onCancelled() {
+    protected void onCancelled() {
         EPLog.m313i(LOG_TAG, "canceled in AsyncTask");
         this.mCallback.finishWithState(0, 0, this.mLogData);
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostExecute(Integer num) {
+    protected void onPostExecute(Integer num) {
         EPLog.m313i(LOG_TAG, "onPostExecute in AsyncTask");
         this.mCallback.finishWithState(num.intValue(), this.mErrorCode, this.mLogData);
     }
 
-    /* access modifiers changed from: protected */
-    public void onPreExecute() {
+    protected void onPreExecute() {
         this.mCanceling = false;
         this.mCallback.setProgress(0, this.mImageList.size());
     }
 
-    /* access modifiers changed from: protected */
-    public void onProgressUpdate(Integer... numArr) {
+    protected void onProgressUpdate(Integer... numArr) {
         this.mCallback.setProgress(numArr[0].intValue(), this.mImageList.size());
     }
 
-    /* access modifiers changed from: protected */
-    public EscprLibPrinter getEscprLibPrinter() {
+    protected EscprLibPrinter getEscprLibPrinter() {
         return new EscprLibPrinter();
     }
 
@@ -357,13 +352,11 @@ class CopyTask extends AsyncTaskExecutor<Void, Integer, Integer> {
         throw new UnsupportedOperationException("Method not decompiled: com.epson.memcardacc.CopyTask.copyFile():int");
     }
 
-    /* access modifiers changed from: protected */
-    public void localPublishProgress(int i) {
+    protected void localPublishProgress(int i) {
         publishProgress(new Integer[]{Integer.valueOf(i)});
     }
 
-    /* access modifiers changed from: protected */
-    public boolean checkFileSize(String str, String str2) {
+    protected boolean checkFileSize(String str, String str2) {
         long fileLength = MemcardUtil.getFileLength(str);
         long fileSize = this.mCifsAccess.getFileSize(str2);
         return fileSize > 0 && fileLength == fileSize;

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

@@ -26,14 +26,13 @@ public class DirectorySelecterActivity extends Activity {
     Button mOkButton;
     EditText mTargetDir;
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        setContentView(C2135R.layout.activity_directory_selecter);
-        setTitle(getResources().getText(C2135R.string.memcard_folder_save_to_string));
-        this.mBaseDirTextView = (TextView) findViewById(C2135R.C2137id.baseDirText);
-        this.mTargetDir = (EditText) findViewById(C2135R.C2137id.memcardUsername);
-        this.mOkButton = (Button) findViewById(C2135R.C2137id.okButton);
+        setContentView(R.layout.activity_directory_selecter);
+        setTitle(getResources().getText(R.string.memcard_folder_save_to_string));
+        this.mBaseDirTextView = (TextView) findViewById(R.C2137id.baseDirText);
+        this.mTargetDir = (EditText) findViewById(R.C2137id.memcardUsername);
+        this.mOkButton = (Button) findViewById(R.C2137id.okButton);
         Intent intent = getIntent();
         String stringExtra = intent.getStringExtra(PARAM_BASE_DIRECTORY);
         String stringExtra2 = intent.getStringExtra(PARAM_DEFAULT_DIR);
@@ -78,25 +77,22 @@ public class DirectorySelecterActivity extends Activity {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public Dialog onCreateDialog(int i) {
+    protected Dialog onCreateDialog(int i) {
         if (i != 1) {
             return null;
         }
-        return new AlertDialog.Builder(this).setMessage(getString(C2135R.string.str_error_Filename)).setNegativeButton(getString(C2135R.string.str_ok), new DialogInterface.OnClickListener() {
+        return new AlertDialog.Builder(this).setMessage(getString(R.string.str_error_Filename)).setNegativeButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
             }
         }).create();
     }
 
-    /* access modifiers changed from: package-private */
-    public void disableOkButton() {
+    private void disableOkButton() {
         this.mOkButton.setClickable(false);
         this.mOkButton.setEnabled(false);
     }
 
-    /* access modifiers changed from: package-private */
-    public void enableOkButton() {
+    private void enableOkButton() {
         this.mOkButton.setEnabled(true);
         this.mOkButton.setClickable(true);
     }

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

@@ -86,13 +86,11 @@ public class EscprLibPrinter {
         return 2;
     }
 
-    /* access modifiers changed from: package-private */
-    public MyPrinter getCurrentPrinter(Context context) {
+    private MyPrinter getCurrentPrinter(Context context) {
         return MyPrinter.getCurPrinter(context);
     }
 
-    /* access modifiers changed from: package-private */
-    public MaintainPrinter2 getMaintainPrinter() {
+    private MaintainPrinter2 getMaintainPrinter() {
         return MaintainPrinter2.getInstance();
     }
 }

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

@@ -49,16 +49,14 @@ class FileConvertTask extends AsyncTask<Void, Void, ArrayList<String>> {
         return ExternalFileUtils.getInstance(IprintApplication.getInstance()).initTempCacheDirectory(ExternalFileUtils.TempCacheDirectory.MEMORY_CARD_ACCESS);
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostExecute(ArrayList<String> arrayList) {
+    protected void onPostExecute(ArrayList<String> arrayList) {
         ConvertEndListener convertEndListener = this.mConvertEndListener;
         if (convertEndListener != null) {
             convertEndListener.onConvertEnd(this.mErrorType, arrayList);
         }
     }
 
-    /* access modifiers changed from: protected */
-    public ArrayList<String> doInBackground(Void... voidArr) {
+    protected ArrayList<String> doInBackground(Void... voidArr) {
         ArrayList<String> convertImageFile = convertImageFile(this.mOrgFileList);
         if (convertImageFile == null) {
             return null;

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

@@ -49,32 +49,32 @@ public class ImageFileListAdapter extends BaseAdapter implements Serializable {
 
     public View getView(int i, View view, ViewGroup viewGroup) {
         if (view == null) {
-            view = this.mLayoutInflator.inflate(C2135R.layout.memcard_card_grid_view_elem, viewGroup, false);
+            view = this.mLayoutInflator.inflate(R.layout.memcard_card_grid_view_elem, viewGroup, false);
         }
-        ImageView imageView = (ImageView) view.findViewById(C2135R.C2137id.thumbNail);
+        ImageView imageView = (ImageView) view.findViewById(R.C2137id.thumbNail);
         FileInfoWithCheck fileInfoWithCheck = this.mFileInfoWithCheck.get(i);
         Bitmap thumNail = fileInfoWithCheck.getThumNail();
-        TextView textView = (TextView) view.findViewById(C2135R.C2137id.baseDirText);
+        TextView textView = (TextView) view.findViewById(R.C2137id.baseDirText);
         if (thumNail != null) {
             imageView.setImageBitmap(thumNail);
             textView.setVisibility(4);
         } else if (fileInfoWithCheck.isDirectory()) {
             if (fileInfoWithCheck.isParentDirectory()) {
-                imageView.setImageResource(C2135R.C2136drawable.parent_folder);
+                imageView.setImageResource(R.C2136drawable.parent_folder);
                 String str = this.mUpFolderString;
                 if (str != null) {
                     textView.setText(str);
                 }
             } else {
-                imageView.setImageResource(C2135R.C2136drawable.folder);
+                imageView.setImageResource(R.C2136drawable.folder);
                 textView.setText(fileInfoWithCheck.getFileName());
             }
             textView.setVisibility(0);
         } else {
-            imageView.setImageResource(C2135R.C2136drawable.image);
+            imageView.setImageResource(R.C2136drawable.image);
             textView.setVisibility(4);
         }
-        ImageView imageView2 = (ImageView) view.findViewById(C2135R.C2137id.checkImage);
+        ImageView imageView2 = (ImageView) view.findViewById(R.C2137id.checkImage);
         if (fileInfoWithCheck.mChecked != 0) {
             imageView2.setVisibility(0);
         } else {

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

@@ -11,8 +11,7 @@ class LimitedHashMap<K, V> extends LinkedHashMap<K, V> {
     LimitedHashMap() {
     }
 
-    /* access modifiers changed from: protected */
-    public boolean removeEldestEntry(Map.Entry<K, V> entry) {
+    protected boolean removeEldestEntry(Map.Entry<K, V> entry) {
         return size() > 64;
     }
 }

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

@@ -45,7 +45,7 @@ public class LocalAlertDialogFragment extends DialogFragment {
         boolean z = arguments.getBoolean(KEY_NO_TITLE, false);
         this.mDialogCode = arguments.getInt(KEY_DIALOG_CODE);
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setMessage(i).setPositiveButton(getActivity().getString(C2135R.string.str_ok), new DialogInterface.OnClickListener() {
+        builder.setMessage(i).setPositiveButton(getActivity().getString(R.string.str_ok), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 LocalAlertDialogFragment.this.execCallback();
             }

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

@@ -23,16 +23,14 @@ public class LocalImageSelectActivity extends ImageSelectActivity {
         return new JpegImageFinder();
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         if (i == 105 && i2 == 1) {
             finish();
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void goNext() {
+    protected void goNext() {
         ArrayList<String> fileArrayList = getImageSelector().getFileArrayList();
         if (fileArrayList.size() > 0) {
             startActivityForResult(ConfirmWriteMemcard.getStartIntent(this, fileArrayList), 105);

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

@@ -31,11 +31,11 @@ public class LocalProgressDialogFragment extends DialogFragment {
     public Dialog onCreateDialog(Bundle bundle) {
         int i;
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        View inflate = getActivity().getLayoutInflater().inflate(C2135R.layout.dialog_local_prgress, (ViewGroup) null);
+        View inflate = getActivity().getLayoutInflater().inflate(R.layout.dialog_local_prgress, (ViewGroup) null);
         builder.setView(inflate);
         Bundle arguments = getArguments();
         if (!(arguments == null || (i = arguments.getInt(ARGUMENT_MESSAGE_TEXT_ID, 0)) == 0)) {
-            ((TextView) inflate.findViewById(C2135R.C2137id.messageText)).setText(i);
+            ((TextView) inflate.findViewById(R.C2137id.messageText)).setText(i);
         }
         return builder.create();
     }

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

@@ -50,13 +50,11 @@ public class MemCardWriteConvertViewModel extends AndroidViewModel {
 
         public void setOrigFileList(@NonNull final ArrayList<String> arrayList) {
             new AsyncTask<Void, Void, ConvertResult>() {
-                /* access modifiers changed from: protected */
-                public ConvertResult doInBackground(Void... voidArr) {
+                protected ConvertResult doInBackground(Void... voidArr) {
                     return ConvertLiveData.this.convertAndGetFileSize(arrayList);
                 }
 
-                /* access modifiers changed from: protected */
-                public void onPostExecute(ConvertResult convertResult) {
+                protected void onPostExecute(ConvertResult convertResult) {
                     MemCardWriteConvertViewModel.this.mConvertLiveData.setValue(convertResult);
                 }
             }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);

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

@@ -146,23 +146,19 @@ public class MemcardCheckTask extends AsyncTask<Void, Void, Integer> {
         throw new UnsupportedOperationException("Method not decompiled: com.epson.memcardacc.MemcardCheckTask.doInBackground(java.lang.Void[]):java.lang.Integer");
     }
 
-    /* access modifiers changed from: protected */
-    public CifsAccess getCifsAccessInstance() {
+    protected CifsAccess getCifsAccessInstance() {
         return CifsAccess.getInstance();
     }
 
-    /* access modifiers changed from: protected */
-    public void onPreExecute() {
+    protected void onPreExecute() {
         this.mCallback.onPreExecute();
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostExecute(Integer num) {
+    protected void onPostExecute(Integer num) {
         this.mCallback.onMemcardCheckEnd(num, this.mErrorCode);
     }
 
-    /* access modifiers changed from: protected */
-    public void onCancelled() {
+    protected void onCancelled() {
         this.mCallback.onMemcardCheckEnd((Integer) null, this.mActivityOnPauseCancel ? 6 : 5);
     }
 
@@ -183,8 +179,7 @@ public class MemcardCheckTask extends AsyncTask<Void, Void, Integer> {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public int checkEscprLib(Context context, int i) {
+    protected int checkEscprLib(Context context, int i) {
         EscprLibPrinter newEscprLibPrinter = newEscprLibPrinter();
         if (newEscprLibPrinter.init(context, i, true) != 0) {
             return 2;
@@ -194,8 +189,7 @@ public class MemcardCheckTask extends AsyncTask<Void, Void, Integer> {
         return (status == 0 || status == 4) ? 0 : 3;
     }
 
-    /* access modifiers changed from: protected */
-    public EscprLibPrinter newEscprLibPrinter() {
+    protected EscprLibPrinter newEscprLibPrinter() {
         return new EscprLibPrinter();
     }
 

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

@@ -8,7 +8,7 @@ import epson.print.C2135R;
 
 public class MemcardDialog {
     public static Dialog createDialog(Activity activity, int i, int i2) {
-        return new AlertDialog.Builder(activity).setTitle(i).setMessage(i2).setPositiveButton(activity.getString(C2135R.string.str_ok), new DialogInterface.OnClickListener() {
+        return new AlertDialog.Builder(activity).setTitle(i).setMessage(i2).setPositiveButton(activity.getString(R.string.str_ok), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
             }
         }).create();

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

@@ -113,8 +113,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
     public void onNeutralClick(String str) {
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         this.mBitmapCache = MemcardBitmapCache.getInstance(this);
         MemcardBitmapCache memcardBitmapCache = this.mBitmapCache;
         if (memcardBitmapCache == null || !memcardBitmapCache.checkEnv()) {
@@ -130,25 +129,25 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         super.onCreate(bundle);
         this.mImageFileListAdapter = new ImageFileListAdapter();
         this.mImageFileListAdapter.setLayoutInflater(getLayoutInflater());
-        this.mImageFileListAdapter.setUpFolderString(getResources().getString(C2135R.string.memcard_folder_up));
-        setContentView((int) C2135R.layout.activity_memcard_image_grid);
+        this.mImageFileListAdapter.setUpFolderString(getResources().getString(R.string.memcard_folder_up));
+        setContentView((int) R.layout.activity_memcard_image_grid);
         setActionBar("", true);
-        this.mGridView = (GridView) findViewById(C2135R.C2137id.gridView1);
+        this.mGridView = (GridView) findViewById(R.C2137id.gridView1);
         this.mGridView.setAdapter(this.mImageFileListAdapter);
-        this.mSelectedFileNumText = (TextView) findViewById(C2135R.C2137id.textSelectedImageNum);
+        this.mSelectedFileNumText = (TextView) findViewById(R.C2137id.textSelectedImageNum);
         this.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(C2135R.dimen.image_selector_grid_thumbnail_size);
+        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(C2135R.dimen.image_selector_grid_thumbnail_spacing)));
+        this.mGridView.getViewTreeObserver().addOnGlobalLayoutListener(new MyGridLayoutListener(this.mGridView, this.mImageFileListAdapter, getResources().getDimensionPixelSize(R.dimen.image_selector_grid_thumbnail_spacing)));
         updateSelectedNumber();
-        this.mProgressBar = (ProgressBar) findViewById(C2135R.C2137id.progressBar1);
+        this.mProgressBar = (ProgressBar) findViewById(R.C2137id.progressBar1);
         this.mProgressBar.setVisibility(4);
         this.mMemcardStorageType = getIntent().getIntExtra("memcard_storage_type", 1);
         if (this.mMemcardStorageType <= 0) {
@@ -178,13 +177,11 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void dispTargetDirectory() {
+    private void dispTargetDirectory() {
         setTitle(this.mImageFileListAdapter.getTargetDirectoryName());
     }
 
-    /* access modifiers changed from: protected */
-    public void onStop() {
+    protected void onStop() {
         this.mHandler.removeMessages(1);
         if (!this.isKeepSimleApConnect) {
             CifsFileListLoader cifsFileListLoader = this.mCifsFileListLoader;
@@ -200,14 +197,12 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         super.onStop();
     }
 
-    /* access modifiers changed from: protected */
-    public void onRestart() {
+    protected void onRestart() {
         super.onRestart();
         this.targetDir = this.mImageFileListAdapter.getTargetDirectoryName();
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
             this.isTryConnectSimpleAp = false;
@@ -224,8 +219,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         if (i2 == 1 && i2 == 1) {
             setResult(1);
@@ -233,8 +227,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void gridViewItemClicked(AdapterView<?> adapterView, View view, int i, long j) {
+    private void gridViewItemClicked(AdapterView<?> adapterView, View view, int i, long j) {
         String directoryName = this.mImageFileListAdapter.getDirectoryName(i);
         if (directoryName != null) {
             EPLog.m313i(LOG_TAG, "item clicked : dir_name => " + directoryName);
@@ -248,18 +241,18 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
 
     public boolean onCreateOptionsMenu(Menu menu) {
         int selectedFileNum = this.mImageFileListAdapter.getSelectedFileNum();
-        getMenuInflater().inflate(C2135R.C2138menu.menu_image_selector, menu);
-        menu.findItem(C2135R.C2137id.action_go_preview).setEnabled(selectedFileNum > 0);
+        getMenuInflater().inflate(R.C2138menu.menu_image_selector, menu);
+        menu.findItem(R.C2137id.action_go_preview).setEnabled(selectedFileNum > 0);
         if (selectedFileNum <= 0) {
             setTitle(this.mImageFileListAdapter.getTargetDirectoryName());
         } else {
-            setTitle(String.format(getResources().getString(C2135R.string.photo_selected), new Object[]{Integer.valueOf(selectedFileNum)}));
+            setTitle(String.format(getResources().getString(R.string.photo_selected), new Object[]{Integer.valueOf(selectedFileNum)}));
         }
         return true;
     }
 
     public boolean onOptionsItemSelected(MenuItem menuItem) {
-        if (menuItem.getItemId() != C2135R.C2137id.action_go_preview) {
+        if (menuItem.getItemId() != R.C2137id.action_go_preview) {
             return super.onOptionsItemSelected(menuItem);
         }
         goNext();
@@ -321,8 +314,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void execNextTaskOrIdle() {
+    protected void execNextTaskOrIdle() {
         if (!this.mTaskQueue.isEmpty()) {
             EPLog.m313i(LOG_TAG, "checkQueue() queue not empty");
             this.mCifsFileListLoader = new CifsFileListLoader();
@@ -336,8 +328,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         dismissProgressDialog();
     }
 
-    /* access modifiers changed from: package-private */
-    public void cancelFileListLoadTask() {
+    private void cancelFileListLoadTask() {
         CifsFileListLoader cifsFileListLoader = this.mCifsFileListLoader;
         if (cifsFileListLoader != null) {
             cifsFileListLoader.cancelTask();
@@ -510,8 +501,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void selectFileList(LinkedList<CifsFileInfo> linkedList) {
+    private void selectFileList(LinkedList<CifsFileInfo> linkedList) {
         Iterator it = linkedList.iterator();
         while (it.hasNext()) {
             CifsFileInfo cifsFileInfo = (CifsFileInfo) it.next();
@@ -521,8 +511,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public boolean hasExtensionJpg(String str) {
+    private boolean hasExtensionJpg(String str) {
         return Boolean.valueOf(str.toLowerCase(Locale.US).endsWith(".jpg")).booleanValue();
     }
 
@@ -589,13 +578,11 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         CifsFileListLoader() {
         }
 
-        /* access modifiers changed from: protected */
-        public void onPreExecute() {
+        protected void onPreExecute() {
             EPLog.m313i(MemcardImageGrid.LOG_TAG, "doInBackground() onPreExecute().");
         }
 
-        /* access modifiers changed from: package-private */
-        public boolean waiteAdapterUpdateAndCancelCheck() {
+        private boolean waiteAdapterUpdateAndCancelCheck() {
             if (this.mCanceling) {
                 return false;
             }
@@ -612,8 +599,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
             return true;
         }
 
-        /* access modifiers changed from: protected */
-        public synchronized Integer doInBackground(String... strArr) {
+        protected synchronized Integer doInBackground(String... strArr) {
             EPLog.m313i(MemcardImageGrid.LOG_TAG, "doInBackground() started");
             if (MemcardImageGrid.this.mCifsAccess.initDefault(MemcardImageGrid.this, 1) == 0) {
                 return null;
@@ -679,8 +665,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
             }
         }
 
-        /* access modifiers changed from: protected */
-        public void onProgressUpdate(Integer... numArr) {
+        protected void onProgressUpdate(Integer... numArr) {
             if (numArr[0].intValue() == 1) {
                 MemcardImageGrid.this.mImageFileListAdapter.setFileList(this.mBaseDir, this.mFileList);
                 MemcardImageGrid.this.mImageFileListAdapter.notifyDataSetChanged();
@@ -692,8 +677,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
             MemcardImageGrid.this.mImageFileListAdapter.notifyDataSetChanged();
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(Integer num) {
+        protected void onPostExecute(Integer num) {
             EPLog.m313i(MemcardImageGrid.LOG_TAG, "doInBackground() done.");
             if (num == null) {
                 MemcardImageGrid.this.dismissProgressDialog();

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

@@ -9,16 +9,14 @@ import epson.print.C2135R;
 public class MemcardPhotocopyTop extends MemcardTopSuper {
     protected static final int DIALOG_TYPE_NOT_READY = 101;
 
-    /* access modifiers changed from: protected */
-    public int getStorageSetType() {
+    protected int getStorageSetType() {
         return 2;
     }
 
     public void launchReaderActivity(int i) {
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         this.mBitmapCache = MemcardBitmapCache.getInstance(this);
         if (this.mBitmapCache == null || !this.mBitmapCache.checkEnv()) {
             new MemcardTempAlertDialog().showAlertDialog(this, new MemcardTempAlertDialog.DialogCallback() {
@@ -31,10 +29,10 @@ public class MemcardPhotocopyTop extends MemcardTopSuper {
             CifsAccess.clearSmbAuthInfo();
         }
         super.onCreate(bundle);
-        setContentView((int) C2135R.layout.activity_mcphotocopy_top);
-        setActionBar((int) C2135R.string.FunctionName_iPrint_PhotoTransfer, true);
+        setContentView((int) R.layout.activity_mcphotocopy_top);
+        setActionBar((int) R.string.FunctionName_iPrint_PhotoTransfer, true);
         this.mLaunchType = 0;
-        findViewById(C2135R.C2137id.photocopy_button).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.C2137id.photocopy_button).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 MemcardPhotocopyTop.this.launchWriter();
             }
@@ -53,12 +51,11 @@ public class MemcardPhotocopyTop extends MemcardTopSuper {
         finish();
     }
 
-    /* access modifiers changed from: package-private */
-    public void localShowDialog(int i) {
+    private void localShowDialog(int i) {
         if (!this.mActivityIsFinishing && this.mIsActivityForeground) {
             LocalAlertDialogFragment localAlertDialogFragment = null;
             if (i == 1) {
-                localAlertDialogFragment = LocalAlertDialogFragment.newInstance(C2135R.string.mcphotocopy_media_not_found_message, C2135R.string.mcphotocopy_media_not_found_title, 101);
+                localAlertDialogFragment = LocalAlertDialogFragment.newInstance(R.string.mcphotocopy_media_not_found_message, R.string.mcphotocopy_media_not_found_title, 101);
             }
             if (localAlertDialogFragment != null) {
                 localAlertDialogFragment.show(getSupportFragmentManager(), "error_dialog");

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

@@ -42,25 +42,24 @@ public class MemcardReadProgress extends Activity {
     TextView mTextView;
     ProgressBar mTotalProgress;
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         Utils.setFInishOnTOuchOutside(this, false);
-        setContentView(C2135R.layout.memcard_write_progress);
+        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(C2135R.C2137id.progress_percent);
+        this.mTotalProgress = (ProgressBar) findViewById(R.C2137id.progress_percent);
         this.mTotalProgress.setVisibility(0);
-        this.mEachProgress = (ProgressBar) findViewById(C2135R.C2137id.progress_copies);
+        this.mEachProgress = (ProgressBar) findViewById(R.C2137id.progress_copies);
         this.mEachProgress.setVisibility(8);
-        this.mTextView = (TextView) findViewById(C2135R.C2137id.percent);
-        ((TextView) findViewById(C2135R.C2137id.copyingMessageText)).setText(getResources().getString(C2135R.string.memcard_file_reading_message));
+        this.mTextView = (TextView) findViewById(R.C2137id.percent);
+        ((TextView) findViewById(R.C2137id.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(C2135R.C2137id.cancel_button);
+        this.mCancelButton = (Button) findViewById(R.C2137id.cancel_button);
         this.mCancelButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 MemcardReadProgress.this.actionCancel();
@@ -70,8 +69,7 @@ public class MemcardReadProgress extends Activity {
         this.mCopyTask.execute(new Void[0]);
     }
 
-    /* access modifiers changed from: protected */
-    public void onStop() {
+    protected void onStop() {
         EPLog.m305d(LOG_TAG, "onStop()");
         actionCancel();
         this.discconectOnThreadFinish = true;
@@ -116,34 +114,29 @@ public class MemcardReadProgress extends Activity {
             commonLog.printerName = Analytics.getDefaultPrinterName(MemcardReadProgress.this.getApplicationContext());
         }
 
-        /* access modifiers changed from: protected */
-        public void onCancelled() {
+        protected void onCancelled() {
             MemcardUtil.clearKeepScreenOn(MemcardReadProgress.this.getWindow());
             EPLog.m313i(MemcardReadProgress.LOG_TAG, "canceld in AsyncTask");
             MemcardReadProgress.this.finishWithState(0, this.mCommonLog);
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(Integer num) {
+        protected void onPostExecute(Integer num) {
             MemcardUtil.clearKeepScreenOn(MemcardReadProgress.this.getWindow());
             MemcardReadProgress.this.finishWithState(num.intValue(), this.mCommonLog);
         }
 
-        /* access modifiers changed from: protected */
-        public void onPreExecute() {
+        protected void onPreExecute() {
             this.mCanceling = false;
             MemcardUtil.keepScreenOn(MemcardReadProgress.this.getWindow());
             MemcardReadProgress memcardReadProgress = MemcardReadProgress.this;
             memcardReadProgress.setProgress(0, memcardReadProgress.mImageList.size());
         }
 
-        /* access modifiers changed from: protected */
-        public void onProgressUpdate(Integer... numArr) {
+        protected void onProgressUpdate(Integer... numArr) {
             MemcardReadProgress.this.setProgress(numArr[0].intValue(), MemcardReadProgress.this.mImageList.size());
         }
 
-        /* access modifiers changed from: protected */
-        public Integer doInBackground(Void... voidArr) {
+        protected Integer doInBackground(Void... voidArr) {
             try {
                 if (this.cifsAccess.initDefault(MemcardReadProgress.this, 1) == 0) {
                     return 3;

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

@@ -13,7 +13,7 @@ public class MemcardTempAlertDialog {
 
     public void showAlertDialog(Context context, final DialogCallback dialogCallback) {
         AlertDialog.Builder builder = new AlertDialog.Builder(context);
-        builder.setMessage(context.getString(C2135R.string.str_no_sdcard)).setTitle(C2135R.string.unknow_error_title).setCancelable(false).setPositiveButton(context.getString(C2135R.string.str_btn_close), new DialogInterface.OnClickListener() {
+        builder.setMessage(context.getString(R.string.str_no_sdcard)).setTitle(R.string.unknow_error_title).setCancelable(false).setPositiveButton(context.getString(R.string.str_btn_close), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 dialogCallback.onPositiveCallback();
             }

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

@@ -28,7 +28,7 @@ public class MemcardTempAlertDialogFragment extends DialogFragment {
             string = "";
         }
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setMessage(string).setPositiveButton(getActivity().getString(C2135R.string.str_ok), new DialogInterface.OnClickListener() {
+        builder.setMessage(string).setPositiveButton(getActivity().getString(R.string.str_ok), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
             }
         });

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

@@ -12,13 +12,11 @@ import epson.print.C2135R;
 public class MemcardTop extends MemcardTopSuper {
     private static final int REQEST_RUNTIMEPERMMISSION = 1;
 
-    /* access modifiers changed from: protected */
-    public int getStorageSetType() {
+    protected int getStorageSetType() {
         return 1;
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         this.mBitmapCache = MemcardBitmapCache.getInstance(this);
         if (this.mBitmapCache == null || !this.mBitmapCache.checkEnv()) {
             new MemcardTempAlertDialog().showAlertDialog(this, new MemcardTempAlertDialog.DialogCallback() {
@@ -31,13 +29,12 @@ public class MemcardTop extends MemcardTopSuper {
             CifsAccess.clearSmbAuthInfo();
         }
         super.onCreate(bundle);
-        setContentView((int) C2135R.layout.activity_memcard_top);
-        setActionBar((int) C2135R.string.FunctionName_iPrint_MemoryCard, true);
+        setContentView((int) R.layout.activity_memcard_top);
+        setActionBar((int) R.string.FunctionName_iPrint_MemoryCard, true);
         this.mLaunchType = 0;
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         if (i == 1 && i2 == -1) {
             startReader();
@@ -55,7 +52,7 @@ public class MemcardTop extends MemcardTopSuper {
         if (this.mLaunchType == 0) {
             if (ActivityRequestPermissions.isRuntimePermissionSupported()) {
                 String[] strArr = {"android.permission.WRITE_EXTERNAL_STORAGE"};
-                ActivityRequestPermissions.Permission permission = new ActivityRequestPermissions.Permission(strArr[0], new String[]{getString(C2135R.string.permission_dialog_title), getString(C2135R.string.permission_dialog_title)}, new String[]{ActivityRequestPermissions.DialogParameter.setMessage2((Context) this, getString(C2135R.string.permission_dialog_message_storage)), ActivityRequestPermissions.DialogParameter.setMessage3A((Context) this, getString(C2135R.string.permission_dialog_message_storage), getString(C2135R.string.permission_function_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))});
                 if (!ActivityRequestPermissions.checkPermission(this, strArr)) {
                     ActivityRequestPermissions.requestPermission((Activity) this, permission, 1);
                     return;
@@ -65,8 +62,7 @@ public class MemcardTop extends MemcardTopSuper {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void startReader() {
+    private void startReader() {
         this.mLaunchType = 2;
         startMemcardStorageCheck();
     }

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

@@ -39,8 +39,7 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
     private PasswordDialogFragment mPasswordDialogFragment;
     protected int mReservationDialog;
 
-    /* access modifiers changed from: protected */
-    public abstract int getStorageSetType();
+    protected abstract int getStorageSetType();
 
     public abstract void launchReaderActivity(int i);
 
@@ -49,8 +48,7 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
     public void onDialogCallback(int i) {
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    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() {
@@ -75,8 +73,7 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         this.mIsActivityForeground = true;
         if (!showDialogOnResume() && this.mLaunchType != 0) {
@@ -99,8 +96,7 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
         return true;
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         this.mIsActivityForeground = false;
         if (isFinishing()) {
             this.mActivityIsFinishing = true;
@@ -114,25 +110,21 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
         WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, MemcardUtil.getPrinterIpAddress(this));
     }
 
-    /* access modifiers changed from: protected */
-    public void onStart() {
+    protected void onStart() {
         super.onStart();
     }
 
-    /* access modifiers changed from: protected */
-    public void onStop() {
+    protected void onStop() {
         super.onStop();
     }
 
-    /* access modifiers changed from: protected */
-    public void startMemcardStorageCheck() {
+    protected void startMemcardStorageCheck() {
         if (!chechAndConnectWiFiDirect()) {
             execMemcardCheck();
         }
     }
 
-    /* access modifiers changed from: protected */
-    public boolean chechAndConnectWiFiDirect() {
+    protected boolean chechAndConnectWiFiDirect() {
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
             this.isTryConnectSimpleAp = false;
         } else if (!this.isTryConnectSimpleAp) {
@@ -144,8 +136,7 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
         return false;
     }
 
-    /* access modifiers changed from: protected */
-    public void execMemcardCheck() {
+    protected void execMemcardCheck() {
         MemcardCheckTask memcardCheckTask = this.mMemcardCheckTask;
         if (memcardCheckTask == null || memcardCheckTask.getStatus() == AsyncTask.Status.FINISHED) {
             this.mMemcardCheckTask = new MemcardCheckTask(this, new MemcardCheckTask.MemcardCheckCallback() {
@@ -187,8 +178,7 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
         this.mModelDialog.doShow(DIALOG_PROGRESS);
     }
 
-    /* access modifiers changed from: package-private */
-    public void showPasswordDialog(boolean z) {
+    private void showPasswordDialog(boolean z) {
         if (!this.mActivityIsFinishing) {
             PasswordDialogFragment passwordDialogFragment = this.mPasswordDialogFragment;
             if (passwordDialogFragment != null) {
@@ -200,8 +190,7 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void authInfoRequested(final MemcardCheckTask memcardCheckTask, final boolean z) {
+    protected void authInfoRequested(final MemcardCheckTask memcardCheckTask, final boolean z) {
         if (!this.mIsActivityForeground) {
             this.mReservationDialog = 50;
         } else {
@@ -223,8 +212,7 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void localShowDialog(int i) {
+    private void localShowDialog(int i) {
         if (!this.mActivityIsFinishing) {
             if (!this.mIsActivityForeground) {
                 this.mReservationDialog = i;
@@ -233,13 +221,13 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
             LocalAlertDialogFragment localAlertDialogFragment = null;
             switch (i) {
                 case 1:
-                    localAlertDialogFragment = LocalAlertDialogFragment.newInstance(C2135R.string.memcard_media_not_found_message, C2135R.string.memcard_media_not_found_title, 1);
+                    localAlertDialogFragment = LocalAlertDialogFragment.newInstance(R.string.memcard_media_not_found_message, R.string.memcard_media_not_found_title, 1);
                     break;
                 case 2:
-                    localAlertDialogFragment = LocalAlertDialogFragment.newInstance(C2135R.string.memcard_comm_error_message, C2135R.string.memcard_comm_error_title, 2);
+                    localAlertDialogFragment = LocalAlertDialogFragment.newInstance(R.string.memcard_comm_error_message, R.string.memcard_comm_error_title, 2);
                     break;
                 case 3:
-                    localAlertDialogFragment = LocalAlertDialogFragment.newInstance(C2135R.string.EPS_PRNST_BUSY_MSG, C2135R.string.EPS_PRNST_BUSY_TITLE, 2);
+                    localAlertDialogFragment = LocalAlertDialogFragment.newInstance(R.string.EPS_PRNST_BUSY_MSG, R.string.EPS_PRNST_BUSY_TITLE, 2);
                     break;
             }
             if (localAlertDialogFragment != null) {
@@ -290,7 +278,7 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
     }
 
     private void showDialog(String str) {
-        DialogProgress newInstance = DialogProgress.newInstance(str, 0, getString(C2135R.string.memcard_connecting_printer), (String) null, (String) null, (String) null, (String) null);
+        DialogProgress newInstance = DialogProgress.newInstance(str, 0, getString(R.string.memcard_connecting_printer), (String) null, (String) null, (String) null, (String) null);
         newInstance.setCancelable(false);
         newInstance.show(getSupportFragmentManager(), str);
     }

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

@@ -50,14 +50,13 @@ public class MemcardWriteProgress extends Activity {
     private WifiDirectConnector mWifiDirectConnector;
     protected ArrayList<String> mWriteFileList;
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         Utils.setFInishOnTOuchOutside(this, false);
-        setContentView(C2135R.layout.memcard_write_progress);
+        setContentView(R.layout.memcard_write_progress);
         this.mCountDownLatch = new CountDownLatch(1);
-        this.mSheetPerTotalText = (TextView) findViewById(C2135R.C2137id.percent);
-        this.mTotalProgress = (ProgressBar) findViewById(C2135R.C2137id.progress_percent);
+        this.mSheetPerTotalText = (TextView) findViewById(R.C2137id.percent);
+        this.mTotalProgress = (ProgressBar) findViewById(R.C2137id.progress_percent);
         Intent intent = getIntent();
         this.mImageList = intent.getStringArrayListExtra("imageList");
         this.mTargetFolderName = intent.getStringExtra("target_folder_name");
@@ -73,11 +72,11 @@ public class MemcardWriteProgress extends Activity {
                 setResult(3);
                 finish();
             }
-            ((TextView) findViewById(C2135R.C2137id.copyingMessageText)).setText(C2135R.string.mcphotocopy_sending_message);
+            ((TextView) findViewById(R.C2137id.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(C2135R.C2137id.cancel_button);
+        this.mCancelButton = (Button) findViewById(R.C2137id.cancel_button);
         this.mCancelButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 MemcardWriteProgress.this.actionCancelTask();
@@ -86,8 +85,7 @@ public class MemcardWriteProgress extends Activity {
         execCopyTask();
     }
 
-    /* access modifiers changed from: protected */
-    public void execCopyTask() {
+    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]);
@@ -135,34 +133,29 @@ public class MemcardWriteProgress extends Activity {
         throw new UnsupportedOperationException("Method not decompiled: com.epson.memcardacc.MemcardWriteProgress.checkWriteFile(java.util.ArrayList, java.util.ArrayList):boolean");
     }
 
-    /* access modifiers changed from: protected */
-    public void onStart() {
+    protected void onStart() {
         super.onStart();
         MemcardUtil.keepScreenOn(getWindow());
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         this.mWifiDirectConnector.tryConnectWifiDirect();
     }
 
-    /* access modifiers changed from: protected */
-    public void onStop() {
+    protected void onStop() {
         EPLog.m305d(LOG_TAG, "onStop()");
         MemcardUtil.clearKeepScreenOn(getWindow());
         actionCancelTask();
         super.onStop();
     }
 
-    /* access modifiers changed from: protected */
-    public void actionCancelTask() {
+    protected void actionCancelTask() {
         this.mCancelButton.setEnabled(false);
         taskCancel();
     }
 
-    /* access modifiers changed from: protected */
-    public void taskCancel() {
+    protected void taskCancel() {
         this.mCopyTask.taskCancel();
     }
 
@@ -196,8 +189,7 @@ public class MemcardWriteProgress extends Activity {
         this.mCountDownLatch.countDown();
     }
 
-    /* access modifiers changed from: protected */
-    public boolean waitWifiConnect() {
+    protected boolean waitWifiConnect() {
         try {
             return this.mCountDownLatch.await(4, TimeUnit.MINUTES);
         } catch (InterruptedException e) {

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

@@ -42,33 +42,33 @@ public class PasswordDialogFragment extends DialogFragment implements DialogInte
             z = arguments.getBoolean(ARG_KEY_FIRST_AUTHENTICATION, true);
         }
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        View inflate = View.inflate(getActivity(), C2135R.layout.fragment_password_dialog, (ViewGroup) null);
-        this.mMessage = (TextView) inflate.findViewById(C2135R.C2137id.password_message);
-        this.mMessage.setText(z ? C2135R.string.memcard_password_input_message : C2135R.string.memcard_password_incorrect_message);
-        this.mUserNameEdit = (EditText) inflate.findViewById(C2135R.C2137id.memcardUsername);
-        this.mPasswordEdit = (EditText) inflate.findViewById(C2135R.C2137id.memcardPassword);
-        ((ImageButton) inflate.findViewById(C2135R.C2137id.imageButton1)).setOnClickListener(new View.OnClickListener() {
+        View inflate = View.inflate(getActivity(), R.layout.fragment_password_dialog, (ViewGroup) null);
+        this.mMessage = (TextView) inflate.findViewById(R.C2137id.password_message);
+        this.mMessage.setText(z ? R.string.memcard_password_input_message : R.string.memcard_password_incorrect_message);
+        this.mUserNameEdit = (EditText) inflate.findViewById(R.C2137id.memcardUsername);
+        this.mPasswordEdit = (EditText) inflate.findViewById(R.C2137id.memcardPassword);
+        ((ImageButton) inflate.findViewById(R.C2137id.imageButton1)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 PasswordDialogFragment.this.mUserNameEdit.getText().clear();
             }
         });
-        ((ImageButton) inflate.findViewById(C2135R.C2137id.imageButton2)).setOnClickListener(new View.OnClickListener() {
+        ((ImageButton) inflate.findViewById(R.C2137id.imageButton2)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 PasswordDialogFragment.this.mPasswordEdit.getText().clear();
             }
         });
-        builder.setView(inflate).setPositiveButton(C2135R.string.str_ok, new DialogInterface.OnClickListener() {
+        builder.setView(inflate).setPositiveButton(R.string.str_ok, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 String userName = PasswordDialogFragment.this.getUserName();
                 String password = PasswordDialogFragment.this.getPassword();
                 CifsAccess.setSmbAuthInfo(new SmbAuthInfo(userName, password));
                 ((Callback) PasswordDialogFragment.this.getActivity()).onPositiveClicked(userName, password);
             }
-        }).setNegativeButton(C2135R.string.str_cancel, new DialogInterface.OnClickListener() {
+        }).setNegativeButton(R.string.str_cancel, new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 PasswordDialogFragment.this.cancelAuthentication();
             }
-        }).setTitle(C2135R.string.str_enter_pass);
+        }).setTitle(R.string.str_enter_pass);
         AlertDialog create = builder.create();
         create.setCanceledOnTouchOutside(false);
         create.setOnKeyListener(this);

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

@@ -70,8 +70,7 @@ public class PhotoCopyImageSelectActivity extends ImageSelectActivity implements
         return new JpegImageFinder();
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         this.mWaitingForTransferEnd = false;
         if (bundle != null) {
@@ -81,8 +80,7 @@ public class PhotoCopyImageSelectActivity extends ImageSelectActivity implements
         this.mFileConvertViewModel.getData().observe(this, this.mFileConvertStateObserver);
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         if (i == 106) {
             this.mWaitingForTransferEnd = false;
@@ -103,8 +101,7 @@ public class PhotoCopyImageSelectActivity extends ImageSelectActivity implements
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostResume() {
+    protected void onPostResume() {
         super.onPostResume();
         DialogType dialogType = this.mDialogType;
         if (dialogType != null) {
@@ -113,24 +110,20 @@ public class PhotoCopyImageSelectActivity extends ImageSelectActivity implements
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void localShowDialog(DialogType dialogType) {
+    protected void localShowDialog(DialogType dialogType) {
         dialogType.getDialogFragment(this).show(getSupportFragmentManager(), "dialog");
     }
 
-    /* access modifiers changed from: protected */
-    public void onSaveInstanceState(Bundle bundle) {
+    protected void onSaveInstanceState(Bundle bundle) {
         super.onSaveInstanceState(bundle);
         bundle.putBoolean(SAVED_INSTANCE_STATE_KEY_WAITING_FOR_TRANSFER_END, this.mWaitingForTransferEnd);
     }
 
-    /* access modifiers changed from: protected */
-    public void clearSelectFile() {
+    protected void clearSelectFile() {
         refreshSelector(new ArrayList());
     }
 
-    /* access modifiers changed from: protected */
-    public void goNext() {
+    protected void goNext() {
         ArrayList<String> fileArrayList = getImageSelector().getFileArrayList();
         if (fileArrayList.size() > 0) {
             this.mFileConvertViewModel.startConvert(fileArrayList);
@@ -166,36 +159,36 @@ public class PhotoCopyImageSelectActivity extends ImageSelectActivity implements
             String str2 = null;
             switch (this.mDialogCode) {
                 case 111:
-                    str = context.getString(C2135R.string.memcard_file_read_error_message);
+                    str = context.getString(R.string.memcard_file_read_error_message);
                     break;
                 case 112:
                     int i = this.mErrorCode;
                     if (i == 5) {
-                        str2 = context.getString(C2135R.string.memcard_capacity_shortage_error_title);
-                        str = context.getString(C2135R.string.mcphotocopy_capacity_shortage_error_message);
+                        str2 = context.getString(R.string.memcard_capacity_shortage_error_title);
+                        str = context.getString(R.string.mcphotocopy_capacity_shortage_error_message);
                         break;
                     } else {
                         switch (i) {
                             case 1:
-                                str2 = context.getString(C2135R.string.memcard_comm_error_title);
-                                str = context.getString(C2135R.string.memcard_comm_error_message);
+                                str2 = context.getString(R.string.memcard_comm_error_title);
+                                str = context.getString(R.string.memcard_comm_error_message);
                                 break;
                             case 2:
-                                str2 = context.getString(C2135R.string.EPS_PRNST_BUSY_TITLE);
-                                str = context.getString(C2135R.string.EPS_PRNST_BUSY_MSG);
+                                str2 = context.getString(R.string.EPS_PRNST_BUSY_TITLE);
+                                str = context.getString(R.string.EPS_PRNST_BUSY_MSG);
                                 break;
                             case 3:
-                                str2 = context.getString(C2135R.string.mcphotocopy_media_not_found_title);
-                                str = context.getString(C2135R.string.mcphotocopy_media_not_found_message);
+                                str2 = context.getString(R.string.mcphotocopy_media_not_found_title);
+                                str = context.getString(R.string.mcphotocopy_media_not_found_message);
                                 break;
                             default:
-                                str2 = context.getString(C2135R.string.memcard_file_write_error_title);
-                                str = context.getString(C2135R.string.mcphotocopy_file_write_error_message);
+                                str2 = context.getString(R.string.memcard_file_write_error_title);
+                                str = context.getString(R.string.mcphotocopy_file_write_error_message);
                                 break;
                         }
                     }
                 case 113:
-                    str = context.getString(C2135R.string.mcphotocopy_file_size_over_message);
+                    str = context.getString(R.string.mcphotocopy_file_size_over_message);
                     break;
             }
             return AltAlertDialogFragment.newInstance(str2, str);
@@ -212,7 +205,7 @@ public class PhotoCopyImageSelectActivity extends ImageSelectActivity implements
         if (progressDialog != null) {
             progressDialog.dismiss();
         }
-        LocalProgressDialogFragment.newInstance(C2135R.string.convert_google_docs_convert).show(getSupportFragmentManager(), "progress");
+        LocalProgressDialogFragment.newInstance(R.string.convert_google_docs_convert).show(getSupportFragmentManager(), "progress");
     }
 
     private void hideProgress() {
@@ -222,8 +215,7 @@ public class PhotoCopyImageSelectActivity extends ImageSelectActivity implements
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void onConvertEnd(@NonNull FileConvertTask.ErrorType errorType, @Nullable ArrayList<String> arrayList) {
+    private void onConvertEnd(@NonNull FileConvertTask.ErrorType errorType, @Nullable ArrayList<String> arrayList) {
         if (errorType != FileConvertTask.ErrorType.NO_ERROR) {
             localShowDialog(new DialogType(getErrorDialogType(errorType)));
             clearSelectFile();

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

@@ -7,19 +7,16 @@ import com.epson.iprint.prtlogger.PrintLog;
 import epson.print.Util.EPLog;
 
 public class PhotoCopyWriteProgress extends MemcardWriteProgress {
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
     }
 
-    /* access modifiers changed from: protected */
-    public void taskCancel() {
+    protected void taskCancel() {
         EPLog.m313i("PhotoCopyWriteProgress", "taskCancel()");
         this.mCopyTask.taskCancelByFileSizeZero();
     }
 
-    /* access modifiers changed from: protected */
-    public void execCopyTask() {
+    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]);

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

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

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

@@ -108,8 +108,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
         this.mCallBack = bleWorkCallback;
     }
 
-    /* access modifiers changed from: protected */
-    public void onPreExecute() {
+    protected void onPreExecute() {
         super.onPreExecute();
         this.mBleWork = BleScanWork.getInstace();
     }
@@ -212,8 +211,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
         throw new UnsupportedOperationException("Method not decompiled: com.epson.mobilephone.common.ble.BleAsyncTask.doInBackground(java.lang.Void[]):java.lang.Boolean");
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostExecute(Boolean bool) {
+    protected void onPostExecute(Boolean bool) {
         super.onPostExecute(bool);
         EpLog.m69d("" + bool);
     }
@@ -230,7 +228,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
             this.mCallBack.call(arrayList);
             return;
         }
-        dialog = new AlertDialog.Builder(this.m_Activity).setCancelable(false).setMessage(this.m_Activity.getString(C2135R.string.BLE_find_unconfigured_printer_title)).setPositiveButton(this.m_Activity.getString(C2135R.string.BLE_find_unconfigured_printer_setup_button), new DialogInterface.OnClickListener() {
+        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() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 EpLog.m69d("★ stopScan");
                 BleAsyncTask.this.mBleWork.stopScan();
@@ -244,7 +242,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
                 intent.putParcelableArrayListExtra(ScannedDevice.TYPE, arrayList);
                 BleAsyncTask.this.m_Activity.startActivity(intent);
             }
-        }).setNegativeButton(this.m_Activity.getString(C2135R.string.BLE_find_unconfigured_printer_not_now_button), new DialogInterface.OnClickListener() {
+        }).setNegativeButton(this.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();
@@ -254,14 +252,12 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
         dialog.show();
     }
 
-    /* access modifiers changed from: protected */
-    public void onCancelled(Boolean bool) {
+    protected void onCancelled(Boolean bool) {
         super.onCancelled(bool);
         EpLog.m69d("死にました。  " + bool);
     }
 
-    /* access modifiers changed from: protected */
-    public void onCancelled() {
+    protected void onCancelled() {
         super.onCancelled();
     }
 

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

@@ -138,8 +138,7 @@ public class BleScanWork {
         return new ArrayList<>(this.mScannedDeviceList);
     }
 
-    /* access modifiers changed from: package-private */
-    public void search(BLEUtility.BleWorkCallback bleWorkCallback, BLEUtility.BleWorkCallback bleWorkCallback2) {
+    private void search(BLEUtility.BleWorkCallback bleWorkCallback, BLEUtility.BleWorkCallback bleWorkCallback2) {
         this.mSuccess = bleWorkCallback;
         this.mFailed = bleWorkCallback2;
         startScan(true);
@@ -194,8 +193,7 @@ public class BleScanWork {
         return true;
     }
 
-    /* access modifiers changed from: package-private */
-    public void startScan(boolean z) {
+    private void startScan(boolean z) {
         ScanSettings scanSettings;
         EpLog.m77i("☆startScan☆");
         this.mScannedDeviceList.clear();

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

@@ -875,8 +875,7 @@ public class BleWork {
         return false;
     }
 
-    /* access modifiers changed from: package-private */
-    public void setSequenceCallback(BLEUtility.BleWorkCallback bleWorkCallback, BLEUtility.BleWorkCallback bleWorkCallback2) {
+    private void setSequenceCallback(BLEUtility.BleWorkCallback bleWorkCallback, BLEUtility.BleWorkCallback bleWorkCallback2) {
         this.mSequenceCallbackSuccess = bleWorkCallback;
         this.mSequenceCallbackFailed = bleWorkCallback2;
     }
@@ -886,8 +885,7 @@ public class BleWork {
         this.mResposne = bleWorkCallback;
     }
 
-    /* access modifiers changed from: package-private */
-    public void setSSID(BLEUtility.BleWorkCallback bleWorkCallback, BLEUtility.BleWorkCallback bleWorkCallback2) {
+    private void setSSID(BLEUtility.BleWorkCallback bleWorkCallback, BLEUtility.BleWorkCallback bleWorkCallback2) {
         this.mSuccess = bleWorkCallback;
         this.mFailed = bleWorkCallback2;
         this.mSequence = jobSequence.MIB_GET_MACADDRESS;
@@ -964,8 +962,7 @@ public class BleWork {
             this.success = false;
         }
 
-        /* access modifiers changed from: protected */
-        public void onPreExecute() {
+        protected void onPreExecute() {
             super.onPreExecute();
             EpLog.m76i();
             try {
@@ -1015,8 +1012,7 @@ public class BleWork {
             return false;
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(Boolean bool) {
+        protected void onPostExecute(Boolean bool) {
             super.onPostExecute(bool);
             if (bool.booleanValue()) {
                 try {
@@ -1344,8 +1340,7 @@ public class BleWork {
         failedProcessing();
     }
 
-    /* access modifiers changed from: package-private */
-    public void failedProcessing() {
+    private void failedProcessing() {
         disconnect();
         if (this.mSequenceCallbackFailed != null) {
             EpLog.m71e(" " + this.mSequence);

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

@@ -86,14 +86,13 @@ public class BleWorkActivity extends ActivityIACommon {
         void call(Object obj);
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         EpLog.m76i();
         super.onCreate(bundle);
         requestWindowFeature(5);
-        setContentView((int) C2135R.layout.activity_scan);
-        setActionBar((int) C2135R.string.BLE_select_unconfigured_printer_title, true);
-        findViewById(C2135R.C2137id.progress_bar).setVisibility(8);
+        setContentView((int) R.layout.activity_scan);
+        setActionBar((int) R.string.BLE_select_unconfigured_printer_title, true);
+        findViewById(R.C2137id.progress_bar).setVisibility(8);
         this.mContext = this;
         callBackFuncs();
         getWindow().addFlags(128);
@@ -102,8 +101,7 @@ public class BleWorkActivity extends ActivityIACommon {
         this.mBleWork.resetSequence();
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         ArrayList parcelableArrayListExtra;
         super.onResume();
         this.mProbePrinter.bindEpsonService();
@@ -113,28 +111,24 @@ public class BleWorkActivity extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
         EpLog.m76i();
     }
 
-    /* access modifiers changed from: protected */
-    public void onStart() {
+    protected void onStart() {
         super.onStart();
         this.isAlive = true;
     }
 
-    /* access modifiers changed from: protected */
-    public void onStop() {
+    protected void onStop() {
         super.onStop();
         EpLog.m76i();
         this.isAlive = false;
         getWindow().clearFlags(128);
     }
 
-    /* access modifiers changed from: protected */
-    public void onDestroy() {
+    protected void onDestroy() {
         super.onDestroy();
         this.mProbePrinter.unbindEpsonService();
     }
@@ -297,9 +291,9 @@ public class BleWorkActivity extends ActivityIACommon {
             public void run() {
                 AlertDialog.Builder cancelable = new AlertDialog.Builder(BleWorkActivity.this.mContext).setCancelable(false);
                 if (z) {
-                    cancelable.setTitle(BleWorkActivity.this.getString(C2135R.string.BLE_success_setup_printer_title));
-                    cancelable.setMessage(BleWorkActivity.this.getString(C2135R.string.BLE_success_setup_printer_msg));
-                    cancelable.setPositiveButton(BleWorkActivity.this.getString(C2135R.string.ok_button), new DialogInterface.OnClickListener() {
+                    cancelable.setTitle(BleWorkActivity.this.getString(R.string.BLE_success_setup_printer_title));
+                    cancelable.setMessage(BleWorkActivity.this.getString(R.string.BLE_success_setup_printer_msg));
+                    cancelable.setPositiveButton(BleWorkActivity.this.getString(R.string.ok_button), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
                             Analytics.SetUpPath setUpPath;
                             if (BleWorkActivity.this.getCallingActivity() != null) {
@@ -315,15 +309,15 @@ public class BleWorkActivity extends ActivityIACommon {
                         }
                     });
                 } else {
-                    cancelable.setTitle(BleWorkActivity.this.getString(C2135R.string.BLE_fail_setup_printer_title));
-                    cancelable.setMessage(BleWorkActivity.this.getString(C2135R.string.BLE_fail_setup_printer_msg));
-                    cancelable.setPositiveButton(BleWorkActivity.this.getString(C2135R.string.BLE_fail_setup_printer_other_method_button), new DialogInterface.OnClickListener() {
+                    cancelable.setTitle(BleWorkActivity.this.getString(R.string.BLE_fail_setup_printer_title));
+                    cancelable.setMessage(BleWorkActivity.this.getString(R.string.BLE_fail_setup_printer_msg));
+                    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);
                             BleWorkActivity.this.finish();
                         }
-                    }).setNeutralButton(BleWorkActivity.this.getString(C2135R.string.str_btn_close), new DialogInterface.OnClickListener() {
+                    }).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);
                             BleWorkActivity.this.finish();
@@ -336,8 +330,7 @@ public class BleWorkActivity extends ActivityIACommon {
         });
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         if (i == REQUEST_CODE_EPSON_CONNECT_REGISTRATION) {
             finish();
         }
@@ -352,17 +345,17 @@ public class BleWorkActivity extends ActivityIACommon {
         }
         this.isStopSetUpProgress = false;
         this.mAlertDialog = new AlertDialog.Builder(this.mContext).setCancelable(false).create();
-        View inflate = LayoutInflater.from(this.mContext).inflate(C2135R.layout.ble_progress_layout, (ViewGroup) null);
+        View inflate = LayoutInflater.from(this.mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null);
         this.mAlertDialog.setView(inflate);
-        this.mProgressPercent = (ProgressBar) inflate.findViewById(C2135R.C2137id.progress_percent);
+        this.mProgressPercent = (ProgressBar) inflate.findViewById(R.C2137id.progress_percent);
         this.mProgressPercent.setVisibility(0);
-        this.mPercentView = (TextView) inflate.findViewById(C2135R.C2137id.percent);
+        this.mPercentView = (TextView) inflate.findViewById(R.C2137id.percent);
         this.mPercentView.setVisibility(0);
-        inflate.findViewById(C2135R.C2137id.space_upper).setVisibility(0);
+        inflate.findViewById(R.C2137id.space_upper).setVisibility(0);
         this.mProgressPercent.setProgress(0);
         this.mProgressPercent.setMax(100);
         this.mPercentView.setText("0%");
-        this.mAlertDialog.setMessage(getResources().getString(C2135R.string.BLE_wait_setup_complete_msg));
+        this.mAlertDialog.setMessage(getResources().getString(R.string.BLE_wait_setup_complete_msg));
         this.mAlertDialog.show();
         this.count = 0;
         stopSetUpProgress();
@@ -417,9 +410,9 @@ public class BleWorkActivity extends ActivityIACommon {
     }
 
     private void init(ArrayList<ScannedDevice> arrayList) {
-        ListView listView = (ListView) findViewById(C2135R.C2137id.list);
+        ListView listView = (ListView) findViewById(R.C2137id.list);
         Collections.sort(arrayList, new ScannedDeviceComparator());
-        this.mDeviceAdapter = new DeviceAdapter(this, C2135R.layout.listitem_device, arrayList != null ? arrayList : new ArrayList<>());
+        this.mDeviceAdapter = new DeviceAdapter(this, R.layout.listitem_device, arrayList != null ? arrayList : new ArrayList<>());
         listView.setAdapter(this.mDeviceAdapter);
         if (arrayList.size() == 1) {
             selectDevice((ScannedDevice) this.mDeviceAdapter.getItem(0));
@@ -460,10 +453,10 @@ public class BleWorkActivity extends ActivityIACommon {
     /* access modifiers changed from: private */
     public void getInfoForConnectDialog(String str) {
         this.mAlertDialog = new AlertDialog.Builder(this).setCancelable(false).create();
-        this.mAlertDialog.setView(LayoutInflater.from(this.mContext).inflate(C2135R.layout.ble_progress_layout, (ViewGroup) null));
+        this.mAlertDialog.setView(LayoutInflater.from(this.mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null));
         String property = System.getProperty("line.separator");
         AlertDialog alertDialog = this.mAlertDialog;
-        alertDialog.setMessage(str + property + property + getString(C2135R.string.BLE_inquiry_access_point_information_msg));
+        alertDialog.setMessage(str + property + property + getString(R.string.BLE_inquiry_access_point_information_msg));
         if (this.isAlive && !isFinishing()) {
             this.mAlertDialog.show();
         }
@@ -506,8 +499,8 @@ public class BleWorkActivity extends ActivityIACommon {
                 BleWorkActivity bleWorkActivity = BleWorkActivity.this;
                 bleWorkActivity.mAlertDialog = null;
                 AlertDialog.Builder cancelable = new AlertDialog.Builder(bleWorkActivity.mContext).setCancelable(false);
-                cancelable.setMessage(BleWorkActivity.this.getString(C2135R.string.BLE_setup_general_error_msg));
-                cancelable.setPositiveButton(BleWorkActivity.this.getString(C2135R.string.BLE_setup_abort_button), new DialogInterface.OnClickListener() {
+                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);
                         BleWorkActivity.this.finish();
@@ -546,8 +539,8 @@ public class BleWorkActivity extends ActivityIACommon {
         bleWorkActivity.mAlertDialog = null;
         boolean z = !bleWorkActivity.mBleWork.getSsidLis().isEmpty();
         AlertDialog.Builder cancelable = new AlertDialog.Builder(bleWorkActivity.mContext).setCancelable(false);
-        cancelable.setMessage(bleWorkActivity.getString(C2135R.string.BLE_not_support_security_type));
-        cancelable.setPositiveButton(bleWorkActivity.getString(z ? C2135R.string.str_btn_close : C2135R.string.BLE_setup_abort_button), new DialogInterface.OnClickListener(z) {
+        cancelable.setMessage(bleWorkActivity.getString(R.string.BLE_not_support_security_type));
+        cancelable.setPositiveButton(bleWorkActivity.getString(z ? R.string.str_btn_close : R.string.BLE_setup_abort_button), new DialogInterface.OnClickListener(z) {
             private final /* synthetic */ boolean f$1;
 
             {
@@ -584,15 +577,15 @@ public class BleWorkActivity extends ActivityIACommon {
                 BleWorkActivity.this.mBleWork.disconnect(false);
                 EpLog.m69d("sequence = " + BleWorkActivity.this.mBleWork.mSequence);
                 List<String> ssidLis = BleWorkActivity.this.mBleWork.getSsidLis();
-                ssidLis.remove(BleWorkActivity.this.getResources().getText(C2135R.string.BLE_select_SSID_manual_button).toString());
+                ssidLis.remove(BleWorkActivity.this.getResources().getText(R.string.BLE_select_SSID_manual_button).toString());
                 BleWorkActivity.this.sortSSIDlist(ssidLis);
-                ssidLis.add(BleWorkActivity.this.getResources().getText(C2135R.string.BLE_select_SSID_manual_button).toString());
+                ssidLis.add(BleWorkActivity.this.getResources().getText(R.string.BLE_select_SSID_manual_button).toString());
                 final String[] strArr = (String[]) ssidLis.toArray(new String[ssidLis.size()]);
                 LinearLayout linearLayout = new LinearLayout(BleWorkActivity.this);
                 LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(-2, -2);
                 layoutParams.setMargins(40, 25, 40, 25);
                 TextView textView = new TextView(BleWorkActivity.this);
-                textView.setText(BleWorkActivity.this.getResources().getText(C2135R.string.BLE_select_SSID_screen_msg));
+                textView.setText(BleWorkActivity.this.getResources().getText(R.string.BLE_select_SSID_screen_msg));
                 textView.setTextSize(20.0f);
                 textView.setLayoutParams(layoutParams);
                 linearLayout.addView(textView);
@@ -620,7 +613,7 @@ public class BleWorkActivity extends ActivityIACommon {
                         BleWorkActivity.this.mBleWork.setSSIDType();
                     }
                 });
-                cancelable.setNegativeButton(BleWorkActivity.this.getString(C2135R.string.BLE_setup_abort_button), new DialogInterface.OnClickListener() {
+                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);
@@ -674,10 +667,10 @@ public class BleWorkActivity extends ActivityIACommon {
                     }
                 });
                 AlertDialog.Builder cancelable = new AlertDialog.Builder(BleWorkActivity.this).setCancelable(false);
-                cancelable.setTitle(BleWorkActivity.this.getString(C2135R.string.BLE_input_SSID_by_manual_dialog_title));
-                cancelable.setMessage(BleWorkActivity.this.getString(C2135R.string.BLE_input_SSID_by_manual_dialog_msg));
+                cancelable.setTitle(BleWorkActivity.this.getString(R.string.BLE_input_SSID_by_manual_dialog_title));
+                cancelable.setMessage(BleWorkActivity.this.getString(R.string.BLE_input_SSID_by_manual_dialog_msg));
                 cancelable.setView(editText);
-                cancelable.setPositiveButton(BleWorkActivity.this.getString(C2135R.string.ok_button), new DialogInterface.OnClickListener() {
+                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());
@@ -686,7 +679,7 @@ public class BleWorkActivity extends ActivityIACommon {
                         BleWorkActivity.this.setSSIDPassword();
                     }
                 });
-                cancelable.setNegativeButton(BleWorkActivity.this.getString(C2135R.string.no_button), new DialogInterface.OnClickListener() {
+                cancelable.setNegativeButton(BleWorkActivity.this.getString(R.string.no_button), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         EpLog.m76i();
                         ((InputMethodManager) BleWorkActivity.this.getSystemService("input_method")).hideSoftInputFromWindow(editText.getWindowToken(), 2);
@@ -752,12 +745,12 @@ public class BleWorkActivity extends ActivityIACommon {
                         }
                     });
                     AlertDialog.Builder cancelable = new AlertDialog.Builder(BleWorkActivity.this).setCancelable(false);
-                    cancelable.setTitle(BleWorkActivity.this.getString(C2135R.string.BLE_input_password_of_SSID_dialog_title));
+                    cancelable.setTitle(BleWorkActivity.this.getString(R.string.BLE_input_password_of_SSID_dialog_title));
                     BleWorkActivity bleWorkActivity2 = BleWorkActivity.this;
                     boolean z = true;
-                    cancelable.setMessage(bleWorkActivity2.getString(C2135R.string.BLE_input_password_of_SSID_dialog_msg, new Object[]{bleWorkActivity2.mBleWork.getSSID()}));
+                    cancelable.setMessage(bleWorkActivity2.getString(R.string.BLE_input_password_of_SSID_dialog_msg, new Object[]{bleWorkActivity2.mBleWork.getSSID()}));
                     cancelable.setView(editText);
-                    cancelable.setPositiveButton(BleWorkActivity.this.getString(C2135R.string.ok_button), new DialogInterface.OnClickListener() {
+                    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());
@@ -769,7 +762,7 @@ public class BleWorkActivity extends ActivityIACommon {
                             ((InputMethodManager) BleWorkActivity.this.getSystemService("input_method")).hideSoftInputFromWindow(editText.getWindowToken(), 2);
                         }
                     });
-                    cancelable.setNegativeButton(BleWorkActivity.this.getString(C2135R.string.no_button), new DialogInterface.OnClickListener() {
+                    cancelable.setNegativeButton(BleWorkActivity.this.getString(R.string.no_button), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
                             EpLog.m76i();
                             ((InputMethodManager) BleWorkActivity.this.getSystemService("input_method")).hideSoftInputFromWindow(editText.getWindowToken(), 2);

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

@@ -35,32 +35,31 @@ public class DeviceAdapter extends ArrayAdapter<ScannedDevice> {
         if (view == null) {
             view = this.mInflater.inflate(this.mResId, (ViewGroup) null);
         }
-        TextView textView = (TextView) view.findViewById(C2135R.C2137id.device_name);
+        TextView textView = (TextView) view.findViewById(R.C2137id.device_name);
         textView.setText(scannedDevice.getDisplayName());
         if (IprintApplication.isReleaseUnlimited()) {
-            ((TextView) view.findViewById(C2135R.C2137id.device_address)).setText(scannedDevice.getDevice().getAddress());
-            TextView textView2 = (TextView) view.findViewById(C2135R.C2137id.device_rssi);
+            ((TextView) view.findViewById(R.C2137id.device_address)).setText(scannedDevice.getDevice().getAddress());
+            TextView textView2 = (TextView) view.findViewById(R.C2137id.device_rssi);
             textView2.setText(PREFIX_RSSI + Integer.toString(scannedDevice.getRssi()));
             textView2.setTextColor(-3355444);
         } else {
-            view.findViewById(C2135R.C2137id.device_address).setVisibility(8);
-            view.findViewById(C2135R.C2137id.device_rssi).setVisibility(8);
+            view.findViewById(R.C2137id.device_address).setVisibility(8);
+            view.findViewById(R.C2137id.device_rssi).setVisibility(8);
             textView.setPadding(0, 20, 0, 20);
         }
-        ((ImageView) view.findViewById(C2135R.C2137id.signal)).setImageDrawable(getThresholdIcon(scannedDevice.getRssi()));
+        ((ImageView) view.findViewById(R.C2137id.signal)).setImageDrawable(getThresholdIcon(scannedDevice.getRssi()));
         return view;
     }
 
-    /* access modifiers changed from: package-private */
-    public Drawable getThresholdIcon(int i) {
+    private Drawable getThresholdIcon(int i) {
         Resources resources = getContext().getResources();
-        int i2 = C2135R.C2136drawable.signal_1;
+        int i2 = R.C2136drawable.signal_1;
         if (i >= -60) {
             EpLog.m77i("HIGH_SIGNAL");
-            i2 = C2135R.C2136drawable.signal_3;
+            i2 = R.C2136drawable.signal_3;
         } else if (i >= -70) {
             EpLog.m77i("MID_SIGNAL");
-            i2 = C2135R.C2136drawable.signal_2;
+            i2 = R.C2136drawable.signal_2;
         } else if (i >= -75) {
             EpLog.m77i("LOW_SIGNAL");
         }

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

@@ -211,8 +211,7 @@ public class ProbePrinter {
         EpLog.m77i("bindEpsonService OK !!");
     }
 
-    /* access modifiers changed from: package-private */
-    public void unbindEpsonService() {
+    private void unbindEpsonService() {
         EpLog.m76i();
         if (this.mEpsonService != null) {
             if (!this.isPrinterFound) {
@@ -232,8 +231,7 @@ public class ProbePrinter {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void callbackCompletion(boolean z) {
+    private void callbackCompletion(boolean z) {
         BleWorkActivity.CallbackWork callbackWork = this.completion;
         if (callbackWork != null) {
             callbackWork.call(Boolean.valueOf(z));
@@ -258,13 +256,11 @@ public class ProbePrinter {
             this.mMyPrinter = myPrinter;
         }
 
-        /* access modifiers changed from: protected */
-        public void onPreExecute() {
+        protected void onPreExecute() {
             super.onPreExecute();
         }
 
-        /* access modifiers changed from: protected */
-        public Integer doInBackground(Void... voidArr) {
+        protected Integer doInBackground(Void... voidArr) {
             int doProbePrinter = this.mPrinter.doProbePrinter(60, this.mMyPrinter.getPrinterId(), this.mMyPrinter.getIp(), 3);
             if (doProbePrinter != 0) {
                 return Integer.valueOf(doProbePrinter);
@@ -296,8 +292,7 @@ public class ProbePrinter {
             return Integer.valueOf(epsWrapperGetSupportedMedia);
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(Integer num) {
+        protected void onPostExecute(Integer num) {
             super.onPostExecute(num);
             if (num.intValue() == 0) {
                 ProbePrinter.this.selectPrinter(this.mMyPrinter);
@@ -315,8 +310,7 @@ public class ProbePrinter {
             this.mPrinter = myPrinter;
         }
 
-        /* access modifiers changed from: protected */
-        public Context doInBackground(Context... contextArr) {
+        protected Context doInBackground(Context... contextArr) {
             boolean z;
             Context applicationContext = contextArr[0].getApplicationContext();
             EpLog.m77i("スキャナ検索処理");
@@ -352,8 +346,7 @@ public class ProbePrinter {
             }
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(Context context) {
+        protected void onPostExecute(Context context) {
             super.onPostExecute(context);
             EpLog.m77i("スキャナ検索onPostExecute");
             ProbePrinter.this.callbackCompletion(true);

+ 1 - 2
app/src/main/java/com/epson/mobilephone/common/guide/MyViewPager.java

@@ -14,8 +14,7 @@ public class MyViewPager extends ViewPager {
         super(context, attributeSet);
     }
 
-    /* access modifiers changed from: protected */
-    public void onMeasure(int i, int i2) {
+    protected void onMeasure(int i, int i2) {
         int i3 = 0;
         for (int i4 = 0; i4 < getChildCount(); i4++) {
             View childAt = getChildAt(i4);

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

@@ -53,8 +53,7 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
     private MyViewPager mViewPager;
     private int version;
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         String str;
         super.onCreate(bundle);
         setContentView(C0907R.layout.activity_notice_guide);
@@ -212,8 +211,7 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public void changePage(int i) {
+        private void changePage(int i) {
             int i2 = 0;
             while (true) {
                 ImageView[] imageViewArr = this.mPagePosition;

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

@@ -21,11 +21,9 @@ public class SecureKeyFactory {
     protected Context mAppContext = null;
     String mSecurityProvider = "AndroidOpenSSL";
 
-    /* access modifiers changed from: package-private */
-    public native byte[] navite_getAppKey(Context context);
+    private native byte[] navite_getAppKey(Context context);
 
-    /* access modifiers changed from: package-private */
-    public native byte[] navite_getKey(Context context);
+    private native byte[] navite_getKey(Context context);
 
     protected SecureKeyFactory(Context context) {
         try {
@@ -104,8 +102,7 @@ public class SecureKeyFactory {
         return new String(decodeAes, this.charset);
     }
 
-    /* access modifiers changed from: package-private */
-    public byte[] encodeAes(byte[] bArr, byte[] bArr2) {
+    private byte[] encodeAes(byte[] bArr, byte[] bArr2) {
         if (bArr == null || bArr2 == null) {
             return null;
         }
@@ -120,8 +117,7 @@ public class SecureKeyFactory {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public byte[] makeKeyBytes(int i, byte[] bArr) {
+    private byte[] makeKeyBytes(int i, byte[] bArr) {
         byte[] bArr2 = new byte[i];
         for (int i2 = 0; i2 < bArr2.length; i2++) {
             if (i2 < bArr.length) {
@@ -133,8 +129,7 @@ public class SecureKeyFactory {
         return bArr2;
     }
 
-    /* access modifiers changed from: package-private */
-    public byte[] decodeAes(byte[] bArr, byte[] bArr2) {
+    private byte[] decodeAes(byte[] bArr, byte[] bArr2) {
         if (bArr == null || bArr2 == null) {
             return null;
         }

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

@@ -28,8 +28,7 @@ public class InfoDisplayActivity extends AppCompatActivity {
         String getTitle(@NonNull Context context);
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         supportRequestWindowFeature(8);
         setContentView(C1066R.layout.activity_info_display);
@@ -98,8 +97,7 @@ public class InfoDisplayActivity extends AppCompatActivity {
         return true;
     }
 
-    /* access modifiers changed from: protected */
-    public void onSaveInstanceState(Bundle bundle) {
+    protected void onSaveInstanceState(Bundle bundle) {
         super.onSaveInstanceState(bundle);
         bundle.putInt(KEY_SCROLL_Y, this.mScrollView.getLastY());
     }

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

@@ -26,8 +26,7 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
     public void onBackPressed() {
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView(C1066R.layout.activity_license_top);
         ((ViewGroup) findViewById(C1066R.C1068id.licenseViewGroup)).setOnClickListener(new View.OnClickListener() {
@@ -153,8 +152,7 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         if (i == 2) {
             setResult(-1);
             finish();

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

@@ -21,8 +21,7 @@ public class RestoreScrollView extends ScrollView {
         super(context, attributeSet, i);
     }
 
-    /* access modifiers changed from: protected */
-    public void onScrollChanged(int i, int i2, int i3, int i4) {
+    protected void onScrollChanged(int i, int i2, int i3, int i4) {
         super.onScrollChanged(i, i2, i3, i4);
         this.mLastY = i2;
     }

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

@@ -27,8 +27,7 @@ public class UserSurveyInvitationActivity extends AppCompatActivity implements S
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         UserSurveyInfo userSurveyInfo;
         super.onCreate(bundle);
         setContentView(C1066R.layout.activity_user_survey_invitation);

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

@@ -124,8 +124,7 @@ public class MaintainPrinter2 {
         return epsWrapperProbePrinter2;
     }
 
-    /* access modifiers changed from: package-private */
-    public int[] getStatus() {
+    private int[] getStatus() {
         return getMPrinterInfor().getMStatus();
     }
 

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

@@ -19,8 +19,7 @@ public class UsbReciever extends Activity {
         void permissionGranted(Context context, boolean z);
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         Intent intent = getIntent();
         String action = intent.getAction();

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

@@ -44,14 +44,11 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         PRINTER_FINDING
     }
 
-    /* access modifiers changed from: package-private */
-    public abstract void closeWaitingDialog();
+    private abstract void closeWaitingDialog();
 
-    /* access modifiers changed from: protected */
-    public abstract void onEnabledWifi();
+    protected abstract void onEnabledWifi();
 
-    /* access modifiers changed from: package-private */
-    public abstract void onError();
+    private abstract void onError();
 
     public static int getLastDetailResult() {
         return sLastDetailResult;
@@ -61,16 +58,14 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         sLastDetailResult = i;
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         this.mWifiManager = (WifiManager) getApplicationContext().getApplicationContext().getSystemService("wifi");
         requestWindowFeature(1);
         this.searchWiFiDirectPrinter = SearchWiFiDirectPrinterTask.getInstance(this);
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         if (i == 1) {
             if (i2 != -1) {
@@ -84,8 +79,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         EPLog.m86d(TAG, "onResume()");
         super.onResume();
         NfcDispatchUtils.enableForegroundDispatch(this, (IntentFilter[]) null, (String[][]) null);
@@ -93,8 +87,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         getWindow().addFlags(128);
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         EPLog.m86d(TAG, "onPause()");
         super.onPause();
         NfcDispatchUtils.disableForegroundDispatch(this);
@@ -102,14 +95,12 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         getWindow().clearFlags(128);
     }
 
-    /* access modifiers changed from: protected */
-    public void onStop() {
+    protected void onStop() {
         EPLog.m86d(TAG, "onStop()");
         super.onStop();
     }
 
-    /* access modifiers changed from: protected */
-    public void onDestroy() {
+    protected void onDestroy() {
         EPLog.m86d(TAG, "onDestroy()");
         super.onDestroy();
         interrupt();
@@ -121,8 +112,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         interrupt();
     }
 
-    /* access modifiers changed from: package-private */
-    public void interrupt() {
+    private void interrupt() {
         this.status = Status.IDLE;
         SearchWiFiDirectPrinterTask searchWiFiDirectPrinterTask = this.searchWiFiDirectPrinter;
         if (searchWiFiDirectPrinterTask != null) {
@@ -133,8 +123,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         interruptFindingPrinter();
     }
 
-    /* access modifiers changed from: package-private */
-    public void interruptFindingPrinter() {
+    private void interruptFindingPrinter() {
         FindPrinterTask findPrinterTask = this.taskFindPrinter;
         if (findPrinterTask != null) {
             findPrinterTask.cancel();
@@ -142,13 +131,11 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void interruptConnecting() {
+    protected void interruptConnecting() {
         this.connectingObserver.interrupt();
     }
 
-    /* access modifiers changed from: package-private */
-    public void onConnectedPrinter(Intent intent) {
+    private void onConnectedPrinter(Intent intent) {
         EPLog.m86d(TAG, "finish():RESULT_OK");
         closeWaitingDialog();
         setResult(-1, intent);
@@ -156,8 +143,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         finish();
     }
 
-    /* access modifiers changed from: package-private */
-    public void setupObserver() {
+    private void setupObserver() {
         this.connectingObserver.start(this.timeout * 1000);
     }
 
@@ -167,13 +153,11 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         ConnectingObserver() {
         }
 
-        /* access modifiers changed from: package-private */
-        public void start(final int i) {
+        private void start(final int i) {
             interrupt();
             EPLog.m86d(ActivityConnectBase.TAG, "Start ConnectingObserver");
             this.observerTask = new AsyncTask<Void, Void, Void>() {
-                /* access modifiers changed from: protected */
-                public Void doInBackground(Void... voidArr) {
+                protected Void doInBackground(Void... voidArr) {
                     int i = 0;
                     do {
                         try {
@@ -190,16 +174,14 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
                     return null;
                 }
 
-                /* access modifiers changed from: protected */
-                public void onPostExecute(Void voidR) {
+                protected void onPostExecute(Void voidR) {
                     EPLog.m88i(ActivityConnectBase.TAG, "Timeout ConnectingObserver");
                     ActivityConnectBase.this.onError();
                 }
             }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
         }
 
-        /* access modifiers changed from: package-private */
-        public void interrupt() {
+        private void interrupt() {
             AsyncTask<Void, Void, Void> asyncTask = this.observerTask;
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
                 EPLog.m86d(ActivityConnectBase.TAG, "Stop ConnectingObserver");

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

@@ -169,8 +169,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         return i;
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    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[]>>() {
@@ -214,8 +213,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         if (i != 2) {
             if (i == 5) {
@@ -231,8 +229,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onEnabledWifi() {
+    protected void onEnabledWifi() {
         WiFiUtils instance = WiFiUtils.getInstance(this);
         String curSSID = instance.getCurSSID();
         if (!WiFiControl.isSimpleAP(curSSID) || instance.invalidateSimpleAP(this, instance.getCurNetworkId())) {
@@ -350,8 +347,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void interruptConnecting() {
+    protected void interruptConnecting() {
         super.interruptConnecting();
         WiFiDirectBroadcastReceiver wiFiDirectBroadcastReceiver = this.p2pStateChangeReciever;
         if (wiFiDirectBroadcastReceiver != null) {
@@ -364,8 +360,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void onConnectedWiFi() {
+    private void onConnectedWiFi() {
         EPLog.m86d(TAG, "onConnect()");
         interruptConnecting();
         ManageDefaultNetwork.getInstance(this).resetDefaultNetwork();
@@ -394,8 +389,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         this.taskFindPrinter.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
     }
 
-    /* access modifiers changed from: package-private */
-    public void onError() {
+    private void onError() {
         closeWaitingDialog();
         Toast.makeText(this, getString(C1113R.string.str_error_connecting_printer_short), 1).show();
         if (this.searchWiFiDirectPrinter != null) {
@@ -432,8 +426,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         finish();
     }
 
-    /* access modifiers changed from: package-private */
-    public void closeWaitingDialog() {
+    private void closeWaitingDialog() {
         EPLog.m86d(TAG, "Called closeWaitingDialog()");
         try {
             this.mModelDialog.doDismiss(IDD_WIFI_WAITING);
@@ -442,8 +435,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void setupObserver() {
+    private void setupObserver() {
         super.setupObserver();
         this.p2pStateChangeReciever = new WiFiDirectBroadcastReceiver();
         registerReceiver(this.p2pStateChangeReciever, new IntentFilter("android.net.wifi.p2p.CONNECTION_STATE_CHANGE"));

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

@@ -143,8 +143,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         return i;
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    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[]>>() {
@@ -177,8 +176,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         this.mHandler.sendEmptyMessage(11);
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         if (i != 2) {
             switch (i) {
@@ -209,8 +207,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onEnabledWifi() {
+    protected void onEnabledWifi() {
         if (this.targetSsid.equals(WiFiUtils.getInstance(this).getCurSSID())) {
             EPLog.m86d(TAG, "Already Connected!!");
             this.status = ActivityConnectBase.Status.WIFI_CONNECTING;
@@ -372,8 +369,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void interruptConnecting() {
+    protected void interruptConnecting() {
         super.interruptConnecting();
         NetworkStateChangeReciever networkStateChangeReciever2 = this.networkStateChangeReciever;
         if (networkStateChangeReciever2 != null) {
@@ -386,19 +382,16 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void onConnectedWiFi() {
+    private void onConnectedWiFi() {
         EPLog.m86d(TAG, "onConnect()");
         interruptConnecting();
         new AsyncTask<Void, Void, Void>() {
-            /* access modifiers changed from: protected */
-            public Void doInBackground(Void... voidArr) {
+            protected Void doInBackground(Void... voidArr) {
                 WiFiUtils.getInstance(ActivityConnectSimpleAP.this).waitConnected();
                 return null;
             }
 
-            /* access modifiers changed from: protected */
-            public void onPostExecute(Void voidR) {
+            protected void onPostExecute(Void voidR) {
                 ManageDefaultNetwork.getInstance(ActivityConnectSimpleAP.this).setDefaultNetworkSimpleAp();
                 if (ActivityConnectSimpleAP.this.showConnectedTip) {
                     ActivityConnectSimpleAP activityConnectSimpleAP = ActivityConnectSimpleAP.this;
@@ -425,8 +418,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
     }
 
-    /* access modifiers changed from: package-private */
-    public void onError() {
+    private void onError() {
         closeWaitingDialog();
         Toast.makeText(this, getString(C1113R.string.str_error_connecting_printer_short), 1).show();
         if (this.searchWiFiDirectPrinter != null) {
@@ -449,8 +441,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         finish();
     }
 
-    /* access modifiers changed from: package-private */
-    public void closeWaitingDialog() {
+    private void closeWaitingDialog() {
         EPLog.m86d(TAG, "Called closeWaitingDialog()");
         try {
             this.mModelDialog.doDismiss(IDD_WIFI_WAITING);
@@ -507,8 +498,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void setupObserver() {
+    private void setupObserver() {
         super.setupObserver();
         this.networkStateChangeReciever = new NetworkStateChangeReciever();
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.STATE_CHANGE"));

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

@@ -29,8 +29,7 @@ public class ActivityControlWiFi extends Activity {
     boolean showProgress = false;
     boolean showWifiSettings = false;
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         EPLog.m86d(TAG, "onCreate()");
         super.onCreate(bundle);
         this.mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
@@ -53,21 +52,18 @@ public class ActivityControlWiFi extends Activity {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         EPLog.m86d(TAG, "onResume()");
         super.onResume();
         NfcDispatchUtils.enableForegroundDispatch(this, (IntentFilter[]) null, (String[][]) null);
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
         NfcDispatchUtils.disableForegroundDispatch(this);
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         EPLog.m86d(TAG, "onActivityResult()");
         super.onActivityResult(i, i2, intent);
         if (i == 0) {
@@ -84,8 +80,7 @@ public class ActivityControlWiFi extends Activity {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onDestroy() {
+    protected void onDestroy() {
         EPLog.m86d(TAG, "onDestroy()");
         super.onDestroy();
         if (this.networkStateChangeReciever != null) {
@@ -96,8 +91,7 @@ public class ActivityControlWiFi extends Activity {
         this.scannigObserver.interrunpt();
     }
 
-    /* access modifiers changed from: protected */
-    public Dialog onCreateDialog(int i) {
+    protected Dialog onCreateDialog(int i) {
         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();
@@ -114,22 +108,19 @@ public class ActivityControlWiFi extends Activity {
         }).setMessage(getString(C1113R.string.str_no_wifi)).setCancelable(false).create();
     }
 
-    /* access modifiers changed from: package-private */
-    public void onOK() {
+    private void onOK() {
         EPLog.m86d(TAG, "finish():RESULT_OK");
         setResult(-1);
         finish();
     }
 
-    /* access modifiers changed from: package-private */
-    public void onCancel() {
+    private void onCancel() {
         EPLog.m86d(TAG, "finish():RESULT_CANCELED");
         setResult(0);
         finish();
     }
 
-    /* access modifiers changed from: package-private */
-    public void registerReciever() {
+    private void registerReciever() {
         if (this.networkStateChangeReciever == null) {
             EPLog.m86d(TAG, "registerReceiver()");
             this.networkStateChangeReciever = new NetworkStateChangeReciever();
@@ -270,13 +261,11 @@ public class ActivityControlWiFi extends Activity {
         ScanningObserver() {
         }
 
-        /* access modifiers changed from: package-private */
-        public void start() {
+        private void start() {
             interrunpt();
             EPLog.m86d(ActivityControlWiFi.TAG, "Start ScanningObserver");
             this.observerTask = new AsyncTask<Void, Void, Void>() {
-                /* access modifiers changed from: protected */
-                public Void doInBackground(Void... voidArr) {
+                protected Void doInBackground(Void... voidArr) {
                     int i = 0;
                     while (i < 10000) {
                         try {
@@ -293,16 +282,14 @@ public class ActivityControlWiFi extends Activity {
                     return null;
                 }
 
-                /* access modifiers changed from: protected */
-                public void onPostExecute(Void voidR) {
+                protected void onPostExecute(Void voidR) {
                     EPLog.m88i(ActivityControlWiFi.TAG, "Timeout ScanningObserver");
                     ActivityControlWiFi.this.onOK();
                 }
             }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
         }
 
-        /* access modifiers changed from: package-private */
-        public void interrunpt() {
+        private void interrunpt() {
             AsyncTask<Void, Void, Void> asyncTask = this.observerTask;
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
                 EPLog.m86d(ActivityControlWiFi.TAG, "Stop ScanningObserver");

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

@@ -212,14 +212,12 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void onSuccess() {
+    private void onSuccess() {
         setResult(-1);
         finish();
     }
 
-    /* access modifiers changed from: package-private */
-    public void onError() {
+    private void onError() {
         setResult(0);
         finish();
     }

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

@@ -13,20 +13,17 @@ public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
     private boolean bDisplayHomeAsUpEnabled = false;
     private boolean bSupportCancel = false;
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
     }
 
-    /* access modifiers changed from: package-private */
-    public void setupCommonHeaderControl(boolean z, boolean z2) {
-        setActionBar((int) C2135R.string.str_wifidirect_settings, z);
+    private void setupCommonHeaderControl(boolean z, boolean z2) {
+        setActionBar((int) R.string.str_wifidirect_settings, z);
         this.bDisplayHomeAsUpEnabled = z;
         this.bSupportCancel = z2;
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         if (i == 10) {
             switch (i2) {
@@ -62,21 +59,20 @@ public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
 
     public boolean onCreateOptionsMenu(Menu menu) {
         if (this.bSupportCancel) {
-            getMenuInflater().inflate(C2135R.C2138menu.menu_cancel, menu);
+            getMenuInflater().inflate(R.C2138menu.menu_cancel, menu);
         }
         return super.onCreateOptionsMenu(menu);
     }
 
     public boolean onOptionsItemSelected(MenuItem menuItem) {
-        if (menuItem.getItemId() != C2135R.C2137id.menuCancel) {
+        if (menuItem.getItemId() != R.C2137id.menuCancel) {
             return super.onOptionsItemSelected(menuItem);
         }
         onCancelPressed();
         return true;
     }
 
-    /* access modifiers changed from: protected */
-    public void setDisplayMenu(boolean z) {
+    protected void setDisplayMenu(boolean z) {
         this.bSupportCancel = z;
         invalidateOptionsMenu();
     }

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

@@ -9,14 +9,13 @@ import epson.print.C2135R;
 public class ActivityWiFiDirectError extends ActivityWiFiDirectBase {
     private static final String TAG = "ActivityWiFiDirectError";
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         EPLog.m86d(TAG, "onCreate");
-        ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(C2135R.layout.wifidirect_error, (ViewGroup) null);
+        ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.wifidirect_error, (ViewGroup) null);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(false, true);
         WiFiUtils instance = WiFiUtils.getInstance(this);
-        ((TextView) viewGroup.findViewById(C2135R.C2137id.textView1)).setText(getResources().getString(C2135R.string.str_cur_wifi_state, new Object[]{instance.getSSID(instance.getCurNetworkId())}));
+        ((TextView) viewGroup.findViewById(R.C2137id.textView1)).setText(getResources().getString(R.string.str_cur_wifi_state, new Object[]{instance.getSSID(instance.getCurNetworkId())}));
     }
 }

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

@@ -53,7 +53,7 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
                 case 2:
                     ActivityWiFiDirectManual.this.mModelDialog.doDismiss(ActivityWiFiDirectManual.IDD_WIFI_WAITING);
                     ActivityWiFiDirectManual activityWiFiDirectManual = ActivityWiFiDirectManual.this;
-                    Toast.makeText(activityWiFiDirectManual, activityWiFiDirectManual.getString(C2135R.string.str_error_connecting_printer_short), 1).show();
+                    Toast.makeText(activityWiFiDirectManual, activityWiFiDirectManual.getString(R.string.str_error_connecting_printer_short), 1).show();
                     return;
                 default:
                     return;
@@ -68,8 +68,7 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
     FindPrinterTask taskFindPrinter = null;
     View viewWiFiSettings;
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    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() {
@@ -78,10 +77,10 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
             }
         });
         this.mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
-        ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(C2135R.layout.wifidirect_manual, (ViewGroup) null);
+        ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.wifidirect_manual, (ViewGroup) null);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(true, true);
-        this.viewWiFiSettings = viewGroup.findViewById(C2135R.C2137id.rlWifiSettings);
+        this.viewWiFiSettings = viewGroup.findViewById(R.C2137id.rlWifiSettings);
         this.viewWiFiSettings.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 Intent intent = new Intent(ActivityWiFiDirectManual.this, ActivityControlWiFi.class);
@@ -90,8 +89,8 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
                 ActivityWiFiDirectManual.this.startActivityForResult(intent, 0);
             }
         });
-        this.mNoLcdGuidanceWebView = (WebView) findViewById(C2135R.C2137id.guidance_webview);
-        this.mWithLcdGuidanceView = (ViewGroup) findViewById(C2135R.C2137id.guidance_with_lcd);
+        this.mNoLcdGuidanceWebView = (WebView) findViewById(R.C2137id.guidance_webview);
+        this.mWithLcdGuidanceView = (ViewGroup) findViewById(R.C2137id.guidance_with_lcd);
         updateGuidance(getNoLcdValueFromIntent(getIntent()));
         if (!ActivityRequestLocationPermission.canAccessWiFiInfo(this, 1)) {
             ActivityRequestLocationPermission.requestLocationPermissionForce(this, 1);
@@ -116,7 +115,7 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
         if (z) {
             this.mWithLcdGuidanceView.setVisibility(8);
             this.mNoLcdGuidanceWebView.setVisibility(0);
-            String string = getString(C2135R.string.path_wifidirect_guide_panelless);
+            String string = getString(R.string.path_wifidirect_guide_panelless);
             if (string == null) {
                 finish();
             } else {
@@ -128,14 +127,12 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
         interruptFindingPrinter();
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         switch (i) {
             case 0:
@@ -158,8 +155,7 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void interruptFindingPrinter() {
+    private void interruptFindingPrinter() {
         FindPrinterTask findPrinterTask = this.taskFindPrinter;
         if (findPrinterTask != null) {
             findPrinterTask.cancel();
@@ -181,7 +177,7 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
     }
 
     private void showDialog(String str) {
-        DialogProgress newInstance = DialogProgress.newInstance(str, 0, getResources().getString(C2135R.string.str_connecting_printer));
+        DialogProgress newInstance = DialogProgress.newInstance(str, 0, getResources().getString(R.string.str_connecting_printer));
         newInstance.setCancelable(false);
         newInstance.show(getSupportFragmentManager(), str);
     }

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

@@ -10,12 +10,11 @@ public class ActivityWiFiDirectStart extends ActivityWiFiDirectBase {
     private static final int ID_ENABLEWIFI = 1;
     View viewiPrintConnect;
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        setContentView((int) C2135R.layout.wifidirect_start);
+        setContentView((int) R.layout.wifidirect_start);
         setupCommonHeaderControl(false, true);
-        this.viewiPrintConnect = ((ViewGroup) findViewById(C2135R.C2137id.wifi_start_top)).findViewById(C2135R.C2137id.iprint_connect);
+        this.viewiPrintConnect = ((ViewGroup) findViewById(R.C2137id.wifi_start_top)).findViewById(R.C2137id.iprint_connect);
         this.viewiPrintConnect.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 Intent intent = new Intent(ActivityWiFiDirectStart.this, ActivityControlWiFi.class);
@@ -23,12 +22,12 @@ public class ActivityWiFiDirectStart extends ActivityWiFiDirectBase {
                 ActivityWiFiDirectStart.this.startActivityForResult(intent, 1);
             }
         });
-        findViewById(C2135R.C2137id.width_lcd).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.C2137id.width_lcd).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 ActivityWiFiDirectStart.this.startWifiManualSetup(false);
             }
         });
-        findViewById(C2135R.C2137id.no_lcd).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.C2137id.no_lcd).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 ActivityWiFiDirectStart.this.startWifiManualSetup(true);
             }
@@ -40,13 +39,11 @@ public class ActivityWiFiDirectStart extends ActivityWiFiDirectBase {
         startActivityForResult(ActivityWiFiDirectManual.getStartIntent(this, z), 10);
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         if (i == 1 && i2 == -1) {
             startActivityForResult(new Intent(this, ActivityiPrintConnectStart.class), 10);

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

@@ -65,23 +65,22 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         CONNECT_ERROR
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         this.mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
         this.wiFiUtils = WiFiUtils.getInstance(this);
         if (engineId == null) {
             engineId = getEngineId();
         }
-        ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(C2135R.layout.iprintconnect, (ViewGroup) null);
+        ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.iprintconnect, (ViewGroup) null);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(false, false);
-        this.toolbar = (ViewGroup) viewGroup.findViewById(C2135R.C2137id.toolbar);
-        this.btnFinish = (Button) viewGroup.findViewById(C2135R.C2137id.btn_finish);
-        this.textView1 = (TextView) viewGroup.findViewById(C2135R.C2137id.textView1);
-        this.textView2 = (TextView) viewGroup.findViewById(C2135R.C2137id.textView2);
-        this.textView3 = (TextView) viewGroup.findViewById(C2135R.C2137id.textView3);
-        this.progress = (ProgressBar) viewGroup.findViewById(C2135R.C2137id.progressBarGetConnectStrings);
+        this.toolbar = (ViewGroup) viewGroup.findViewById(R.C2137id.toolbar);
+        this.btnFinish = (Button) viewGroup.findViewById(R.C2137id.btn_finish);
+        this.textView1 = (TextView) viewGroup.findViewById(R.C2137id.textView1);
+        this.textView2 = (TextView) viewGroup.findViewById(R.C2137id.textView2);
+        this.textView3 = (TextView) viewGroup.findViewById(R.C2137id.textView3);
+        this.progress = (ProgressBar) viewGroup.findViewById(R.C2137id.progressBarGetConnectStrings);
         this.btnFinish.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 ActivityiPrintConnect.this.onFinishPressed();
@@ -106,15 +105,13 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         disconnectRealAp();
     }
 
-    /* access modifiers changed from: package-private */
-    public void disconnectRealAp() {
+    private void disconnectRealAp() {
         this.status = Status.CONNECT_ERROR;
         WiFiUtils wiFiUtils2 = this.wiFiUtils;
         wiFiUtils2.removeSimpleAP(wiFiUtils2.getNetworkId(this.settingsRealAp.ssid));
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         this.isKeepSimpleAPConnection = false;
         switch (this.status) {
@@ -138,8 +135,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         EPLog.m86d(TAG, "onPause()");
         super.onPause();
         if (this.status == Status.GETTING_GONNECTSTRINGS) {
@@ -158,16 +154,14 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void registBroadcastReciever() {
+    private void registBroadcastReciever() {
         if (this.networkStateChangeReciever == null) {
             this.networkStateChangeReciever = new NetworkStateChangeReciever();
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void unRegistBroadcastReciever() {
+    private void unRegistBroadcastReciever() {
         NetworkStateChangeReciever networkStateChangeReciever2 = this.networkStateChangeReciever;
         if (networkStateChangeReciever2 != null) {
             unregisterReceiver(networkStateChangeReciever2);
@@ -175,8 +169,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         String ssid = this.wiFiUtils.getSSID(this.wiFiUtils.getCurNetworkId());
         switch (i) {
@@ -215,44 +208,40 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void onConnectSimpleAP() {
+    private void onConnectSimpleAP() {
         EPLog.m86d(TAG, "onConnectSimpleAP()");
         this.toolbar.setVisibility(0);
         this.progress.setVisibility(8);
         setDisplayMenu(true);
-        this.textView1.setText(getResources().getString(C2135R.string.str_connected_printer1));
+        this.textView1.setText(getResources().getString(R.string.str_connected_printer1));
         TextView textView = this.textView2;
         Resources resources = getResources();
         WiFiUtils wiFiUtils2 = this.wiFiUtils;
-        textView.setText(resources.getString(C2135R.string.str_connected_printer2, new Object[]{this.intentResult.getStringExtra("name"), wiFiUtils2.getSSID(wiFiUtils2.getCurNetworkId())}));
-        this.textView3.setText(getResources().getString(C2135R.string.str_connected_printer3));
+        textView.setText(resources.getString(R.string.str_connected_printer2, new Object[]{this.intentResult.getStringExtra("name"), wiFiUtils2.getSSID(wiFiUtils2.getCurNetworkId())}));
+        this.textView3.setText(getResources().getString(R.string.str_connected_printer3));
     }
 
-    /* access modifiers changed from: package-private */
-    public void onConnectOtherAP() {
+    private void onConnectOtherAP() {
         EPLog.m86d(TAG, "onConnectOtherAP()");
         this.toolbar.setVisibility(8);
         this.progress.setVisibility(8);
         setDisplayMenu(true);
-        this.textView1.setText(getResources().getString(C2135R.string.str_connected_otherAP1));
-        this.textView2.setText(getResources().getString(C2135R.string.str_connected_otherAP2));
-        this.textView3.setText(getResources().getString(C2135R.string.str_connected_otherAP3));
+        this.textView1.setText(getResources().getString(R.string.str_connected_otherAP1));
+        this.textView2.setText(getResources().getString(R.string.str_connected_otherAP2));
+        this.textView3.setText(getResources().getString(R.string.str_connected_otherAP3));
     }
 
-    /* access modifiers changed from: package-private */
-    public void onConnectError() {
+    private void onConnectError() {
         EPLog.m86d(TAG, "onConnectError()");
         this.toolbar.setVisibility(8);
         this.progress.setVisibility(8);
         setDisplayMenu(true);
-        this.textView1.setText(getResources().getString(C2135R.string.str_connect_error1));
-        this.textView2.setText(getResources().getString(C2135R.string.str_connect_error2));
-        this.textView3.setText(getResources().getString(C2135R.string.str_connect_error3));
+        this.textView1.setText(getResources().getString(R.string.str_connect_error1));
+        this.textView2.setText(getResources().getString(R.string.str_connect_error2));
+        this.textView3.setText(getResources().getString(R.string.str_connect_error3));
     }
 
-    /* access modifiers changed from: package-private */
-    public void startConnectTempAp() {
+    private void startConnectTempAp() {
         EPLog.m86d(TAG, "startConnectTempAp()");
         Intent intent = new Intent(this, ActivityConnectSimpleAP.class);
         intent.putExtra(ActivityConnectBase.APNAME, this.settingsTempAp.ssid);
@@ -265,18 +254,15 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         startActivityForResult(intent, 1);
     }
 
-    /* access modifiers changed from: package-private */
-    public void startConnectRealAp() {
+    private void startConnectRealAp() {
         EPLog.m86d(TAG, "startConnectRealAp()");
         this.taskGetConnectStrings = new AsyncTask<Void, Void, Boolean>() {
-            /* access modifiers changed from: protected */
-            public void onPreExecute() {
+            protected void onPreExecute() {
                 ActivityiPrintConnect.this.getWindow().addFlags(128);
                 Status unused = ActivityiPrintConnect.this.status = Status.GETTING_GONNECTSTRINGS;
             }
 
-            /* access modifiers changed from: protected */
-            public Boolean doInBackground(Void... voidArr) {
+            protected Boolean doInBackground(Void... voidArr) {
                 ActivityiPrintConnect.this.wiFiUtils.pingWiFiDirectPrinter();
                 ActivityiPrintConnect.this.mEscprLib.epsWrapperInitDriver(192);
                 boolean z = false;
@@ -332,8 +318,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
                 return Boolean.valueOf(z);
             }
 
-            /* access modifiers changed from: protected */
-            public void onPostExecute(Boolean bool) {
+            protected void onPostExecute(Boolean bool) {
                 ActivityiPrintConnect.this.getWindow().clearFlags(128);
                 if (bool.booleanValue()) {
                     Status unused = ActivityiPrintConnect.this.status = Status.CONNECTING_REALAP;
@@ -352,8 +337,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
                 ActivityiPrintConnect.this.onConnectError();
             }
 
-            /* access modifiers changed from: protected */
-            public void onCancelled() {
+            protected void onCancelled() {
                 EPLog.m86d(ActivityiPrintConnect.TAG, "taskGetConnectStrings Canceled");
                 Status unused = ActivityiPrintConnect.this.status = Status.CONNECT_ERROR;
                 ActivityiPrintConnect.this.getWindow().clearFlags(128);
@@ -363,8 +347,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         }.execute(new Void[0]);
     }
 
-    /* access modifiers changed from: package-private */
-    public byte[] getEngineId() {
+    private byte[] getEngineId() {
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(10);
         Random random = new Random();
         for (int i = 0; i < 4; i++) {
@@ -385,8 +368,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         return byteArrayOutputStream.toByteArray();
     }
 
-    /* access modifiers changed from: package-private */
-    public void onScanResultAvailable() {
+    private void onScanResultAvailable() {
         List<ScanResult> arrayList = new ArrayList<>();
         try {
             arrayList = this.mWifiManager.getScanResults();

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

@@ -25,14 +25,13 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
     NetworkStateChangeReciever networkStateChangeReciever = null;
     escprLib.ConnectStrings settingsTempAp = new escprLib.ConnectStrings();
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         this.mWifiManager = (WifiManager) getApplicationContext().getSystemService("wifi");
-        ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(C2135R.layout.iprintconnect_start, (ViewGroup) null);
+        ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.iprintconnect_start, (ViewGroup) null);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(true, true);
-        this.btnNext = (Button) viewGroup.findViewById(C2135R.C2137id.btn_next);
+        this.btnNext = (Button) viewGroup.findViewById(R.C2137id.btn_next);
         this.btnNext.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 ActivityiPrintConnectStart.this.startActivityForResult(new Intent(ActivityiPrintConnectStart.this, ActivityiPrintConnect.class), 10);
@@ -46,8 +45,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void StartScan() {
+    private void StartScan() {
         if (WiFiUtils.getInstance(this).getCurSSID() != null) {
             startActivityForResult(new Intent(this, ActivityWiFiDirectError.class), 10);
             finish();
@@ -57,16 +55,14 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
         this.mWifiManager.startScan();
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         this.networkStateChangeReciever = new NetworkStateChangeReciever();
         registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
         getWindow().addFlags(128);
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
         NetworkStateChangeReciever networkStateChangeReciever2 = this.networkStateChangeReciever;
         if (networkStateChangeReciever2 != null) {
@@ -76,8 +72,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
         getWindow().clearFlags(128);
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         if (i == 1) {
             if (i2 != -1) {
@@ -88,8 +83,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void onScanResultAvailable() {
+    private void onScanResultAvailable() {
         if (this.bFirstScanResultAvailable) {
             EPLog.m90w(TAG, "First onScanResultAvailable, ignore this");
             this.bFirstScanResultAvailable = false;

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

@@ -19,15 +19,13 @@ class FindPrinterTask extends AsyncTask<Void, Void, Boolean> {
         this.idNotFound = i3;
     }
 
-    /* access modifiers changed from: protected */
-    public void onPreExecute() {
+    protected void onPreExecute() {
         super.onPreExecute();
         this.mEscprLib.setHanlder(this.handler, this.idFound);
         this.mEscprLib.setSearchStt(true);
     }
 
-    /* access modifiers changed from: protected */
-    public Boolean doInBackground(Void... voidArr) {
+    protected Boolean doInBackground(Void... voidArr) {
         int epsWrapperInitDriver = this.mEscprLib.epsWrapperInitDriver(192);
         boolean z = true;
         if (epsWrapperInitDriver != -1050 && epsWrapperInitDriver != 0) {
@@ -42,8 +40,7 @@ class FindPrinterTask extends AsyncTask<Void, Void, Boolean> {
         return Boolean.valueOf(z);
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostExecute(Boolean bool) {
+    protected void onPostExecute(Boolean bool) {
         if (bool.booleanValue() || !this.canceled) {
             EPLog.m86d(TAG, "epsWrapperFindPrinter = EPS_ERR_PRINTER_NOT_FOUND");
             this.handler.sendEmptyMessage(this.idNotFound);

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

@@ -50,8 +50,7 @@ public class ManageDefaultNetwork {
         return manageDefaultNetwork;
     }
 
-    /* access modifiers changed from: package-private */
-    public synchronized boolean checkCurSSIDisOnline(String str) {
+    private synchronized boolean checkCurSSIDisOnline(String str) {
         boolean z;
         Network activeNetwork;
         NetworkCapabilities networkCapabilities;

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

@@ -66,8 +66,7 @@ public class NfcTagParser {
         return formatIPAddressV4(ArrayUtils.subarray(this.tagData, 258, 262));
     }
 
-    /* access modifiers changed from: package-private */
-    public String formatIPAddressV4(byte[] bArr) {
+    private String formatIPAddressV4(byte[] bArr) {
         StringBuffer stringBuffer = new StringBuffer();
         for (int i = 0; i < bArr.length; i++) {
             stringBuffer.append(String.valueOf(bArr[i] & UnsignedBytes.MAX_VALUE));
@@ -82,8 +81,7 @@ public class NfcTagParser {
         return stringBuffer.toString();
     }
 
-    /* access modifiers changed from: package-private */
-    public int getPrinterStatus() {
+    private int getPrinterStatus() {
         int i = this.tagData[114] != 0 ? 1 : 0;
         if (this.tagData[130] != 0) {
             i |= 2;

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

@@ -121,8 +121,7 @@ public class SearchWiFiDirectPrinterTask {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public boolean start(int i, Handler handler, int i2, int i3) {
+    private boolean start(int i, Handler handler, int i2, int i3) {
         if (this.serarchingStatus != 0) {
             EPLog.m86d(TAG, "Already started");
             return true;
@@ -256,8 +255,7 @@ public class SearchWiFiDirectPrinterTask {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void onFindPrinterResult(String str, int i, String str2) {
+    private void onFindPrinterResult(String str, int i, String str2) {
         if (!this.listFoundSSID.contains(str)) {
             this.listFoundSSID.add(str);
             SimpleAPInfoDB.SimpleAPInfo simpleAPInfoDB = SimpleAPInfoDB.getSimpleAPInfoDB(this.context, str);
@@ -331,13 +329,11 @@ public class SearchWiFiDirectPrinterTask {
         ScanningObserver() {
         }
 
-        /* access modifiers changed from: package-private */
-        public void start(final int i) {
+        private void start(final int i) {
             interrunpt();
             EPLog.m86d(SearchWiFiDirectPrinterTask.TAG, "Start ScanningObserver");
             this.observerTask = new AsyncTask<Void, Void, Void>() {
-                /* access modifiers changed from: protected */
-                public Void doInBackground(Void... voidArr) {
+                protected Void doInBackground(Void... voidArr) {
                     int i = 0;
                     do {
                         try {
@@ -354,8 +350,7 @@ public class SearchWiFiDirectPrinterTask {
                     return null;
                 }
 
-                /* access modifiers changed from: protected */
-                public void onPostExecute(Void voidR) {
+                protected void onPostExecute(Void voidR) {
                     EPLog.m88i(SearchWiFiDirectPrinterTask.TAG, "Timeout ScanningObserver");
                     SearchWiFiDirectPrinterTask.this.mHandler.sendEmptyMessage(SearchWiFiDirectPrinterTask.this.idResult);
                     SearchWiFiDirectPrinterTask.this.interrupt();
@@ -363,8 +358,7 @@ public class SearchWiFiDirectPrinterTask {
             }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
         }
 
-        /* access modifiers changed from: package-private */
-        public void interrunpt() {
+        private void interrunpt() {
             AsyncTask<Void, Void, Void> asyncTask = this.observerTask;
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
                 EPLog.m86d(SearchWiFiDirectPrinterTask.TAG, "Stop ScanningObserver");

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

@@ -26,8 +26,7 @@ public class WiFiNetworkManager {
         return instance;
     }
 
-    /* access modifiers changed from: protected */
-    public Network getWifiNetwork() {
+    protected Network getWifiNetwork() {
         for (Network network : this.connectivityManager.getAllNetworks()) {
             if (this.connectivityManager.getNetworkCapabilities(network).hasTransport(1)) {
                 return network;

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

@@ -14,8 +14,7 @@ public class WiFiScanner {
     /* access modifiers changed from: private */
     public WeakReference<WifiManager> refWiFiManager = null;
 
-    /* access modifiers changed from: package-private */
-    public boolean startScan(WifiManager wifiManager) {
+    private boolean startScan(WifiManager wifiManager) {
         if (Build.VERSION.SDK_INT >= 28) {
             if (wifiScannerHandler == null) {
                 wifiScannerHandler = new Handler();

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

@@ -348,8 +348,7 @@ public class WiFiUtils {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public boolean saveWifiConfiguration(WifiManager wifiManager) {
+    private boolean saveWifiConfiguration(WifiManager wifiManager) {
         if (Build.VERSION.SDK_INT >= 26) {
             EPLog.m86d(TAG, "Needless call saveConfiguration");
             return true;

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

@@ -135,8 +135,7 @@ public class WifiP2pUtils {
         return this.groupInfo;
     }
 
-    /* access modifiers changed from: package-private */
-    public void resumeThread() {
+    private void resumeThread() {
         synchronized (this.lock) {
             try {
                 this.lock.notifyAll();

+ 4 - 5
app/src/main/java/epson/common/CustomListRowAdapter.java

@@ -38,17 +38,16 @@ public class CustomListRowAdapter extends ArrayAdapter<CustomListRow> {
         return populateView(i, view, viewGroup);
     }
 
-    /* access modifiers changed from: protected */
-    public View populateView(int i, View view, ViewGroup viewGroup) {
+    protected View populateView(int i, View view, ViewGroup viewGroup) {
         EPLog.m305d(TAG, "View position [" + i + "]");
         CustomListRow customListRow = this.items.get(i);
         if (customListRow.getPrefixImageId() != null) {
-            ((ImageView) view.findViewById(C2135R.C2137id.row_prefix_image)).setImageResource(customListRow.getPrefixImageId().intValue());
+            ((ImageView) view.findViewById(R.C2137id.row_prefix_image)).setImageResource(customListRow.getPrefixImageId().intValue());
         }
         if (customListRow.getSuffixImageId() != null) {
-            ((ImageView) view.findViewById(C2135R.C2137id.row_suffix_image)).setImageResource(customListRow.getSuffixImageId().intValue());
+            ((ImageView) view.findViewById(R.C2137id.row_suffix_image)).setImageResource(customListRow.getSuffixImageId().intValue());
         }
-        LinearLayout linearLayout = (LinearLayout) view.findViewById(C2135R.C2137id.row_list_area);
+        LinearLayout linearLayout = (LinearLayout) view.findViewById(R.C2137id.row_list_area);
         linearLayout.removeAllViews();
         int sieze = customListRow.sieze();
         for (int i2 = 0; i2 < sieze; i2++) {

+ 5 - 5
app/src/main/java/epson/common/DialogProgress.java

@@ -75,7 +75,7 @@ public class DialogProgress extends DialogFragment {
         String string4 = getArguments().getString(TAG_NEUTRAL_MESSAGE);
         String string5 = getArguments().getString(TAG_NEGATIVE_MESSAGE);
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        View inflate = getActivity().getLayoutInflater().inflate(C2135R.layout.dialog_progress, (ViewGroup) null);
+        View inflate = getActivity().getLayoutInflater().inflate(R.layout.dialog_progress, (ViewGroup) null);
         try {
             this.mActivity = (DialogButtonClick) getActivity();
         } catch (ClassCastException unused) {
@@ -105,22 +105,22 @@ public class DialogProgress extends DialogFragment {
                 }
             });
         }
-        ProgressBar progressBar = (ProgressBar) inflate.findViewById(C2135R.C2137id.dialog_progress_id);
+        ProgressBar progressBar = (ProgressBar) inflate.findViewById(R.C2137id.dialog_progress_id);
         if (i == 1) {
             RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) progressBar.getLayoutParams();
             layoutParams.addRule(14);
             progressBar.setLayoutParams(layoutParams);
-            TextView textView = (TextView) inflate.findViewById(C2135R.C2137id.dialog_progress_text_bottom);
+            TextView textView = (TextView) inflate.findViewById(R.C2137id.dialog_progress_text_bottom);
             textView.setText(string);
             progressBar.setVisibility(0);
             textView.setVisibility(0);
         } else if (i == 0) {
-            TextView textView2 = (TextView) inflate.findViewById(C2135R.C2137id.dialog_progress_text_right);
+            TextView textView2 = (TextView) inflate.findViewById(R.C2137id.dialog_progress_text_right);
             textView2.setText(string);
             progressBar.setVisibility(0);
             textView2.setVisibility(0);
         } else {
-            TextView textView3 = (TextView) inflate.findViewById(C2135R.C2137id.dialog_progress_text_right);
+            TextView textView3 = (TextView) inflate.findViewById(R.C2137id.dialog_progress_text_right);
             textView3.setText(string);
             textView3.setVisibility(0);
         }

+ 1 - 1
app/src/main/java/epson/common/InformationGuide.java

@@ -51,7 +51,7 @@ public class InformationGuide extends Application {
     }
 
     public String getGuideLaunguage() {
-        return mContext.getString(C2135R.string.guide_language);
+        return mContext.getString(R.string.guide_language);
     }
 
     public ArrayList<String> getHtmlPath() {

+ 1 - 1
app/src/main/java/epson/common/IprintLicenseInfo.java

@@ -45,7 +45,7 @@ public class IprintLicenseInfo extends DefaultLicenseInfo {
     }
 
     public String getApplicationName(@NonNull Context context) {
-        return context.getString(C2135R.string.app_name);
+        return context.getString(R.string.app_name);
     }
 
     public static boolean isAgreedCurrentVersion(@NonNull Context context) {

+ 2 - 2
app/src/main/java/epson/common/ReviewInvitationDialog.java

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

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