批量替换

app/src/main/java/com/epson/cameracopy/device/PortraitCameraView.java

@@ -27,14 +27,10 @@ public class PortraitCameraView extends CameraBridgeViewBase implements Camera.P
     private byte[] mBuffer;
     protected Camera mCamera;
     protected JavaCameraFrame[] mCameraFrame;
-    /* access modifiers changed from: private */
-    public boolean mCameraFrameReady = false;
-    /* access modifiers changed from: private */
-    public int mChainIdx = 0;
-    /* access modifiers changed from: private */
-    public Mat[] mFrameChain;
-    /* access modifiers changed from: private */
-    public boolean mStopThread;
+    private boolean mCameraFrameReady = false;
+    private int mChainIdx = 0;
+    private Mat[] mFrameChain;
+    private boolean mStopThread;
     private SurfaceTexture mSurfaceTexture;
     private Thread mThread;
 

app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewFragment.java

@@ -63,15 +63,13 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
     private final int mPaperSquareCircleSize = 20;
     private Button mPhotoSelectButton;
     private Button mPhtographButton;
-    /* access modifiers changed from: private */
-    public volatile boolean mPictureTaking;
+    private volatile boolean mPictureTaking;
     private final Scalar mPositionCursorColor = new Scalar(255.0d, 0.0d, 0.0d, 255.0d);
     private final float mPositionCursorDispRate = 0.05098581f;
     private volatile boolean mPreviewActivityStarted;
     private Mat mRgba;
     private final Point mScreenSize = new Point();
-    /* access modifiers changed from: private */
-    public final AptSensorAdapter mSensorEventListener = new AptSensorAdapter();
+    private final AptSensorAdapter mSensorEventListener = new AptSensorAdapter();
     private TakePictureTask mTakePictureTask;
     private boolean noCameraDialog;
 
@@ -141,8 +139,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         startActivity(new Intent(getActivity(), CameraPreviewOptionActivity.class));
     }
 
-    /* access modifiers changed from: private */
-    public void startPhotoSelectActivity() {
+    private void startPhotoSelectActivity() {
         startActivity(new Intent(getActivity(), CameraCopyImageSelectActivity.class));
     }
 
@@ -434,8 +431,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         super.onDestroy();
     }
 
-    /* access modifiers changed from: private */
-    public void showErrorDialog() {
+    private void showErrorDialog() {
         SimpleMessageDialogFragment.newInstance(R.string.file_save_error_message).show(getFragmentManager(), "error-dialog");
     }
 
@@ -453,8 +449,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         }
     }
 
-    /* access modifiers changed from: private */
-    public void takePictureStep2() {
+    private void takePictureStep2() {
         this.mOpenCvCameraView.takePicture(FileUtils.getNewTemporaryJpegFile(getActivity()).getPath(), new OpenCvCameraView.MyPictureTakeCallback() {
             public void onMyPictureTaken(boolean z, String str) {
                 if (!z || str == null) {
@@ -469,8 +464,7 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         });
     }
 
-    /* access modifiers changed from: private */
-    public void enableAllButton() {
+    private void enableAllButton() {
         if (CameraPreviewControl.hasBackCamera()) {
             UiCommon.setButtonEnabled(this.mPhtographButton, true);
             disableSettingButton(false);
@@ -478,15 +472,13 @@ public class CameraPreviewFragment extends Fragment implements CameraBridgeViewB
         UiCommon.setButtonEnabled(this.mPhotoSelectButton, true);
     }
 
-    /* access modifiers changed from: private */
-    public void disableAllButton() {
+    private void disableAllButton() {
         UiCommon.setButtonEnabled(this.mPhtographButton, false);
         disableSettingButton(true);
         UiCommon.setButtonEnabled(this.mPhotoSelectButton, false);
     }
 
-    /* access modifiers changed from: private */
-    public void startPictureViewActivity(String str) {
+    private void startPictureViewActivity(String str) {
         Intent intent = new Intent(getActivity(), ImagePreviewActivity.class);
         intent.putExtra(ImagePreviewActivity.PARAM_CAMERA_FILE, new CameraFile(new Date(), str));
         startActivity(intent);

app/src/main/java/com/epson/cameracopy/p006ui/CameraPreviewOptionActivity.java

@@ -116,8 +116,7 @@ public class CameraPreviewOptionActivity extends ActivityIACommon implements Pic
             }
         }
 
-        /* access modifiers changed from: private */
-        public void openPictureResolutionDialog() {
+        private void openPictureResolutionDialog() {
             PictureResolutionDialogFragment.newInstance(this.mCameraPictureResolutionMode, this.mCameraPictureSize).show(getActivity().getSupportFragmentManager(), "picture-resolution");
         }
 
@@ -133,8 +132,7 @@ public class CameraPreviewOptionActivity extends ActivityIACommon implements Pic
             getActivity().finish();
         }
 
-        /* access modifiers changed from: private */
-        public void changeAutoPhotoToggleButtonStatus(boolean z) {
+        private void changeAutoPhotoToggleButtonStatus(boolean z) {
             if (z && this.mCameraPreviewControl.hasAutoPictureHardware(getActivity())) {
                 this.mAutoPhotoToggleButton.setEnabled(true);
                 return;

app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintProgress.java

@@ -41,24 +41,18 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
     public static final String PARAM_PRINT_PROGRESS = "progress-params";
     public static final String PREFS_NAME = "PrintSetting";
     public static final int RESULT_ERROR = 1000;
-    /* access modifiers changed from: private */
-    public static boolean bRestartactivity = false;
+    private static boolean bRestartactivity = false;
     static int copies = 0;
     static int curError = 0;
     static int fileIndex = 0;
     static boolean isBkRetry = false;
     static boolean isContinue = false;
     static boolean isDocument = false;
-    /* access modifiers changed from: private */
-    public static final Object lockBCancel = new Object();
-    /* access modifiers changed from: private */
-    public static IEpsonServiceCallback mCallback;
-    /* access modifiers changed from: private */
-    public static ServiceConnection mEpsonConnection;
-    /* access modifiers changed from: private */
-    public static IEpsonService mEpsonService = null;
-    /* access modifiers changed from: private */
-    public static final Object mLock = new Object();
+    private static final Object lockBCancel = new Object();
+    private static IEpsonServiceCallback mCallback;
+    private static ServiceConnection mEpsonConnection;
+    private static IEpsonService mEpsonService = null;
+    private static final Object mLock = new Object();
     private static final Object mLockInit = new Object();
     static ProgressBar mProgressCopies;
     static ProgressBar mProgressPage;
@@ -79,26 +73,18 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
     private final int START_PRINT = 2;
     private final int UPDATE_PERCENT = 0;
     boolean bCancel = false;
-    /* access modifiers changed from: private */
-    public boolean bSearching = false;
-    /* access modifiers changed from: private */
-    public boolean bSearchingPrinter = false;
-    /* access modifiers changed from: private */
-    public Context context = null;
-    /* access modifiers changed from: private */
-    public int curCopy = 1;
-    /* access modifiers changed from: private */
-    public int curSheet = 1;
+    private boolean bSearching = false;
+    private boolean bSearchingPrinter = false;
+    private Context context = null;
+    private int curCopy = 1;
+    private int curSheet = 1;
     int duplex = 0;
-    /* access modifiers changed from: private */
-    public boolean isDialogOpen = false;
-    /* access modifiers changed from: private */
-    public boolean isRemotePrinter = false;
+    private boolean isDialogOpen = false;
+    private boolean isRemotePrinter = false;
     Button mCancelButton;
     boolean mCanceled = false;
     TextView mCopies;
-    /* access modifiers changed from: private */
-    public volatile boolean mError = false;
+    private volatile boolean mError = false;
     Handler mHandler = new Handler(new Handler.Callback() {
         /* JADX WARNING: Can't fix incorrect switch cases order */
         /* JADX WARNING: Code restructure failed: missing block: B:32:0x020e, code lost:
@@ -721,18 +707,13 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
             throw new UnsupportedOperationException("Method not decompiled: com.epson.cameracopy.p006ui.CameraPrintProgress.C08464.handleMessage(android.os.Message):boolean");
         }
     });
-    /* access modifiers changed from: private */
-    public ArrayList<ImageAndLayout> mImageAndLayoutList;
+    private ArrayList<ImageAndLayout> mImageAndLayoutList;
     TextView mPage;
     TextView mPercent;
-    /* access modifiers changed from: private */
-    public volatile boolean mWaitEpsonServiceForFinish = false;
-    /* access modifiers changed from: private */
-    public String percentString = "";
-    /* access modifiers changed from: private */
-    public String printerIp;
-    /* access modifiers changed from: private */
-    public int sheets;
+    private volatile boolean mWaitEpsonServiceForFinish = false;
+    private String percentString = "";
+    private String printerIp;
+    private int sheets;
 
     public static boolean isPrintSuccess(int i) {
         return i == 4;
@@ -887,8 +868,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         EPLog.m313i("Epson", "printProgress.java: onCreate() finish");
     }
 
-    /* access modifiers changed from: private */
-    public void triggerPrint() {
+    private void triggerPrint() {
         this.mHandler.sendEmptyMessage(2);
     }
 
@@ -1052,8 +1032,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void CancelPrint() {
+    private void CancelPrint() {
         try {
             if (mEpsonService != null) {
                 mEpsonService.cancelPrint();
@@ -1086,8 +1065,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         }).create().show();
     }
 
-    /* access modifiers changed from: private */
-    public void sendPrintLog() {
+    private void sendPrintLog() {
         Analytics.sendPrintLog(this, new CameraCopyProgressParams());
     }
 }

app/src/main/java/com/epson/cameracopy/p006ui/CameraPrintSettingActivity.java

@@ -77,66 +77,41 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     private final int SEARCH_ERROR = 16;
     private final int SETTING_DONE = 3;
     private final int SHOW_ERROR_DIALOG = 18;
-    /* access modifiers changed from: private */
-    public String autoConnectSsid = null;
-    /* access modifiers changed from: private */
-    public TextView brightness;
-    /* access modifiers changed from: private */
-    public Button brightnessMinus;
-    /* access modifiers changed from: private */
-    public Button brightnessPlus;
-    /* access modifiers changed from: private */
-    public int brightnessValue;
-    /* access modifiers changed from: private */
-    public int color;
-    /* access modifiers changed from: private */
-    public TextView colorInfo;
-    /* access modifiers changed from: private */
-    public int[] color_info = null;
-    /* access modifiers changed from: private */
-    public TextView contrast;
-    /* access modifiers changed from: private */
-    public Button contrastMinus;
-    /* access modifiers changed from: private */
-    public Button contrastPlus;
-    /* access modifiers changed from: private */
-    public int contrastValue;
+    private String autoConnectSsid = null;
+    private TextView brightness;
+    private Button brightnessMinus;
+    private Button brightnessPlus;
+    private int brightnessValue;
+    private int color;
+    private TextView colorInfo;
+    private int[] color_info = null;
+    private TextView contrast;
+    private Button contrastMinus;
+    private Button contrastPlus;
+    private int contrastValue;
     private TextView copies;
     private Button copiesMinus;
     private Button copiesPlus;
     private int copiesValue;
     private boolean disablePrintArea = false;
-    /* access modifiers changed from: private */
-    public int duplex;
-    /* access modifiers changed from: private */
-    public TextView duplexInfo;
-    /* access modifiers changed from: private */
-    public int[] duplex_info = null;
+    private int duplex;
+    private TextView duplexInfo;
+    private int[] duplex_info = null;
     private boolean enableShowPreview = false;
-    /* access modifiers changed from: private */
-    public int endValue;
-    /* access modifiers changed from: private */
-    public int feedDirection;
-    /* access modifiers changed from: private */
-    public TextView feedDirectionInfo;
-    /* access modifiers changed from: private */
-    public int[] info = null;
-    /* access modifiers changed from: private */
-    public boolean isDocumentSetting = true;
+    private int endValue;
+    private int feedDirection;
+    private TextView feedDirectionInfo;
+    private int[] info = null;
+    private boolean isDocumentSetting = true;
     boolean isInfoAvai = false;
     Boolean isNotLoading = true;
     private boolean isRetryAfterConnectSimpleAp = false;
     private boolean isTryConnectSimpleAp = false;
-    /* access modifiers changed from: private */
-    public int lang = 1;
-    /* access modifiers changed from: private */
-    public int layout;
-    /* access modifiers changed from: private */
-    public TextView layoutInfo;
-    /* access modifiers changed from: private */
-    public int[] layout_info = null;
-    /* access modifiers changed from: private */
-    public final IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
+    private int lang = 1;
+    private int layout;
+    private TextView layoutInfo;
+    private int[] layout_info = null;
+    private final IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
         public void onGetInkState() throws RemoteException {
         }
 
@@ -176,8 +151,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         }
     };
     private final boolean mCameraCopy = true;
-    /* access modifiers changed from: private */
-    public Context mContext = null;
+    private Context mContext = null;
     private final ServiceConnection mEpsonConnection = new ServiceConnection() {
         public void onServiceDisconnected(ComponentName componentName) {
             EPLog.m316v("SettingScr", "onServiceDisconnected");
@@ -201,8 +175,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
             }
         }
     };
-    /* access modifiers changed from: private */
-    public IEpsonService mEpsonService = null;
+    private IEpsonService mEpsonService = null;
     Handler mHandler = new Handler(new Handler.Callback() {
         /* JADX DEBUG: Multi-variable search result rejected for TypeSearchVarInfo{r1v4, resolved type: boolean} */
         /* JADX WARNING: type inference failed for: r1v1 */
@@ -1652,71 +1625,43 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
             return iArr2;
         }
     });
-    /* access modifiers changed from: private */
-    public MediaInfo.AbstractInfo mLookupTable;
+    private MediaInfo.AbstractInfo mLookupTable;
     private MediaInfo.AbstractInfo mPaperSizeType;
     private boolean mPrinterSelectDone;
-    /* access modifiers changed from: private */
-    public int mRemoteSrcType;
+    private int mRemoteSrcType;
     private boolean mWaiteInkReplenProgress;
-    /* access modifiers changed from: private */
-    public int paperSize;
-    /* access modifiers changed from: private */
-    public TextView paperSizeInfo;
-    /* access modifiers changed from: private */
-    public int paperSource;
-    /* access modifiers changed from: private */
-    public TextView paperSourceInfo;
-    /* access modifiers changed from: private */
-    public int paperType;
-    /* access modifiers changed from: private */
-    public TextView paperTypeInfo;
-    /* access modifiers changed from: private */
-    public int[] paper_size_info = null;
-    /* access modifiers changed from: private */
-    public int[] paper_source_info = null;
-    /* access modifiers changed from: private */
-    public int[] paper_type_info = null;
+    private int paperSize;
+    private TextView paperSizeInfo;
+    private int paperSource;
+    private TextView paperSourceInfo;
+    private int paperType;
+    private TextView paperTypeInfo;
+    private int[] paper_size_info = null;
+    private int[] paper_source_info = null;
+    private int[] paper_type_info = null;
     private boolean printAll;
-    /* access modifiers changed from: private */
-    public TextView printDateInfo;
-    /* access modifiers changed from: private */
-    public int printdate;
+    private TextView printDateInfo;
+    private int printdate;
     private MyPrinter printer = null;
     private String printerDeviceId;
-    /* access modifiers changed from: private */
-    public String printerEmailAddress;
-    /* access modifiers changed from: private */
-    public String printerId;
-    /* access modifiers changed from: private */
-    public String printerIp;
-    /* access modifiers changed from: private */
-    public int printerLocation;
-    /* access modifiers changed from: private */
-    public TextView printerName;
+    private String printerEmailAddress;
+    private String printerId;
+    private String printerIp;
+    private int printerLocation;
+    private TextView printerName;
     private String printerSerialNo;
     private View progressGetOption;
-    /* access modifiers changed from: private */
-    public int quality;
-    /* access modifiers changed from: private */
-    public TextView qualityInfo;
-    /* access modifiers changed from: private */
-    public int[] quality_info = null;
-    /* access modifiers changed from: private */
-    public TextView saturation;
-    /* access modifiers changed from: private */
-    public Button saturationMinus;
-    /* access modifiers changed from: private */
-    public Button saturationPlus;
-    /* access modifiers changed from: private */
-    public int saturationValue;
+    private int quality;
+    private TextView qualityInfo;
+    private int[] quality_info = null;
+    private TextView saturation;
+    private Button saturationMinus;
+    private Button saturationPlus;
+    private int saturationValue;
     private int sheets = 1;
-    /* access modifiers changed from: private */
-    public int sizeIndex = 0;
-    /* access modifiers changed from: private */
-    public int startValue;
-    /* access modifiers changed from: private */
-    public int typeIndex = 0;
+    private int sizeIndex = 0;
+    private int startValue;
+    private int typeIndex = 0;
     boolean undoFlag = true;
 
     static /* synthetic */ int access$1108(CameraPrintSettingActivity cameraPrintSettingActivity) {
@@ -1944,8 +1889,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         }
     }
 
-    /* access modifiers changed from: private */
-    public boolean updateSupportedMediaFile(boolean z) {
+    private boolean updateSupportedMediaFile(boolean z) {
         ExternalFileUtils instance = ExternalFileUtils.getInstance(this);
         EPLog.m313i(TAG, "call updateSupportedMedia");
         File supportedMedia = instance.getSupportedMedia();
@@ -2660,8 +2604,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         new InkRplnRepository(false).deleteTemporaryData(this);
     }
 
-    /* access modifiers changed from: private */
-    public void setScreenState(Boolean bool) {
+    private void setScreenState(Boolean bool) {
         if (bool.booleanValue()) {
             this.progressGetOption.setVisibility(8);
         } else {

app/src/main/java/com/epson/cameracopy/p006ui/CropImageActivity.java

@@ -98,10 +98,8 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
     public static final String RESULT_COLLECTED_FILE_NAME = "corrected_file_name";
     private static final int SEEK_BAR_STEP = 10;
     private static WeakReference<Activity> mActivity;
-    /* access modifiers changed from: private */
-    public static CropImageActivity mCropImageActivity;
-    /* access modifiers changed from: private */
-    public static Handler mHandler = new Handler() {
+    private static CropImageActivity mCropImageActivity;
+    private static Handler mHandler = new Handler() {
         public void handleMessage(Message message) {
             if (CropImageActivity.mCropImageActivity != null) {
                 CropImageActivity.mCropImageActivity.executeMessage(message);
@@ -126,10 +124,8 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
     private Button mButtonReset;
     private Button mButtonSave;
     private File mCacheFolder = null;
-    /* access modifiers changed from: private */
-    public List<CorrectionParamSet> mCorrectionHistory = null;
-    /* access modifiers changed from: private */
-    public CorrectionParamSet mCorrectionParamSet = null;
+    private List<CorrectionParamSet> mCorrectionHistory = null;
+    private CorrectionParamSet mCorrectionParamSet = null;
     private FrameLayout mCropImageFrameLayout = null;
     private View mCropImageHeader = null;
     boolean mCropImageMessageShow = true;
@@ -138,17 +134,13 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
     private CustomToast mCustomToast = null;
     private DaemonView mDaemonView = null;
     private int mDebugID = 0;
-    /* access modifiers changed from: private */
-    public int mDebugMode = 0;
-    /* access modifiers changed from: private */
-    public int mDebugResolutionThreshold = 2;
-    /* access modifiers changed from: private */
-    public int mDebugSmallPreviewRate = 2;
+    private int mDebugMode = 0;
+    private int mDebugResolutionThreshold = 2;
+    private int mDebugSmallPreviewRate = 2;
     Size mDeviceSize = null;
     DocumentSizeInfo mDocumentSizeInfo = null;
     private GestureDetector mGestureDetector = null;
-    /* access modifiers changed from: private */
-    public ImageCollect mImageCollect = null;
+    private ImageCollect mImageCollect = null;
     private LinearLayout mImageCollectAdjustmentBrightness = null;
     private SeekBar mImageCollectAdjustmentBrightnessSeekBar = null;
     private TextView mImageCollectAdjustmentBrightnessTitle = null;
@@ -173,24 +165,18 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
     private RadioButton mImageCollectSwitchLeft = null;
     private RadioButton mImageCollectSwitchMiddle = null;
     private RadioButton mImageCollectSwitchRight = null;
-    /* access modifiers changed from: private */
-    public ImageCollectView mImageCollectView = null;
-    /* access modifiers changed from: private */
-    public int mImageType = 2;
+    private ImageCollectView mImageCollectView = null;
+    private int mImageType = 2;
     Info_paper mInfoPaper = null;
     private int mMaskType;
     private AlertDialog mMessageDialog = null;
     private DisplayMetrics mMetrics = null;
     private DialogProgressViewModel mModelDialog;
-    /* access modifiers changed from: private */
-    public double mPaperHeight = 0.0d;
-    /* access modifiers changed from: private */
-    public int mPaperId = -999;
+    private double mPaperHeight = 0.0d;
+    private int mPaperId = -999;
     Size mPaperSize = null;
-    /* access modifiers changed from: private */
-    public double mPaperWidth = 0.0d;
-    /* access modifiers changed from: private */
-    public PointF[] mPointPreviewCropPoint = null;
+    private double mPaperWidth = 0.0d;
+    private PointF[] mPointPreviewCropPoint = null;
     private int mPreviewType;
     private DialogProgress mProgressDialog = null;
     private boolean[] mSaveApprovalTable = null;
@@ -557,8 +543,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
         }
     }
 
-    /* access modifiers changed from: private */
-    public void executeMessage(Message message) {
+    private void executeMessage(Message message) {
         String str;
         switch (message.what) {
             case 301:
@@ -912,8 +897,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
         this.mImageCollectView.SetPreviewBitmapAndCropData(this.mBitmapPreview);
     }
 
-    /* access modifiers changed from: private */
-    public void GetPreviewImage(int i) {
+    private void GetPreviewImage(int i) {
         Bitmap GetPreviewImage;
         if (i == 1 || i == 2 || i == 3 || i == 4) {
             this.mImageType = i;
@@ -1346,22 +1330,14 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
 
     /* renamed from: com.epson.cameracopy.ui.CropImageActivity$CorrectionParam */
     public class CorrectionParam {
-        /* access modifiers changed from: private */
-        public float mBcscBValue;
-        /* access modifiers changed from: private */
-        public float mBcscCValue;
-        /* access modifiers changed from: private */
-        public float mBcscSValue;
-        /* access modifiers changed from: private */
-        public boolean mMaskType;
-        /* access modifiers changed from: private */
-        public List<List<PointF>> mPointArray;
-        /* access modifiers changed from: private */
-        public Point mPreviewImageSize = new Point(0, 0);
-        /* access modifiers changed from: private */
-        public float mScale;
-        /* access modifiers changed from: private */
-        public float mStrokeWidth;
+        private float mBcscBValue;
+        private float mBcscCValue;
+        private float mBcscSValue;
+        private boolean mMaskType;
+        private List<List<PointF>> mPointArray;
+        private Point mPreviewImageSize = new Point(0, 0);
+        private float mScale;
+        private float mStrokeWidth;
 
         public CorrectionParam() {
         }

app/src/main/java/com/epson/cameracopy/p006ui/FolderSelectActivity.java

@@ -27,10 +27,8 @@ public class FolderSelectActivity extends ActivityIACommon implements View.OnCli
     private static final int MSG_UPDATE_LIST_VIEW = 901;
     private static final int REQEST_RUNTIMEPERMMISSION = 1;
     private static WeakReference<Activity> mActivity;
-    /* access modifiers changed from: private */
-    public static FolderSelectActivity mFolderSelectActivity;
-    /* access modifiers changed from: private */
-    public static Handler mHandler = new Handler() {
+    private static FolderSelectActivity mFolderSelectActivity;
+    private static Handler mHandler = new Handler() {
         public void handleMessage(Message message) {
             if (FolderSelectActivity.mFolderSelectActivity != null) {
                 FolderSelectActivity.mFolderSelectActivity.executeMessage(message);
@@ -43,8 +41,7 @@ public class FolderSelectActivity extends ActivityIACommon implements View.OnCli
             FolderSelectActivity.mHandler.sendEmptyMessage(FolderSelectActivity.MSG_UPDATE_LIST_VIEW);
         }
     };
-    /* access modifiers changed from: private */
-    public FolderInformation mFolderInformation = null;
+    private FolderInformation mFolderInformation = null;
     private LinearLayout mFolderSelectBase = null;
     private LinearLayout mFolderSelectCurrent = null;
     private TextView mFolderSelectText = null;
@@ -107,8 +104,7 @@ public class FolderSelectActivity extends ActivityIACommon implements View.OnCli
         }
     }
 
-    /* access modifiers changed from: private */
-    public void executeMessage(Message message) {
+    private void executeMessage(Message message) {
         if (message.what == MSG_UPDATE_LIST_VIEW) {
             updateListView();
         }

app/src/main/java/com/epson/cameracopy/p006ui/ImageCollectView.java

@@ -51,13 +51,11 @@ public class ImageCollectView extends View {
     private Bitmap mBitmapMask = null;
     private Canvas mCanvasMask = null;
     private Context mContext = null;
-    /* access modifiers changed from: private */
-    public Data mData = null;
+    private Data mData = null;
     private GestureDetector mGestureDetector = null;
     private boolean mGetCropPoint = false;
     private Handler mHandlerAvtivity = null;
-    /* access modifiers changed from: private */
-    public int mOrient = 0;
+    private int mOrient = 0;
     private PathEffectData mPathEffectData = null;
     private ScaleGestureDetector mScaleGestureDetector = null;
     private int mViewMode = 0;
@@ -216,8 +214,7 @@ public class ImageCollectView extends View {
 
         /* renamed from: d */
         public C0884D[] f133d;
-        /* access modifiers changed from: private */
-        public boolean mFlagScale;
+        private boolean mFlagScale;
         public Paint mPaintCropCircleDeselected;
         public Paint mPaintCropCircleSelect;
         public Paint mPaintCropLine;
@@ -1088,8 +1085,7 @@ public class ImageCollectView extends View {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void SetScale(float f) {
+    private void SetScale(float f) {
         this.mData.f133d[this.mOrient].ddp[this.mViewMode].mScale[0] = this.mData.f133d[this.mOrient].ddp[this.mViewMode].mScale[1];
         float f2 = this.mData.f133d[this.mOrient].ddp[this.mViewMode].mScale[1] * f;
         if (f2 < 1.0f) {
@@ -1101,8 +1097,7 @@ public class ImageCollectView extends View {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void ResetScalePos(boolean z) {
+    private void ResetScalePos(boolean z) {
         if (z || this.mViewMode != 1) {
             this.mData.f133d[this.mOrient].ddp[this.mViewMode].mPointMoveDeff[0].set(0.0f, 0.0f);
             this.mData.f133d[this.mOrient].ddp[this.mViewMode].mPointMoveDeff[1].set(0.0f, 0.0f);
@@ -1195,10 +1190,8 @@ public class ImageCollectView extends View {
         private static final int CROP_IMAGE_TIMER_LIMIT = 5000;
         private static final int CROP_IMAGE_TIMER_TIME = 200;
         private static final int MSG_TIMER_CROP_IMAGE_TEXT_MESSAGE_TIMEOUT = 501;
-        /* access modifiers changed from: private */
-        public boolean mBreak = false;
-        /* access modifiers changed from: private */
-        public Handler mHandlerTimerCropImageTextMessage = new Handler() {
+        private boolean mBreak = false;
+        private Handler mHandlerTimerCropImageTextMessage = new Handler() {
             public void handleMessage(Message message) {
                 if (message.what == 501) {
                     ImageCollectView.this.mData.mShowTextMessage = false;
@@ -1209,8 +1202,7 @@ public class ImageCollectView extends View {
             }
         };
         private Thread mThreadTimer = null;
-        /* access modifiers changed from: private */
-        public View mView = null;
+        private View mView = null;
 
         TimerCropImageTextMessage() {
         }
@@ -1257,10 +1249,8 @@ public class ImageCollectView extends View {
     /* renamed from: com.epson.cameracopy.ui.ImageCollectView$TimerCropImageCropCircle */
     class TimerCropImageCropCircle {
         private static final int MSG_TIMER_CROP_IMAGE_CROP_CIRCLE_TIMEOUT = 500;
-        /* access modifiers changed from: private */
-        public boolean mBreak = false;
-        /* access modifiers changed from: private */
-        public Handler mHandlerTimerCropImageCropCircle = new Handler() {
+        private boolean mBreak = false;
+        private Handler mHandlerTimerCropImageCropCircle = new Handler() {
             public void handleMessage(Message message) {
                 if (message.what == 500) {
                     ImageCollectView.this.mData.f133d[ImageCollectView.this.mOrient].dcm.mSelectArea = -1;
@@ -1270,13 +1260,10 @@ public class ImageCollectView extends View {
                 }
             }
         };
-        /* access modifiers changed from: private */
-        public long mNewTime;
-        /* access modifiers changed from: private */
-        public long mStartTime;
+        private long mNewTime;
+        private long mStartTime;
         private Thread mTimer = null;
-        /* access modifiers changed from: private */
-        public View mView = null;
+        private View mView = null;
 
         TimerCropImageCropCircle() {
         }
@@ -1332,10 +1319,8 @@ public class ImageCollectView extends View {
         private static final int DEFAULT_BLINKING_DELAYTIMES = 200;
         private static final int MSG_INVALIDATE_VIEW = 901;
         private long mBlinkingDelayTimes = 200;
-        /* access modifiers changed from: private */
-        public boolean mBreak = false;
-        /* access modifiers changed from: private */
-        public Handler mHandlerPathEffectData = new Handler() {
+        private boolean mBreak = false;
+        private Handler mHandlerPathEffectData = new Handler() {
             public void handleMessage(Message message) {
                 if (message.what != PathEffectData.MSG_INVALIDATE_VIEW || PathEffectData.this.mView == null) {
                     return;
@@ -1347,18 +1332,14 @@ public class ImageCollectView extends View {
                 }
             }
         };
-        /* access modifiers changed from: private */
-        public long mNewTime;
+        private long mNewTime;
         private int mPathEffectBlinkingIndex = 0;
         private long mPathEffectBlinkingTime = 0;
         private PathEffect[] mPathEffectList = new PathEffect[5];
-        /* access modifiers changed from: private */
-        public Rect mRectDirty = new Rect(0, 0, 0, 0);
-        /* access modifiers changed from: private */
-        public long mStartTime;
+        private Rect mRectDirty = new Rect(0, 0, 0, 0);
+        private long mStartTime;
         private Thread mTimer = null;
-        /* access modifiers changed from: private */
-        public View mView = null;
+        private View mView = null;
 
         public PathEffectData(View view) {
             this.mPathEffectList[0] = new DashPathEffect(new float[]{5.0f, 5.0f}, 8.0f);

app/src/main/java/com/epson/cameracopy/p006ui/ImageFolderFile.java

@@ -2,7 +2,7 @@ package com.epson.cameracopy.p006ui;
 
 import android.content.Context;
 
-import android.support.annotation.Nullable;
+
 import com.epson.cameracopy.alt.FileUtils;
 import epson.common.ImageUtil;
 import epson.print.IprintApplication;

app/src/main/java/com/epson/cameracopy/p006ui/ImageFolderFileViewModel.java

@@ -8,10 +8,8 @@ import android.os.AsyncTask;
 
 /* renamed from: com.epson.cameracopy.ui.ImageFolderFileViewModel */
 public class ImageFolderFileViewModel extends AndroidViewModel {
-    /* access modifiers changed from: private */
-    public final Application mApplication;
-    /* access modifiers changed from: private */
-    public final ImageFolderFileLiveData mImageFolderFileLiveData = new ImageFolderFileLiveData();
+    private final Application mApplication;
+    private final ImageFolderFileLiveData mImageFolderFileLiveData = new ImageFolderFileLiveData();
 
     public ImageFolderFileViewModel(@NonNull Application application) {
         super(application);

app/src/main/java/com/epson/cameracopy/p006ui/ImagePreviewActivity.java

@@ -12,7 +12,7 @@ import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.media.ExifInterface;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.Fragment;
 import android.support.p000v4.app.FragmentActivity;
@@ -281,13 +281,11 @@ public class ImagePreviewActivity extends ActivityIACommon {
             return false;
         }
 
-        /* access modifiers changed from: private */
-        public boolean checkProgress() {
+        private boolean checkProgress() {
             return this.mProgressBar.getVisibility() == 0;
         }
 
-        /* access modifiers changed from: private */
-        public void localFolderFileViewModelPrepared(@Nullable ImageFolderFile imageFolderFile) {
+        private void localFolderFileViewModelPrepared(@Nullable ImageFolderFile imageFolderFile) {
             this.mProgressBar.setVisibility(8);
             this.mImagePreviewFile = imageFolderFile;
             UiCommon.setButtonEnabled(this.mSaveButton, this.mImagePreviewFile.needSaveButton());

app/src/main/java/com/epson/cameracopy/p006ui/PictureResolutionDialogFragment.java

@@ -129,8 +129,7 @@ public class PictureResolutionDialogFragment extends DialogFragment {
         return strArr;
     }
 
-    /* access modifiers changed from: private */
-    public void selectListItem(int i) {
+    private void selectListItem(int i) {
         OnItemSelectedListener onItemSelectedListener = (OnItemSelectedListener) getActivity();
         List<Point> list = this.mSizeList;
         if (list == null) {

app/src/main/java/com/epson/cameracopy/p006ui/PrintPreviewActivity.java

@@ -17,7 +17,7 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.RemoteException;
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentActivity;
 import android.view.KeyEvent;
@@ -88,8 +88,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     private int currentPaperSize = 0;
     private String currentPrinterName = "";
     private boolean enableShowWarning = true;
-    /* access modifiers changed from: private */
-    public final IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
+    private final IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
         public void onFindPrinterResult(String str, String str2, String str3, String str4, String str5) throws RemoteException {
         }
 
@@ -132,8 +131,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             }
         }
     };
-    /* access modifiers changed from: private */
-    public IEpsonService mEpsonService = null;
+    private IEpsonService mEpsonService = null;
     Handler mHandler = new Handler(new Handler.Callback() {
         static final /* synthetic */ boolean $assertionsDisabled = false;
 
@@ -176,8 +174,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
             return true;
         }
     });
-    /* access modifiers changed from: private */
-    public final EPImageList mImageList = new EPImageList();
+    private final EPImageList mImageList = new EPImageList();
     private boolean mIsRemotePrinter = false;
     ManuscriptSize mManuscriptSize;
     private DialogProgressViewModel mModelDialog;
@@ -190,8 +187,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     private ImageView paperMissmath = null;
     PaperSourceInfo paperSourceInfo = null;
     private TextView papersizeTextView = null;
-    /* access modifiers changed from: private */
-    public Button printButton = null;
+    private Button printButton = null;
     private String printerId = "";
     private ImageButton printsettingButton = null;
     private AllReloadTask reloadTask = null;
@@ -270,8 +266,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         }
     }
 
-    /* access modifiers changed from: private */
-    public void showStoreDialog() {
+    private void showStoreDialog() {
         ReviewInvitationDialog.newInstance().show(getSupportFragmentManager(), DIALOG_KEY_STORE_DIALOG);
     }
 
@@ -335,14 +330,12 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         return z;
     }
 
-    /* access modifiers changed from: private */
-    public void updateManuscriptScaleText(double d) {
+    private void updateManuscriptScaleText(double d) {
         PointF physicalSize = this.mManuscriptSize.getPhysicalSize(this);
         this.mScaleText.setText(String.format(Locale.US, this.mManuscriptSize.getUnitType(this) == 2 ? "%s: %.0f%% (%.1f x %.1f %s)" : "%s: %.0f%% (%.0f x %.0f %s)", new Object[]{getString(R.string.magnification), Double.valueOf(100.0d * d), Double.valueOf(((double) physicalSize.x) * d), Double.valueOf(((double) physicalSize.y) * d), this.mManuscriptSize.getUnitStr(this)}));
     }
 
-    /* access modifiers changed from: private */
-    public void loadPrinterSettingAndChangeView(boolean z) {
+    private void loadPrinterSettingAndChangeView(boolean z) {
         boolean z2;
         boolean z3;
         PreviewView previewView;
@@ -418,8 +411,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         this.printButton.setEnabled(true);
     }
 
-    /* access modifiers changed from: private */
-    public void disablePrintButton() {
+    private void disablePrintButton() {
         this.printButton.setEnabled(false);
     }
 
@@ -578,24 +570,20 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         this.mHandler.sendEmptyMessage(5);
     }
 
-    /* access modifiers changed from: private */
-    public void startLoadtask() {
+    private void startLoadtask() {
         this.reloadTask = new AllReloadTask();
         this.reloadTask.executeOnExecutor(new Void[0]);
     }
 
-    /* access modifiers changed from: private */
-    public void showProgressDialog() {
+    private void showProgressDialog() {
         this.mModelDialog.doShow(DIALOG_PROGRESS);
     }
 
-    /* access modifiers changed from: private */
-    public void dismissProgressDialog() {
+    private void dismissProgressDialog() {
         this.mModelDialog.doDismiss(DIALOG_PROGRESS);
     }
 
-    /* access modifiers changed from: private */
-    public void startPrint() {
+    private void startPrint() {
         ExternalFileUtils.getInstance(this).initPrintDir();
         ImageAndLayout imageAndLayout = this.mPreviewView.getImageAndLayout();
         imageAndLayout.setOrgFileName(this.mImageList.get(0).loadImageFileName);
@@ -606,8 +594,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         startActivityForResult(intent, 1);
     }
 
-    /* access modifiers changed from: private */
-    public void updatePaperDisplay(Message message) {
+    private void updatePaperDisplay(Message message) {
         this.aPaperSourceSetting = message.getData().getParcelableArrayList(PaperSourceInfo.KEY_PAPERSOURCEINFO);
         if (this.aPaperSourceSetting != null) {
             this.papersizeTextView.setTextColor(getResources().getColor(R.color.epson_blue));
@@ -632,8 +619,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
         this.paperMissmath.setVisibility(4);
     }
 
-    /* access modifiers changed from: private */
-    public boolean isRemotePrinter() {
+    private boolean isRemotePrinter() {
         return MyPrinter.isRemotePrinter(this);
     }
 

app/src/main/java/com/epson/cameracopy/printlayout/PreviewView.java

@@ -41,8 +41,7 @@ public class PreviewView extends View {
     private final Matrix mMatrix;
     private final Paint mPaint;
     private int mPapaerSizeId;
-    /* access modifiers changed from: private */
-    public PreviewPosition mPreviewPosition;
+    private PreviewPosition mPreviewPosition;
     private PrttargetScaleChangeListener mPrttargetScaleChangeListener;
     private final ScaleGestureDetector mScaleGestureDetector;
 
@@ -281,8 +280,7 @@ public class PreviewView extends View {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void updateScale() {
+    private void updateScale() {
         PrttargetScaleChangeListener prttargetScaleChangeListener = this.mPrttargetScaleChangeListener;
         if (prttargetScaleChangeListener != null) {
             prttargetScaleChangeListener.onPrttargetScaleChange(this.mPreviewPosition.getCurrentPrttargetScale());

app/src/main/java/com/epson/memcardacc/ConfirmReadMemcard.java

@@ -45,17 +45,13 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
     boolean isKeepSimleApConnect = false;
     boolean isTryConnectSimpleAp = false;
     CheckAndNextActivityTask mCheckAndNextActivityTask;
-    /* access modifiers changed from: private */
-    public String mCopyTargetFolderName;
+    private String mCopyTargetFolderName;
     private TextView mCopyTargetPathText;
     private TextView mFileNumText;
     private TextView mFileSizeText;
-    /* access modifiers changed from: private */
-    public ArrayList<String> mImageList;
-    /* access modifiers changed from: private */
-    public int mMemcardStorageType;
-    /* access modifiers changed from: private */
-    public DialogProgressViewModel mModelDialog;
+    private ArrayList<String> mImageList;
+    private int mMemcardStorageType;
+    private DialogProgressViewModel mModelDialog;
     private long mTotalFileSize;
     private TotalFileSizeCalcTask mTotalFileSizeCalcTask;
     private String mWriteDirectory = MemcardConfig.DEFAULT_READER_LOCAL_DIRECTORY;
@@ -151,8 +147,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         this.isKeepSimleApConnect = true;
     }
 
-    /* access modifiers changed from: private */
-    public void localShowDialog(String str) {
+    private void localShowDialog(String str) {
         this.mModelDialog.doShow(str);
     }
 
@@ -196,8 +191,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         return j;
     }
 
-    /* access modifiers changed from: private */
-    public boolean checkFileSize() {
+    private boolean checkFileSize() {
         StatFs statFs = new StatFs(new File(MemcardConfig.BASE_DIRECTORY, this.mWriteDirectory).toString());
         return (this.mTotalFileSize / statFs.getBlockSizeLong()) + ((long) this.mImageList.size()) <= statFs.getAvailableBlocksLong();
     }
@@ -207,8 +201,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
         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 */
-    public void startCopyActivity() {
+    private void startCopyActivity() {
         Intent intent = new Intent(this, MemcardReadProgress.class);
         intent.putStringArrayListExtra("imageList", this.mImageList);
         intent.putExtra("target_folder_name", this.mCopyTargetFolderName);

app/src/main/java/com/epson/memcardacc/ConfirmWriteMemcard.java

@@ -7,7 +7,7 @@ import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentActivity;
 import android.view.View;
@@ -48,18 +48,15 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
     boolean isKeepSimleApConnect = false;
     boolean isTryConnectSimpleAp = false;
     private CheckAndNextActivityTask mCheckAndNextActivity;
-    /* access modifiers changed from: private */
-    public String mCopyTargetFolderName;
-    /* access modifiers changed from: private */
-    public TextView mCopyTargetPathText;
+    private String mCopyTargetFolderName;
+    private TextView mCopyTargetPathText;
     private TextView mCopyTargetPrinter;
     private DirectoryNameTask mDirectoryNameTask = null;
     private TextView mFileNumText;
     private TextView mFileSizeText;
     private ArrayList<String> mImageList;
     private int mMemcardStorageType;
-    /* access modifiers changed from: private */
-    public DialogProgressViewModel mModelDialog;
+    private DialogProgressViewModel mModelDialog;
     private long mTotalFileSize;
 
     public void onCancelDialog(String str) {
@@ -145,8 +142,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         });
     }
 
-    /* access modifiers changed from: private */
-    public void onUpdateViewModelData(MemCardWriteConvertViewModel.ConvertResult convertResult) {
+    private void onUpdateViewModelData(MemCardWriteConvertViewModel.ConvertResult convertResult) {
         if (convertResult == null) {
             finish();
             return;
@@ -232,8 +228,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         ((MemCardWriteConvertViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(MemCardWriteConvertViewModel.class)).deleteTempFile();
     }
 
-    /* access modifiers changed from: private */
-    public int capacityCheck() {
+    private int capacityCheck() {
         EPLog.m313i(LOG_TAG, "in capacityCheck()");
         CifsAccess instance = CifsAccess.getInstance();
         try {
@@ -300,8 +295,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
         return null;
     }
 
-    /* access modifiers changed from: private */
-    public void startCopyActivity() {
+    private void startCopyActivity() {
         Intent intent = new Intent(this, MemcardWriteProgress.class);
         intent.putStringArrayListExtra("imageList", this.mImageList);
         intent.putExtra("target_folder_name", this.mCopyTargetFolderName);

app/src/main/java/com/epson/memcardacc/CopyTask.java

@@ -2,7 +2,7 @@ package com.epson.memcardacc;
 
 import android.content.Context;
 
-import android.support.annotation.Nullable;
+
 import com.epson.iprint.prtlogger.CommonLog;
 import epson.print.Util.AsyncTaskExecutor;
 import epson.print.Util.EPLog;

app/src/main/java/com/epson/memcardacc/FileConvertTask.java

@@ -2,7 +2,7 @@ package com.epson.memcardacc;
 
 import android.os.AsyncTask;
 
-import android.support.annotation.Nullable;
+
 import epson.common.ExternalFileUtils;
 import epson.common.ImageUtil;
 import epson.print.IprintApplication;

app/src/main/java/com/epson/memcardacc/FileConvertViewModel.java

@@ -6,7 +6,7 @@ import android.arch.lifecycle.LiveData;
 import android.arch.lifecycle.MutableLiveData;
 import android.os.AsyncTask;
 
-import android.support.annotation.Nullable;
+
 import com.epson.memcardacc.FileConvertTask;
 import java.util.ArrayList;
 
@@ -16,8 +16,7 @@ public class FileConvertViewModel extends AndroidViewModel {
             FileConvertViewModel.this.mFileConvertStatusLiveData.setValue(new FileConvertStatus(ConvertStatus.TASK_END, errorType, arrayList));
         }
     };
-    /* access modifiers changed from: private */
-    public final MutableLiveData<FileConvertStatus> mFileConvertStatusLiveData = new MutableLiveData<>();
+    private final MutableLiveData<FileConvertStatus> mFileConvertStatusLiveData = new MutableLiveData<>();
     private FileConvertTask mFileConvertTask;
 
     enum ConvertStatus {

app/src/main/java/com/epson/memcardacc/ImageFileListAdapter.java

@@ -17,8 +17,7 @@ import java.util.LinkedList;
 public class ImageFileListAdapter extends BaseAdapter implements Serializable {
     private static final int FILE_SELECT_NUMBER_LIMIT = 30;
     private static final long serialVersionUID = 1;
-    /* access modifiers changed from: private */
-    public String mBaseDir = "";
+    private String mBaseDir = "";
     LinkedList<FileInfoWithCheck> mFileInfoWithCheck = new LinkedList<>();
     private transient LayoutInflater mLayoutInflator;
     private AbsListView.LayoutParams mLayoutParams;
@@ -173,8 +172,7 @@ public class ImageFileListAdapter extends BaseAdapter implements Serializable {
 
     public class FileInfoWithCheck {
         public int mChecked;
-        /* access modifiers changed from: private */
-        public CifsFileInfo mCifsFileInfo;
+        private CifsFileInfo mCifsFileInfo;
         String mParentDirectory;
         public Bitmap mThumbNail;
 

app/src/main/java/com/epson/memcardacc/LocalAlertDialogFragment.java

@@ -58,8 +58,7 @@ public class LocalAlertDialogFragment extends DialogFragment {
         return create;
     }
 
-    /* access modifiers changed from: private */
-    public void execCallback() {
+    private void execCallback() {
         try {
             DialogCallback dialogCallback = (DialogCallback) getActivity();
             if (dialogCallback != null) {

app/src/main/java/com/epson/memcardacc/LocalProgressDialogFragment.java

@@ -3,7 +3,7 @@ package com.epson.memcardacc;
 import android.app.Dialog;
 import android.os.Bundle;
 
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.DialogFragment;
 
 import android.view.View;

app/src/main/java/com/epson/memcardacc/MemCardWriteConvertViewModel.java

@@ -12,10 +12,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 
 public class MemCardWriteConvertViewModel extends AndroidViewModel {
-    /* access modifiers changed from: private */
-    public final Application mApplication;
-    /* access modifiers changed from: private */
-    public final ConvertLiveData mConvertLiveData = new ConvertLiveData();
+    private final Application mApplication;
+    private final ConvertLiveData mConvertLiveData = new ConvertLiveData();
 
     public static class ConvertResult {
         public final ArrayList<String> filenameList = new ArrayList<>();
@@ -60,8 +58,7 @@ public class MemCardWriteConvertViewModel extends AndroidViewModel {
             }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
         }
 
-        /* access modifiers changed from: private */
-        public synchronized ConvertResult convertAndGetFileSize(@NonNull ArrayList<String> arrayList) {
+        private synchronized ConvertResult convertAndGetFileSize(@NonNull ArrayList<String> arrayList) {
             ConvertResult convertResult = new ConvertResult();
             File initTempDirectory = initTempDirectory(ExternalFileUtils.getInstance(MemCardWriteConvertViewModel.this.mApplication));
             Iterator<String> it = arrayList.iterator();
@@ -84,8 +81,7 @@ public class MemCardWriteConvertViewModel extends AndroidViewModel {
             return externalFileUtils.initTempCacheDirectory(ExternalFileUtils.TempCacheDirectory.MEMORY_CARD_ACCESS);
         }
 
-        /* access modifiers changed from: private */
-        public synchronized void initTempDirectory() {
+        private synchronized void initTempDirectory() {
             initTempDirectory(ExternalFileUtils.getInstance(MemCardWriteConvertViewModel.this.mApplication));
         }
     }

app/src/main/java/com/epson/memcardacc/MemcardImageGrid.java

@@ -53,14 +53,10 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
     private boolean isFinishRequested;
     boolean isKeepSimleApConnect = false;
     boolean isTryConnectSimpleAp = false;
-    /* access modifiers changed from: private */
-    public MemcardBitmapCache mBitmapCache;
-    /* access modifiers changed from: private */
-    public CifsAccess mCifsAccess;
-    /* access modifiers changed from: private */
-    public CifsFileListLoader mCifsFileListLoader;
-    /* access modifiers changed from: private */
-    public DirectoryCache mDirectoryCache;
+    private MemcardBitmapCache mBitmapCache;
+    private CifsAccess mCifsAccess;
+    private CifsFileListLoader mCifsFileListLoader;
+    private DirectoryCache mDirectoryCache;
     private GridView mGridView;
     /* access modifiers changed from: private */
     @SuppressLint({"HandlerLeak"})
@@ -94,10 +90,8 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
             }
         }
     };
-    /* access modifiers changed from: private */
-    public ImageFileListAdapter mImageFileListAdapter;
-    /* access modifiers changed from: private */
-    public int mMemcardStorageType;
+    private ImageFileListAdapter mImageFileListAdapter;
+    private int mMemcardStorageType;
     private DialogProgressViewModel mModelDialog;
     private ProgressBar mProgressBar;
     private TextView mSelectedFileNumText;
@@ -294,8 +288,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         this.isFinishRequested = true;
     }
 
-    /* access modifiers changed from: private */
-    public void localShowDialog(String str) {
+    private void localShowDialog(String str) {
         this.mModelDialog.doShow(str);
     }
 
@@ -339,8 +332,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         this.mModelDialog.doShow(DIALOG_PROGRESS);
     }
 
-    /* access modifiers changed from: private */
-    public void dismissProgressDialog() {
+    private void dismissProgressDialog() {
         this.mModelDialog.doDismiss(DIALOG_PROGRESS);
     }
 

app/src/main/java/com/epson/memcardacc/MemcardPhotocopyTop.java

@@ -39,8 +39,7 @@ public class MemcardPhotocopyTop extends MemcardTopSuper {
         });
     }
 
-    /* access modifiers changed from: private */
-    public void launchWriter() {
+    private void launchWriter() {
         if (this.mLaunchType == 0) {
             this.mLaunchType = 1;
             startMemcardStorageCheck();

app/src/main/java/com/epson/memcardacc/MemcardReadProgress.java

@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.media.MediaScannerConnection;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+
 import android.view.View;
 import android.widget.Button;
 import android.widget.ProgressBar;
@@ -33,12 +33,9 @@ public class MemcardReadProgress extends Activity {
     private Button mCancelButton;
     private CopyTask mCopyTask;
     ProgressBar mEachProgress;
-    /* access modifiers changed from: private */
-    public ArrayList<String> mImageList;
-    /* access modifiers changed from: private */
-    public int mMemcardStorageType;
-    /* access modifiers changed from: private */
-    public String mTargetFolderName;
+    private ArrayList<String> mImageList;
+    private int mMemcardStorageType;
+    private String mTargetFolderName;
     TextView mTextView;
     ProgressBar mTotalProgress;
 

app/src/main/java/com/epson/memcardacc/MemcardTopSuper.java

@@ -156,8 +156,7 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
         }
     }
 
-    /* access modifiers changed from: private */
-    public void onPreMemcardChek() {
+    private void onPreMemcardChek() {
         this.mModelDialog.doShow(DIALOG_PROGRESS);
     }
 
@@ -236,8 +235,7 @@ public abstract class MemcardTopSuper extends ActivityIACommon implements Passwo
         }
     }
 
-    /* access modifiers changed from: private */
-    public void onMemcardCheckEnd(Integer num, int i) {
+    private void onMemcardCheckEnd(Integer num, int i) {
         this.mMemcardCheckTask = null;
         this.mPasswordDialogFragment = null;
         if (num == null || num.intValue() == 0) {

app/src/main/java/com/epson/memcardacc/MemcardWriteProgress.java

@@ -3,7 +3,7 @@ package com.epson.memcardacc;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+
 import android.view.View;
 import android.widget.Button;
 import android.widget.ProgressBar;
@@ -184,8 +184,7 @@ public class MemcardWriteProgress extends Activity {
         finish();
     }
 
-    /* access modifiers changed from: private */
-    public void connectOk() {
+    private void connectOk() {
         this.mCountDownLatch.countDown();
     }
 

app/src/main/java/com/epson/memcardacc/PasswordDialogFragment.java

@@ -16,10 +16,8 @@ import android.widget.TextView;
 public class PasswordDialogFragment extends DialogFragment implements DialogInterface.OnKeyListener {
     private static final String ARG_KEY_FIRST_AUTHENTICATION = "first_authentication";
     private TextView mMessage;
-    /* access modifiers changed from: private */
-    public EditText mPasswordEdit;
-    /* access modifiers changed from: private */
-    public EditText mUserNameEdit;
+    private EditText mPasswordEdit;
+    private EditText mUserNameEdit;
 
     public interface Callback {
         void onNegativeClicked();

app/src/main/java/com/epson/memcardacc/PhotoCopyImageSelectActivity.java

@@ -7,7 +7,7 @@ import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.FragmentActivity;
 import com.epson.memcardacc.AltAlertDialogFragment;
 import com.epson.memcardacc.FileConvertTask;
@@ -43,8 +43,7 @@ public class PhotoCopyImageSelectActivity extends ImageSelectActivity implements
         return true;
     }
 
-    /* access modifiers changed from: private */
-    public void onStateChanged(@Nullable FileConvertViewModel.FileConvertStatus fileConvertStatus) {
+    private void onStateChanged(@Nullable FileConvertViewModel.FileConvertStatus fileConvertStatus) {
         if (fileConvertStatus == null) {
             hideProgress();
             return;

app/src/main/java/com/epson/mobilephone/common/ReviewInvitationDialog.java

@@ -9,7 +9,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentActivity;
 
@@ -43,8 +43,7 @@ public class ReviewInvitationDialog extends DialogFragment {
         return builder.create();
     }
 
-    /* access modifiers changed from: private */
-    public void startReview() {
+    private void startReview() {
         FragmentActivity activity = getActivity();
         if (activity != null) {
             PackageManager packageManager = activity.getPackageManager();
@@ -56,8 +55,7 @@ public class ReviewInvitationDialog extends DialogFragment {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void doCallback(boolean z) {
+    private void doCallback(boolean z) {
         this.mOnClickListener.invitationDialogClicked(z);
     }
 

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

@@ -21,25 +21,17 @@ import java.util.concurrent.TimeoutException;
 
 public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
     private static AlertDialog dialog = null;
-    /* access modifiers changed from: private */
-    public static HandlerThread handlerThread = null;
+    private static HandlerThread handlerThread = null;
     private static boolean mStop = false;
-    /* access modifiers changed from: private */
-    public static BleAsyncTask mTask;
+    private static BleAsyncTask mTask;
     private static Runnable mTimeOutTask;
-    /* access modifiers changed from: private */
-    public BleScanWork mBleWork = null;
-    /* access modifiers changed from: private */
-    public BLEUtility.BleWorkCallback mCallBack = null;
-    /* access modifiers changed from: private */
-    public List<ScannedDevice> mDevicelist = null;
-    /* access modifiers changed from: private */
-    public Boolean mFind = false;
-    /* access modifiers changed from: private */
-    public long mTimeOut = -1;
+    private BleScanWork mBleWork = null;
+    private BLEUtility.BleWorkCallback mCallBack = null;
+    private List<ScannedDevice> mDevicelist = null;
+    private Boolean mFind = false;
+    private long mTimeOut = -1;
     private long mTimeOutScan = -1;
-    /* access modifiers changed from: private */
-    public Activity m_Activity;
+    private Activity m_Activity;
 
     public static void setStop(boolean z) {
         EpLog.m69d("mStop   " + z);
@@ -216,8 +208,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
         EpLog.m69d("" + bool);
     }
 
-    /* access modifiers changed from: private */
-    public void showAdvanceToSettingDialog() {
+    private void showAdvanceToSettingDialog() {
         if (this.mCallBack != null) {
             this.mDevicelist = this.mBleWork.getScannedDeviceList();
             ArrayList arrayList = new ArrayList();

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

@@ -13,7 +13,7 @@ import android.content.Context;
 import android.os.Build;
 import android.os.ParcelUuid;
 
-import android.support.annotation.Nullable;
+
 import android.support.annotation.RequiresApi;
 import android.util.SparseArray;
 import com.epson.mobilephone.common.EpLog;
@@ -32,8 +32,7 @@ public class BleScanWork {
     private BluetoothLeScanner mBluetoothLeScanner;
     @Nullable
     private BLEUtility.BleWorkCallback mFailed;
-    /* access modifiers changed from: private */
-    public boolean mIsFiltering;
+    private boolean mIsFiltering;
     private boolean mIsScanning;
     @NonNull
     private BluetoothAdapter.LeScanCallback mLeScanCallback;
@@ -52,8 +51,7 @@ public class BleScanWork {
     }
 
     private static class SingletonHolder {
-        /* access modifiers changed from: private */
-        public static final BleScanWork INSTANCE = new BleScanWork();
+        private static final BleScanWork INSTANCE = new BleScanWork();
 
         private SingletonHolder() {
         }

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

@@ -14,7 +14,7 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Handler;
 
-import android.support.annotation.Nullable;
+
 import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.ble.util.BLEUtility;
 import com.epson.mobilephone.common.ble.util.BLEUuid;
@@ -50,33 +50,25 @@ public class BleWork {
     public BluetoothGatt mConnGatt;
     private Context mContext;
     private BluetoothDevice mDevice;
-    /* access modifiers changed from: private */
-    public String mDeviceMacAddress;
+    private String mDeviceMacAddress;
     private String mDevicePassword;
-    /* access modifiers changed from: private */
-    public final byte[] mEngineID;
-    /* access modifiers changed from: private */
-    public EscprLib mEscprlib;
+    private final byte[] mEngineID;
+    private EscprLib mEscprlib;
     /* access modifiers changed from: private */
     @Nullable
     public BLEUtility.BleWorkCallback mFailed;
     private BluetoothGattCallback mGattcallback;
-    /* access modifiers changed from: private */
-    public boolean mInSequence;
-    /* access modifiers changed from: private */
-    public byte mIndex;
+    private boolean mInSequence;
+    private byte mIndex;
     /* access modifiers changed from: private */
     @NonNull
     public MIBCommand mMibCommand;
-    /* access modifiers changed from: private */
-    public boolean mReconnect;
+    private boolean mReconnect;
     /* access modifiers changed from: private */
     @Nullable
     public BLEUtility.BleWorkCallback mResposne;
-    /* access modifiers changed from: private */
-    public int mRetry;
-    /* access modifiers changed from: private */
-    public String mSSID;
+    private int mRetry;
+    private String mSSID;
     private String mSSIDPassword;
     private short mSecurityType;
     private ScannedDevice mSelectItem;
@@ -121,8 +113,7 @@ public class BleWork {
         return 10000;
     }
 
-    /* access modifiers changed from: private */
-    public void showStatus(String str, int i) {
+    private void showStatus(String str, int i) {
     }
 
     static /* synthetic */ int access$508(BleWork bleWork) {
@@ -833,8 +824,7 @@ public class BleWork {
     }
 
     private static final class SingletonHolder {
-        /* access modifiers changed from: private */
-        public static final BleWork INSTANCE = new BleWork();
+        private static final BleWork INSTANCE = new BleWork();
 
         private SingletonHolder() {
         }
@@ -880,8 +870,7 @@ public class BleWork {
         this.mSequenceCallbackFailed = bleWorkCallback2;
     }
 
-    /* access modifiers changed from: private */
-    public void setNotifyCallback(BLEUtility.BleWorkCallback bleWorkCallback) {
+    private void setNotifyCallback(BLEUtility.BleWorkCallback bleWorkCallback) {
         this.mResposne = bleWorkCallback;
     }
 
@@ -909,8 +898,7 @@ public class BleWork {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void gattClose() {
+    private void gattClose() {
         EpLog.m69d(" !! mConnGatt close");
         BluetoothGatt bluetoothGatt = this.mConnGatt;
         if (bluetoothGatt != null) {
@@ -931,8 +919,7 @@ public class BleWork {
         init();
     }
 
-    /* access modifiers changed from: private */
-    public void setSSIDWork() {
+    private void setSSIDWork() {
         ((Activity) this.mContext).runOnUiThread(new Runnable() {
             public void run() {
                 BleWork.this.startSetSSID();
@@ -940,8 +927,7 @@ public class BleWork {
         });
     }
 
-    /* access modifiers changed from: private */
-    public void notifySet(@NonNull BluetoothGattCharacteristic bluetoothGattCharacteristic) {
+    private void notifySet(@NonNull BluetoothGattCharacteristic bluetoothGattCharacteristic) {
         if (!this.mConnGatt.setCharacteristicNotification(bluetoothGattCharacteristic, true)) {
             EpLog.m71e("Notification set ERROR");
         }
@@ -1029,8 +1015,7 @@ public class BleWork {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void characteristicRead() {
+    private void characteristicRead() {
         EpLog.m77i("read " + this.mSequence);
         if (this.mSequence != jobSequence.MIB_REBOOT_NW) {
             final int[] iArr = {0};
@@ -1086,8 +1071,7 @@ public class BleWork {
         }
     }
 
-    /* access modifiers changed from: private */
-    public boolean init() {
+    private boolean init() {
         int i;
         this.mEscprlib.epsWrapperInitDriver(this.mContext.getApplicationContext(), 2);
         if (!BLEUtility.isBLESupported(this.mContext)) {
@@ -1221,8 +1205,7 @@ public class BleWork {
         gattWriteCharacter(bluetoothGattCharacteristic);
     }
 
-    /* access modifiers changed from: private */
-    public void checkSSID() {
+    private void checkSSID() {
         try {
             TimeUnit.SECONDS.sleep(1);
         } catch (InterruptedException e) {
@@ -1243,8 +1226,7 @@ public class BleWork {
         checkSSID();
     }
 
-    /* access modifiers changed from: private */
-    public void startSetSSID() {
+    private void startSetSSID() {
         int i;
         EpLog.m77i("mSequence = " + this.mSequence + " mSSID =  " + this.mSSID);
         this.mInSequence = false;
@@ -1335,8 +1317,7 @@ public class BleWork {
         gattWriteCharacter(bluetoothGattCharacteristic);
     }
 
-    /* access modifiers changed from: private */
-    public void sequenceError() {
+    private void sequenceError() {
         failedProcessing();
     }
 

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

@@ -52,35 +52,25 @@ public class BleWorkActivity extends ActivityIACommon {
     private static final int TOTAL_MARGIN_SEC = 30;
     private static final int TOTAL_PROGRESS_SEC = 210;
     int count = 0;
-    /* access modifiers changed from: private */
-    public boolean isAlive;
+    private boolean isAlive;
     boolean isStopSetUpProgress = false;
     AlertDialog mAlertDialog;
-    /* access modifiers changed from: private */
-    public BleWork mBleWork = null;
-    /* access modifiers changed from: private */
-    public CallbackWork mCompletion = null;
-    /* access modifiers changed from: private */
-    public Context mContext;
-    /* access modifiers changed from: private */
-    public DeviceAdapter mDeviceAdapter;
+    private BleWork mBleWork = null;
+    private CallbackWork mCompletion = null;
+    private Context mContext;
+    private DeviceAdapter mDeviceAdapter;
     AlertDialog mDialog;
-    /* access modifiers changed from: private */
-    public CallbackWork mNext = null;
+    private CallbackWork mNext = null;
     TextView mPercentView;
     ProbePrinter mProbePrinter;
     ProgressBar mProgressPercent;
     private BLEUtility.BleWorkCallback mSequenceCallbackFailed = null;
     private BLEUtility.BleWorkCallback mSequenceCallbackSuccess = null;
     private Handler mTimeoutHandler;
-    /* access modifiers changed from: private */
-    public Handler mWifiSearchHandler;
-    /* access modifiers changed from: private */
-    public Runnable runnableSetUpProgress;
-    /* access modifiers changed from: private */
-    public Runnable runnableWifiSearch;
-    /* access modifiers changed from: private */
-    public Handler setUpProgressHandler;
+    private Handler mWifiSearchHandler;
+    private Runnable runnableSetUpProgress;
+    private Runnable runnableWifiSearch;
+    private Handler setUpProgressHandler;
 
     public interface CallbackWork {
         void call(Object obj);
@@ -258,8 +248,7 @@ public class BleWorkActivity extends ActivityIACommon {
         };
     }
 
-    /* access modifiers changed from: private */
-    public void stopCallbacks() {
+    private void stopCallbacks() {
         stopConnectTimeOut();
         stopWifiSearch();
         this.isStopSetUpProgress = true;
@@ -275,8 +264,7 @@ public class BleWorkActivity extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void stopWifiSearch() {
+    private void stopWifiSearch() {
         Handler handler = this.mWifiSearchHandler;
         if (handler != null) {
             handler.removeCallbacks(this.runnableWifiSearch);
@@ -285,8 +273,7 @@ public class BleWorkActivity extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void settingResultDailog(final boolean z) {
+    private void settingResultDailog(final boolean z) {
         runOnUiThread(new Runnable() {
             public void run() {
                 AlertDialog.Builder cancelable = new AlertDialog.Builder(BleWorkActivity.this.mContext).setCancelable(false);
@@ -336,8 +323,7 @@ public class BleWorkActivity extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void waitingCommunicationDaialog() {
+    private void waitingCommunicationDaialog() {
         if (this.mAlertDialog != null) {
             EpLog.m77i("dismiss ");
             this.mAlertDialog.dismiss();
@@ -400,8 +386,7 @@ public class BleWorkActivity extends ActivityIACommon {
         this.setUpProgressHandler.post(this.runnableSetUpProgress);
     }
 
-    /* access modifiers changed from: private */
-    public void updateProgress(int i) {
+    private void updateProgress(int i) {
         this.mProgressPercent.setProgress(i);
         TextView textView = this.mPercentView;
         textView.setText(i + " %");
@@ -439,8 +424,7 @@ public class BleWorkActivity extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void selectDevice(@NonNull ScannedDevice scannedDevice) {
+    private void selectDevice(@NonNull ScannedDevice scannedDevice) {
         String displayName = scannedDevice.getDisplayName();
         BleScanWork.getInstace().stopScan();
         this.mBleWork.resetSequence();
@@ -450,8 +434,7 @@ public class BleWorkActivity extends ActivityIACommon {
         this.mBleWork.init(this, scannedDevice);
     }
 
-    /* access modifiers changed from: private */
-    public void getInfoForConnectDialog(String str) {
+    private void getInfoForConnectDialog(String str) {
         this.mAlertDialog = new AlertDialog.Builder(this).setCancelable(false).create();
         this.mAlertDialog.setView(LayoutInflater.from(this.mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null));
         String property = System.getProperty("line.separator");
@@ -463,8 +446,7 @@ public class BleWorkActivity extends ActivityIACommon {
         setConnectTimeOut();
     }
 
-    /* access modifiers changed from: private */
-    public void setConnectTimeOut() {
+    private void setConnectTimeOut() {
         this.mTimeoutHandler = new Handler();
         this.mTimeoutHandler.postDelayed(new Runnable() {
             public void run() {
@@ -477,8 +459,7 @@ public class BleWorkActivity extends ActivityIACommon {
         }, DateUtils.MILLIS_PER_MINUTE);
     }
 
-    /* access modifiers changed from: private */
-    public void stopConnectTimeOut() {
+    private void stopConnectTimeOut() {
         Handler handler = this.mTimeoutHandler;
         if (handler != null) {
             handler.removeCallbacksAndMessages((Object) null);
@@ -486,8 +467,7 @@ public class BleWorkActivity extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void failedDialog(final BleWork.jobSequence jobsequence) {
+    private void failedDialog(final BleWork.jobSequence jobsequence) {
         runOnUiThread(new Runnable() {
             public void run() {
                 BleWorkActivity.this.stopCallbacks();
@@ -514,8 +494,7 @@ public class BleWorkActivity extends ActivityIACommon {
         });
     }
 
-    /* access modifiers changed from: private */
-    public void SSIDfailedDialog(BleWork.jobSequence jobsequence) {
+    private void SSIDfailedDialog(BleWork.jobSequence jobsequence) {
         runOnUiThread(new Runnable(jobsequence) {
             private final /* synthetic */ BleWork.jobSequence f$1;
 
@@ -569,8 +548,7 @@ public class BleWorkActivity extends ActivityIACommon {
         bleWorkActivity.finish();
     }
 
-    /* access modifiers changed from: private */
-    public void showSSIDList() {
+    private void showSSIDList() {
         runOnUiThread(new Runnable() {
             public void run() {
                 BleWorkActivity.this.mBleWork.mSequence = BleWork.jobSequence.MIB_SET_SSID;
@@ -624,8 +602,7 @@ public class BleWorkActivity extends ActivityIACommon {
         });
     }
 
-    /* access modifiers changed from: private */
-    public void sortSSIDlist(List<String> list) {
+    private void sortSSIDlist(List<String> list) {
         Collections.sort(list);
         String replaceAll = BleWork.getSSID(this).toUpperCase().replaceAll(CommonDefine.UNDER_BAR, "-");
         int i = 0;
@@ -646,8 +623,7 @@ public class BleWorkActivity extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void setSSID() {
+    private void setSSID() {
         runOnUiThread(new Runnable() {
             public void run() {
                 EpLog.m77i("inputs = ");
@@ -701,8 +677,7 @@ public class BleWorkActivity extends ActivityIACommon {
         });
     }
 
-    /* access modifiers changed from: private */
-    public void setSSIDPassword() {
+    private void setSSIDPassword() {
         EpLog.m76i();
         if (!this.mBleWork.getSSIDPassword().isEmpty() || this.mBleWork.getSecurityType() == 1 || (this.mBleWork.getSecurityType() == 255 && this.mBleWork.mSequence != BleWork.jobSequence.SET_PASSWORD)) {
             runOnUiThread(new Runnable() {

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

@@ -29,20 +29,16 @@ import java.io.IOException;
 public class ProbePrinter {
     static final int PROBE_TIMEOUT_SEC = 180;
     private static final Object lock = new Object();
-    /* access modifiers changed from: private */
-    public static escanLib mScanner = new escanLib();
+    private static escanLib mScanner = new escanLib();
     private final int BIND_SERVICE = 17;
     private final int CANCEL_FIND_PRINTER = 2;
     private final int DELAY = 100;
     private final int SEARCH_PRINTER = 1;
     private final int SELECT_PRINTER = 4;
     private BleWorkActivity.CallbackWork completion;
-    /* access modifiers changed from: private */
-    public Context context;
-    /* access modifiers changed from: private */
-    public volatile boolean isPrinterFound;
-    /* access modifiers changed from: private */
-    public IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
+    private Context context;
+    private volatile boolean isPrinterFound;
+    private IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
         public void onGetStatusState() throws RemoteException {
             EpLog.m76i();
         }
@@ -106,10 +102,8 @@ public class ProbePrinter {
             IEpsonService unused = ProbePrinter.this.mEpsonService = null;
         }
     };
-    /* access modifiers changed from: private */
-    public IEpsonService mEpsonService;
-    /* access modifiers changed from: private */
-    public Handler mHandler = new Handler(new Handler.Callback() {
+    private IEpsonService mEpsonService;
+    private Handler mHandler = new Handler(new Handler.Callback() {
         public boolean handleMessage(Message message) {
             int i = message.what;
             if (i == 4) {
@@ -138,8 +132,7 @@ public class ProbePrinter {
             return false;
         }
     });
-    /* access modifiers changed from: private */
-    public String macAddress;
+    private String macAddress;
 
     private ProbePrinter() {
     }
@@ -239,8 +232,7 @@ public class ProbePrinter {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void selectPrinter(MyPrinter myPrinter) {
+    private void selectPrinter(MyPrinter myPrinter) {
         myPrinter.setCurPrinter(this.context.getApplicationContext());
         Utils.savePref(this.context.getApplicationContext(), "PrintSetting", CommonDefine.RE_SEARCH, true);
         WiFiDirectManager.resetConnectInfo(this.context.getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_PRINTER);

app/src/main/java/com/epson/mobilephone/common/ble/util/BLEUtility.java

@@ -3,7 +3,7 @@ package com.epson.mobilephone.common.ble.util;
 import android.bluetooth.BluetoothManager;
 import android.content.Context;
 
-import android.support.annotation.Nullable;
+
 import com.epson.mobilephone.common.EpLog;
 
 public class BLEUtility {

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

@@ -197,8 +197,7 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
         private MyPageAdapter() {
         }
 
-        /* access modifiers changed from: private */
-        public void setPageSize(@NonNull ViewGroup viewGroup, int i) {
+        private void setPageSize(@NonNull ViewGroup viewGroup, int i) {
             this.mPagePosition = new ImageView[i];
             int i2 = 0;
             while (i2 < i) {

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

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
-import android.support.annotation.Nullable;
+
 import android.support.annotation.VisibleForTesting;
 import android.support.p003v7.app.ActionBar;
 
@@ -77,8 +77,7 @@ public class InfoDisplayActivity extends AppCompatActivity {
         return (TitleAndDocument) intent.getSerializableExtra(PARAM_KEY_TITLE_AND_DOCUMENT);
     }
 
-    /* access modifiers changed from: private */
-    public static int getTitleStringId(int i) {
+    private static int getTitleStringId(int i) {
         switch (i) {
             case 2:
                 return C1066R.string.Privacy_Statement_Title;

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

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
-import android.support.annotation.Nullable;
+
 
 import android.view.View;
 import android.view.ViewGroup;
@@ -99,8 +99,7 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
         SimpleMessageDialogFragment.newInstance(getString(C1066R.string.Update_Message) + Constants.BREAK_LINE + str, 1).show(getSupportFragmentManager(), DIALOG_ID);
     }
 
-    /* access modifiers changed from: private */
-    public void onAgree() {
+    private void onAgree() {
         LicenseInfo licenseInfo = this.mLicenseInfo;
         if (licenseInfo == null) {
             finish();
@@ -126,13 +125,11 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
         }
     }
 
-    /* access modifiers changed from: private */
-    public void onDisagree() {
+    private void onDisagree() {
         SimpleMessageDialogFragment.newInstance(getString(C1066R.string.Disagree_License_Button_Message), 2).show(getSupportFragmentManager(), DIALOG_ID);
     }
 
-    /* access modifiers changed from: private */
-    public void startDocumentDisplayActivity(int i) {
+    private void startDocumentDisplayActivity(int i) {
         LicenseInfo licenseInfo = this.mLicenseInfo;
         if (licenseInfo != null) {
             startActivity(InfoDisplayActivity.getStartIntent(this, licenseInfo, i));

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

@@ -48,8 +48,7 @@ public class SimpleMessageDialogFragment extends DialogFragment {
         return create;
     }
 
-    /* access modifiers changed from: private */
-    public void onOkClicked() {
+    private void onOkClicked() {
         this.mDialogCallback.onButtonClicked(this.mDialogId);
     }
 

app/src/main/java/com/epson/mobilephone/common/license/UserSurveyInfo.java

@@ -2,7 +2,7 @@ package com.epson.mobilephone.common.license;
 
 import android.content.Context;
 
-import android.support.annotation.Nullable;
+
 import java.io.Serializable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

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

@@ -75,8 +75,7 @@ public class UserSurveyInvitationActivity extends AppCompatActivity implements S
         }
     }
 
-    /* access modifiers changed from: private */
-    public void startPrivacyStatementDisplayActivity() {
+    private void startPrivacyStatementDisplayActivity() {
         LicenseInfo licenseInfo = this.mLicenseInfo;
         if (licenseInfo != null) {
             startActivity(InfoDisplayActivity.getStartIntent(this, licenseInfo, 2));
@@ -101,8 +100,7 @@ public class UserSurveyInvitationActivity extends AppCompatActivity implements S
         }
     }
 
-    /* access modifiers changed from: private */
-    public void finishWithStatus(boolean z) {
+    private void finishWithStatus(boolean z) {
         UserSurveyInfo userSurveyInfo = this.mUserSurveyInfo;
         if (userSurveyInfo != null) {
             userSurveyInfo.setUserSurveyAgreement(this, z);

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

@@ -17,7 +17,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentActivity;
 import android.widget.Toast;
@@ -144,14 +144,11 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
             }
         }
     };
-    /* access modifiers changed from: private */
-    public DialogProgressWiFiDirectViewModel mModelDialog;
+    private DialogProgressWiFiDirectViewModel mModelDialog;
     WifiP2pManager mWiFiP2PManager = null;
     WifiP2pManager.Channel p2pChannnel = null;
-    /* access modifiers changed from: private */
-    public WifiP2pConfig p2pConnectConfig = null;
-    /* access modifiers changed from: private */
-    public int p2pRetryCount = 0;
+    private WifiP2pConfig p2pConnectConfig = null;
+    private int p2pRetryCount = 0;
     WiFiDirectBroadcastReceiver p2pStateChangeReciever = null;
 
     public void onCancelDialog(String str) {
@@ -339,8 +336,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         throw new UnsupportedOperationException("Method not decompiled: com.epson.mobilephone.common.wifidirect.ActivityConnectP2P.showDialog(java.lang.String):void");
     }
 
-    /* access modifiers changed from: private */
-    public void dismissDialog(String str) {
+    private void dismissDialog(String str) {
         DialogFragment dialogFragment = (DialogFragment) getSupportFragmentManager().findFragmentByTag(str);
         if (dialogFragment != null) {
             dialogFragment.dismiss();

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

@@ -13,7 +13,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentActivity;
 import android.widget.Toast;
@@ -34,8 +34,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
     private static final int ID_RESULT = 0;
     private static final int MAX_RETRY_CONNECTING = 5;
     private static final String TAG = "ActivityConnectSimpleAP";
-    /* access modifiers changed from: private */
-    public int connectingNetworkId = -1;
+    private int connectingNetworkId = -1;
     boolean createSimpleAP = false;
     Handler mHandler = new Handler() {
         public void handleMessage(Message message) {
@@ -124,11 +123,9 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
             }
         }
     };
-    /* access modifiers changed from: private */
-    public DialogProgressWiFiDirectViewModel mModelDialog;
+    private DialogProgressWiFiDirectViewModel mModelDialog;
     NetworkStateChangeReciever networkStateChangeReciever = null;
-    /* access modifiers changed from: private */
-    public int retryConnecting = 0;
+    private int retryConnecting = 0;
     String targetPass = "";
 
     public void onCancelDialog(String str) {
@@ -361,8 +358,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         throw new UnsupportedOperationException("Method not decompiled: com.epson.mobilephone.common.wifidirect.ActivityConnectSimpleAP.showDialog(java.lang.String):void");
     }
 
-    /* access modifiers changed from: private */
-    public void dismissDialog(String str) {
+    private void dismissDialog(String str) {
         DialogFragment dialogFragment = (DialogFragment) getSupportFragmentManager().findFragmentByTag(str);
         if (dialogFragment != null) {
             dialogFragment.dismiss();

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

@@ -17,7 +17,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Settings;
 
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.Fragment;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -47,8 +47,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
     private static final String REJECTED_REQUEST = "REJECTED_REQUEST";
     private static final String TAG = "ActivityRequestLocationPermission";
     private Handler mHandler = new innerHandler(this);
-    /* access modifiers changed from: private */
-    public String requestPermission;
+    private String requestPermission;
 
     public void onConnected(@Nullable Bundle bundle) {
     }
@@ -124,8 +123,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
         return false;
     }
 
-    /* access modifiers changed from: private */
-    public void setRejectRequestPermission() {
+    private void setRejectRequestPermission() {
         ComponentName callingActivity = getCallingActivity();
         if (callingActivity != null) {
             SharedPreferences.Editor edit = getPreferences(0).edit();
@@ -222,8 +220,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
         finish();
     }
 
-    /* access modifiers changed from: private */
-    public void checkLocationPreference() {
+    private void checkLocationPreference() {
         if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(this) == 0) {
             GoogleApiClient build = new GoogleApiClient.Builder(this).addApi(LocationServices.API).addConnectionCallbacks(this).addOnConnectionFailedListener(this).build();
             try {
@@ -378,8 +375,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
         return Build.VERSION.SDK_INT > 28 ? "android.permission.ACCESS_FINE_LOCATION" : "android.permission.ACCESS_COARSE_LOCATION";
     }
 
-    /* access modifiers changed from: private */
-    public static boolean isNeedChangeLocationSettings(Context context) {
+    private static boolean isNeedChangeLocationSettings(Context context) {
         if (Build.VERSION.SDK_INT >= 23 && Build.VERSION.SDK_INT >= 19) {
             try {
                 int i = Settings.Secure.getInt(context.getContentResolver(), "location_mode");

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

@@ -9,7 +9,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentActivity;
 import android.view.View;
@@ -60,8 +60,7 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
             }
         }
     };
-    /* access modifiers changed from: private */
-    public DialogProgressViewModel mModelDialog;
+    private DialogProgressViewModel mModelDialog;
     WebView mNoLcdGuidanceWebView;
     WifiManager mWifiManager = null;
     ViewGroup mWithLcdGuidanceView;

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

@@ -34,8 +34,7 @@ public class ActivityWiFiDirectStart extends ActivityWiFiDirectBase {
         });
     }
 
-    /* access modifiers changed from: private */
-    public void startWifiManualSetup(boolean z) {
+    private void startWifiManualSetup(boolean z) {
         startActivityForResult(ActivityWiFiDirectManual.getStartIntent(this, z), 10);
     }
 

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

@@ -31,8 +31,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     private static final int TIMEOUT_CONNECTING_TESTAP = 60;
     private static final int WAIT_CONNECTREALAP = 120;
     private static final int WAIT_RETRY = 2;
-    /* access modifiers changed from: private */
-    public static byte[] engineId;
+    private static byte[] engineId;
     private final int CONNECT_REALAP = 2;
     private final int CONNECT_TESTAP = 1;
     Button btnFinish;
@@ -45,8 +44,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     ProgressBar progress;
     escprLib.ConnectStrings settingsRealAp = new escprLib.ConnectStrings();
     escprLib.ConnectStrings settingsTempAp = new escprLib.ConnectStrings();
-    /* access modifiers changed from: private */
-    public Status status = Status.IDLE;
+    private Status status = Status.IDLE;
     AsyncTask<Void, Void, Boolean> taskGetConnectStrings = null;
     TextView textView1;
     TextView textView2;

app/src/main/java/com/epson/mobilephone/common/wifidirect/DialogProgressWiFiDirect.java

@@ -4,7 +4,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentManager;
 
@@ -25,10 +25,8 @@ public class DialogProgressWiFiDirect extends DialogFragment {
     private static final String TAG_POSITION = "position";
     private static final String TAG_POSITIVE_MESSAGE = "positive_dialog_message";
     private static final String TAG_TITLE_MESSAGE = "title_message";
-    /* access modifiers changed from: private */
-    public DialogButtonClick mActivity;
-    /* access modifiers changed from: private */
-    public String mTag;
+    private DialogButtonClick mActivity;
+    private String mTag;
 
     public interface DialogButtonClick {
         void onCancelDialog(String str);

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

@@ -1,6 +1,6 @@
 package com.epson.mobilephone.common.wifidirect;
 
-import android.support.annotation.Nullable;
+
 
 public class EventWrapperWiFiDirect<T> {
     private boolean handled = false;

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

@@ -26,11 +26,9 @@ public class ManageDefaultNetwork {
     private static ManageDefaultNetwork manageDefaultNetwork;
     volatile boolean canConnected = false;
     private String checkedSSID = null;
-    /* access modifiers changed from: private */
-    public ConnectivityManager connectivityManager = null;
+    private ConnectivityManager connectivityManager = null;
     private boolean isOnline = false;
-    /* access modifiers changed from: private */
-    public volatile Object lock = new Object();
+    private volatile Object lock = new Object();
     private Context mContext = null;
     private ManageDefaultNetworkCallback manageDefaultNetworkCallback = null;
     private WifiManager wifiManager = null;

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

@@ -192,8 +192,7 @@ public class SearchWiFiDirectPrinterTask {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void onScanResultAvailable() {
+    private void onScanResultAvailable() {
         boolean z;
         int existSimpleApDisabled;
         long elapsedRealtime = SystemClock.elapsedRealtime();

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

@@ -9,10 +9,8 @@ public class WiFiScanner {
     private static final int INTERVAL_SCAN = 30;
     private static Handler wifiScannerHandler;
     private static Object wifiScannerToken;
-    /* access modifiers changed from: private */
-    public String TAG = "WiFiScanner";
-    /* access modifiers changed from: private */
-    public WeakReference<WifiManager> refWiFiManager = null;
+    private String TAG = "WiFiScanner";
+    private WeakReference<WifiManager> refWiFiManager = null;
 
     private boolean startScan(WifiManager wifiManager) {
         if (Build.VERSION.SDK_INT >= 28) {

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

@@ -14,8 +14,7 @@ public class WifiP2pUtils {
     private static final String TAG = "WifiP2pUtils";
     private static final int TIMEOUT_CONNECTIONINFO = 5000;
     private static WifiP2pUtils instance;
-    /* access modifiers changed from: private */
-    public volatile WifiP2pGroup groupInfo = null;
+    private volatile WifiP2pGroup groupInfo = null;
     private HandlerThread handlerThread = null;
     private volatile Object lock = new Object();
     private Context mAppContext = null;

app/src/main/java/epson/common/DialogProgress.java

@@ -4,7 +4,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentManager;
 

app/src/main/java/epson/common/EventWrapper.java

@@ -1,6 +1,6 @@
 package epson.common;
 
-import android.support.annotation.Nullable;
+
 
 public class EventWrapper<T> {
     private boolean handled = false;

app/src/main/java/epson/common/ExternalFileUtils.java

@@ -2,7 +2,7 @@ package epson.common;
 
 import android.content.Context;
 
-import android.support.annotation.Nullable;
+
 import android.support.annotation.VisibleForTesting;
 import epson.print.Util.EPLog;
 import java.io.File;

app/src/main/java/epson/common/ReviewInvitationDialog.java

@@ -9,7 +9,7 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Bundle;
 
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentActivity;
 
@@ -43,8 +43,7 @@ public class ReviewInvitationDialog extends DialogFragment {
         return builder.create();
     }
 
-    /* access modifiers changed from: private */
-    public void startReview() {
+    private void startReview() {
         FragmentActivity activity = getActivity();
         if (activity != null) {
             PackageManager packageManager = activity.getPackageManager();
@@ -56,8 +55,7 @@ public class ReviewInvitationDialog extends DialogFragment {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void doCallback(boolean z) {
+    private void doCallback(boolean z) {
         this.mOnClickListener.invitationDialogClicked(z);
     }
 

app/src/main/java/epson/common/ScalableImageView.java

@@ -22,15 +22,11 @@ public class ScalableImageView extends View {
 
     /* renamed from: bm */
     private Bitmap f332bm = null;
-    /* access modifiers changed from: private */
-    public Rect canvasRect = new Rect();
+    private Rect canvasRect = new Rect();
     private GestureDetector gesDetect = null;
-    /* access modifiers changed from: private */
-    public float mOffsetX = 0.0f;
-    /* access modifiers changed from: private */
-    public float mOffsetY = 0.0f;
-    /* access modifiers changed from: private */
-    public float mScaleFactor = 1.0f;
+    private float mOffsetX = 0.0f;
+    private float mOffsetY = 0.0f;
+    private float mScaleFactor = 1.0f;
     private final GestureDetector.SimpleOnGestureListener onGestureListener = new GestureDetector.SimpleOnGestureListener() {
         public boolean onDoubleTap(MotionEvent motionEvent) {
             EPLog.m305d(ScalableImageView.TAG, "DOBULE TAP");

app/src/main/java/epson/common/Utils.java

@@ -16,7 +16,7 @@ import android.net.wifi.WifiManager;
 import android.os.Build;
 import android.os.Environment;
 
-import android.support.annotation.Nullable;
+
 import android.view.KeyEvent;
 import android.widget.TextView;
 import epson.print.CommonDefine;

app/src/main/java/epson/common/ble/BleAsyncTask.java

@@ -21,25 +21,17 @@ import java.util.concurrent.TimeoutException;
 
 public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
     private static AlertDialog dialog = null;
-    /* access modifiers changed from: private */
-    public static HandlerThread handlerThread = null;
+    private static HandlerThread handlerThread = null;
     private static boolean mStop = false;
-    /* access modifiers changed from: private */
-    public static BleAsyncTask mTask;
+    private static BleAsyncTask mTask;
     private static Runnable mTimeOutTask;
-    /* access modifiers changed from: private */
-    public BleScanWork mBleWork = null;
-    /* access modifiers changed from: private */
-    public BLEUtility.BleWorkCallback mCallBack = null;
-    /* access modifiers changed from: private */
-    public List<ScannedDevice> mDevicelist = null;
-    /* access modifiers changed from: private */
-    public Boolean mFind = false;
-    /* access modifiers changed from: private */
-    public long mTimeOut = -1;
+    private BleScanWork mBleWork = null;
+    private BLEUtility.BleWorkCallback mCallBack = null;
+    private List<ScannedDevice> mDevicelist = null;
+    private Boolean mFind = false;
+    private long mTimeOut = -1;
     private long mTimeOutScan = -1;
-    /* access modifiers changed from: private */
-    public Activity m_Activity;
+    private Activity m_Activity;
 
     public static void setStop(boolean z) {
         EpLog.m69d("mStop   " + z);
@@ -216,8 +208,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
         EpLog.m69d("" + bool);
     }
 
-    /* access modifiers changed from: private */
-    public void showAdvanceToSettingDialog() {
+    private void showAdvanceToSettingDialog() {
         if (this.mCallBack != null) {
             this.mDevicelist = this.mBleWork.getScannedDeviceList();
             ArrayList arrayList = new ArrayList();

app/src/main/java/epson/common/ble/BleScanWork.java

@@ -13,7 +13,7 @@ import android.content.Context;
 import android.os.Build;
 import android.os.ParcelUuid;
 
-import android.support.annotation.Nullable;
+
 import android.support.annotation.RequiresApi;
 import android.util.SparseArray;
 import com.epson.mobilephone.common.EpLog;
@@ -32,8 +32,7 @@ public class BleScanWork {
     private BluetoothLeScanner mBluetoothLeScanner;
     @Nullable
     private BLEUtility.BleWorkCallback mFailed;
-    /* access modifiers changed from: private */
-    public boolean mIsFiltering;
+    private boolean mIsFiltering;
     private boolean mIsScanning;
     @NonNull
     private BluetoothAdapter.LeScanCallback mLeScanCallback;
@@ -52,8 +51,7 @@ public class BleScanWork {
     }
 
     private static class SingletonHolder {
-        /* access modifiers changed from: private */
-        public static final BleScanWork INSTANCE = new BleScanWork();
+        private static final BleScanWork INSTANCE = new BleScanWork();
 
         private SingletonHolder() {
         }

app/src/main/java/epson/common/ble/BleWork.java

@@ -14,7 +14,7 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Handler;
 
-import android.support.annotation.Nullable;
+
 import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.ble.util.BLEUtility;
 import com.epson.mobilephone.common.ble.util.BLEUuid;
@@ -50,33 +50,25 @@ public class BleWork {
     public BluetoothGatt mConnGatt;
     private Context mContext;
     private BluetoothDevice mDevice;
-    /* access modifiers changed from: private */
-    public String mDeviceMacAddress;
+    private String mDeviceMacAddress;
     private String mDevicePassword;
-    /* access modifiers changed from: private */
-    public final byte[] mEngineID;
-    /* access modifiers changed from: private */
-    public EscprLib mEscprlib;
+    private final byte[] mEngineID;
+    private EscprLib mEscprlib;
     /* access modifiers changed from: private */
     @Nullable
     public BLEUtility.BleWorkCallback mFailed;
     private BluetoothGattCallback mGattcallback;
-    /* access modifiers changed from: private */
-    public boolean mInSequence;
-    /* access modifiers changed from: private */
-    public byte mIndex;
+    private boolean mInSequence;
+    private byte mIndex;
     /* access modifiers changed from: private */
     @NonNull
     public MIBCommand mMibCommand;
-    /* access modifiers changed from: private */
-    public boolean mReconnect;
+    private boolean mReconnect;
     /* access modifiers changed from: private */
     @Nullable
     public BLEUtility.BleWorkCallback mResposne;
-    /* access modifiers changed from: private */
-    public int mRetry;
-    /* access modifiers changed from: private */
-    public String mSSID;
+    private int mRetry;
+    private String mSSID;
     private String mSSIDPassword;
     private short mSecurityType;
     private ScannedDevice mSelectItem;
@@ -121,8 +113,7 @@ public class BleWork {
         return 10000;
     }
 
-    /* access modifiers changed from: private */
-    public void showStatus(String str, int i) {
+    private void showStatus(String str, int i) {
     }
 
     static /* synthetic */ int access$508(BleWork bleWork) {
@@ -833,8 +824,7 @@ public class BleWork {
     }
 
     private static final class SingletonHolder {
-        /* access modifiers changed from: private */
-        public static final BleWork INSTANCE = new BleWork();
+        private static final BleWork INSTANCE = new BleWork();
 
         private SingletonHolder() {
         }
@@ -880,8 +870,7 @@ public class BleWork {
         this.mSequenceCallbackFailed = bleWorkCallback2;
     }
 
-    /* access modifiers changed from: private */
-    public void setNotifyCallback(BLEUtility.BleWorkCallback bleWorkCallback) {
+    private void setNotifyCallback(BLEUtility.BleWorkCallback bleWorkCallback) {
         this.mResposne = bleWorkCallback;
     }
 
@@ -909,8 +898,7 @@ public class BleWork {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void gattClose() {
+    private void gattClose() {
         EpLog.m69d(" !! mConnGatt close");
         BluetoothGatt bluetoothGatt = this.mConnGatt;
         if (bluetoothGatt != null) {
@@ -931,8 +919,7 @@ public class BleWork {
         init();
     }
 
-    /* access modifiers changed from: private */
-    public void setSSIDWork() {
+    private void setSSIDWork() {
         ((Activity) this.mContext).runOnUiThread(new Runnable() {
             public void run() {
                 BleWork.this.startSetSSID();
@@ -940,8 +927,7 @@ public class BleWork {
         });
     }
 
-    /* access modifiers changed from: private */
-    public void notifySet(@NonNull BluetoothGattCharacteristic bluetoothGattCharacteristic) {
+    private void notifySet(@NonNull BluetoothGattCharacteristic bluetoothGattCharacteristic) {
         if (!this.mConnGatt.setCharacteristicNotification(bluetoothGattCharacteristic, true)) {
             EpLog.m71e("Notification set ERROR");
         }
@@ -1029,8 +1015,7 @@ public class BleWork {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void characteristicRead() {
+    private void characteristicRead() {
         EpLog.m77i("read " + this.mSequence);
         if (this.mSequence != jobSequence.MIB_REBOOT_NW) {
             final int[] iArr = {0};
@@ -1086,8 +1071,7 @@ public class BleWork {
         }
     }
 
-    /* access modifiers changed from: private */
-    public boolean init() {
+    private boolean init() {
         int i;
         this.mEscprlib.epsWrapperInitDriver(this.mContext.getApplicationContext(), 2);
         if (!BLEUtility.isBLESupported(this.mContext)) {
@@ -1221,8 +1205,7 @@ public class BleWork {
         gattWriteCharacter(bluetoothGattCharacteristic);
     }
 
-    /* access modifiers changed from: private */
-    public void checkSSID() {
+    private void checkSSID() {
         try {
             TimeUnit.SECONDS.sleep(1);
         } catch (InterruptedException e) {
@@ -1243,8 +1226,7 @@ public class BleWork {
         checkSSID();
     }
 
-    /* access modifiers changed from: private */
-    public void startSetSSID() {
+    private void startSetSSID() {
         int i;
         EpLog.m77i("mSequence = " + this.mSequence + " mSSID =  " + this.mSSID);
         this.mInSequence = false;
@@ -1335,8 +1317,7 @@ public class BleWork {
         gattWriteCharacter(bluetoothGattCharacteristic);
     }
 
-    /* access modifiers changed from: private */
-    public void sequenceError() {
+    private void sequenceError() {
         failedProcessing();
     }
 

app/src/main/java/epson/common/ble/BleWorkActivity.java

@@ -52,35 +52,25 @@ public class BleWorkActivity extends ActivityIACommon {
     private static final int TOTAL_MARGIN_SEC = 30;
     private static final int TOTAL_PROGRESS_SEC = 210;
     int count = 0;
-    /* access modifiers changed from: private */
-    public boolean isAlive;
+    private boolean isAlive;
     boolean isStopSetUpProgress = false;
     AlertDialog mAlertDialog;
-    /* access modifiers changed from: private */
-    public BleWork mBleWork = null;
-    /* access modifiers changed from: private */
-    public CallbackWork mCompletion = null;
-    /* access modifiers changed from: private */
-    public Context mContext;
-    /* access modifiers changed from: private */
-    public DeviceAdapter mDeviceAdapter;
+    private BleWork mBleWork = null;
+    private CallbackWork mCompletion = null;
+    private Context mContext;
+    private DeviceAdapter mDeviceAdapter;
     AlertDialog mDialog;
-    /* access modifiers changed from: private */
-    public CallbackWork mNext = null;
+    private CallbackWork mNext = null;
     TextView mPercentView;
     ProbePrinter mProbePrinter;
     ProgressBar mProgressPercent;
     private BLEUtility.BleWorkCallback mSequenceCallbackFailed = null;
     private BLEUtility.BleWorkCallback mSequenceCallbackSuccess = null;
     private Handler mTimeoutHandler;
-    /* access modifiers changed from: private */
-    public Handler mWifiSearchHandler;
-    /* access modifiers changed from: private */
-    public Runnable runnableSetUpProgress;
-    /* access modifiers changed from: private */
-    public Runnable runnableWifiSearch;
-    /* access modifiers changed from: private */
-    public Handler setUpProgressHandler;
+    private Handler mWifiSearchHandler;
+    private Runnable runnableSetUpProgress;
+    private Runnable runnableWifiSearch;
+    private Handler setUpProgressHandler;
 
     public interface CallbackWork {
         void call(Object obj);
@@ -258,8 +248,7 @@ public class BleWorkActivity extends ActivityIACommon {
         };
     }
 
-    /* access modifiers changed from: private */
-    public void stopCallbacks() {
+    private void stopCallbacks() {
         stopConnectTimeOut();
         stopWifiSearch();
         this.isStopSetUpProgress = true;
@@ -275,8 +264,7 @@ public class BleWorkActivity extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void stopWifiSearch() {
+    private void stopWifiSearch() {
         Handler handler = this.mWifiSearchHandler;
         if (handler != null) {
             handler.removeCallbacks(this.runnableWifiSearch);
@@ -285,8 +273,7 @@ public class BleWorkActivity extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void settingResultDailog(final boolean z) {
+    private void settingResultDailog(final boolean z) {
         runOnUiThread(new Runnable() {
             public void run() {
                 AlertDialog.Builder cancelable = new AlertDialog.Builder(BleWorkActivity.this.mContext).setCancelable(false);
@@ -336,8 +323,7 @@ public class BleWorkActivity extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void waitingCommunicationDaialog() {
+    private void waitingCommunicationDaialog() {
         if (this.mAlertDialog != null) {
             EpLog.m77i("dismiss ");
             this.mAlertDialog.dismiss();
@@ -400,8 +386,7 @@ public class BleWorkActivity extends ActivityIACommon {
         this.setUpProgressHandler.post(this.runnableSetUpProgress);
     }
 
-    /* access modifiers changed from: private */
-    public void updateProgress(int i) {
+    private void updateProgress(int i) {
         this.mProgressPercent.setProgress(i);
         TextView textView = this.mPercentView;
         textView.setText(i + " %");
@@ -439,8 +424,7 @@ public class BleWorkActivity extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void selectDevice(@NonNull ScannedDevice scannedDevice) {
+    private void selectDevice(@NonNull ScannedDevice scannedDevice) {
         String displayName = scannedDevice.getDisplayName();
         BleScanWork.getInstace().stopScan();
         this.mBleWork.resetSequence();
@@ -450,8 +434,7 @@ public class BleWorkActivity extends ActivityIACommon {
         this.mBleWork.init(this, scannedDevice);
     }
 
-    /* access modifiers changed from: private */
-    public void getInfoForConnectDialog(String str) {
+    private void getInfoForConnectDialog(String str) {
         this.mAlertDialog = new AlertDialog.Builder(this).setCancelable(false).create();
         this.mAlertDialog.setView(LayoutInflater.from(this.mContext).inflate(R.layout.ble_progress_layout, (ViewGroup) null));
         String property = System.getProperty("line.separator");
@@ -463,8 +446,7 @@ public class BleWorkActivity extends ActivityIACommon {
         setConnectTimeOut();
     }
 
-    /* access modifiers changed from: private */
-    public void setConnectTimeOut() {
+    private void setConnectTimeOut() {
         this.mTimeoutHandler = new Handler();
         this.mTimeoutHandler.postDelayed(new Runnable() {
             public void run() {
@@ -477,8 +459,7 @@ public class BleWorkActivity extends ActivityIACommon {
         }, DateUtils.MILLIS_PER_MINUTE);
     }
 
-    /* access modifiers changed from: private */
-    public void stopConnectTimeOut() {
+    private void stopConnectTimeOut() {
         Handler handler = this.mTimeoutHandler;
         if (handler != null) {
             handler.removeCallbacksAndMessages((Object) null);
@@ -486,8 +467,7 @@ public class BleWorkActivity extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void failedDialog(final BleWork.jobSequence jobsequence) {
+    private void failedDialog(final BleWork.jobSequence jobsequence) {
         runOnUiThread(new Runnable() {
             public void run() {
                 BleWorkActivity.this.stopCallbacks();
@@ -514,8 +494,7 @@ public class BleWorkActivity extends ActivityIACommon {
         });
     }
 
-    /* access modifiers changed from: private */
-    public void SSIDfailedDialog(BleWork.jobSequence jobsequence) {
+    private void SSIDfailedDialog(BleWork.jobSequence jobsequence) {
         runOnUiThread(new Runnable(jobsequence) {
             private final /* synthetic */ BleWork.jobSequence f$1;
 
@@ -569,8 +548,7 @@ public class BleWorkActivity extends ActivityIACommon {
         bleWorkActivity.finish();
     }
 
-    /* access modifiers changed from: private */
-    public void showSSIDList() {
+    private void showSSIDList() {
         runOnUiThread(new Runnable() {
             public void run() {
                 BleWorkActivity.this.mBleWork.mSequence = BleWork.jobSequence.MIB_SET_SSID;
@@ -624,8 +602,7 @@ public class BleWorkActivity extends ActivityIACommon {
         });
     }
 
-    /* access modifiers changed from: private */
-    public void sortSSIDlist(List<String> list) {
+    private void sortSSIDlist(List<String> list) {
         Collections.sort(list);
         String replaceAll = BleWork.getSSID(this).toUpperCase().replaceAll(CommonDefine.UNDER_BAR, "-");
         int i = 0;
@@ -646,8 +623,7 @@ public class BleWorkActivity extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void setSSID() {
+    private void setSSID() {
         runOnUiThread(new Runnable() {
             public void run() {
                 EpLog.m77i("inputs = ");
@@ -701,8 +677,7 @@ public class BleWorkActivity extends ActivityIACommon {
         });
     }
 
-    /* access modifiers changed from: private */
-    public void setSSIDPassword() {
+    private void setSSIDPassword() {
         EpLog.m76i();
         if (!this.mBleWork.getSSIDPassword().isEmpty() || this.mBleWork.getSecurityType() == 1 || (this.mBleWork.getSecurityType() == 255 && this.mBleWork.mSequence != BleWork.jobSequence.SET_PASSWORD)) {
             runOnUiThread(new Runnable() {

app/src/main/java/epson/common/ble/ProbePrinter.java

@@ -29,20 +29,16 @@ import java.io.IOException;
 public class ProbePrinter {
     static final int PROBE_TIMEOUT_SEC = 180;
     private static final Object lock = new Object();
-    /* access modifiers changed from: private */
-    public static escanLib mScanner = new escanLib();
+    private static escanLib mScanner = new escanLib();
     private final int BIND_SERVICE = 17;
     private final int CANCEL_FIND_PRINTER = 2;
     private final int DELAY = 100;
     private final int SEARCH_PRINTER = 1;
     private final int SELECT_PRINTER = 4;
     private BleWorkActivity.CallbackWork completion;
-    /* access modifiers changed from: private */
-    public Context context;
-    /* access modifiers changed from: private */
-    public volatile boolean isPrinterFound;
-    /* access modifiers changed from: private */
-    public IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
+    private Context context;
+    private volatile boolean isPrinterFound;
+    private IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
         public void onGetStatusState() throws RemoteException {
             EpLog.m76i();
         }
@@ -106,10 +102,8 @@ public class ProbePrinter {
             IEpsonService unused = ProbePrinter.this.mEpsonService = null;
         }
     };
-    /* access modifiers changed from: private */
-    public IEpsonService mEpsonService;
-    /* access modifiers changed from: private */
-    public Handler mHandler = new Handler(new Handler.Callback() {
+    private IEpsonService mEpsonService;
+    private Handler mHandler = new Handler(new Handler.Callback() {
         public boolean handleMessage(Message message) {
             int i = message.what;
             if (i == 4) {
@@ -138,8 +132,7 @@ public class ProbePrinter {
             return false;
         }
     });
-    /* access modifiers changed from: private */
-    public String macAddress;
+    private String macAddress;
 
     private ProbePrinter() {
     }
@@ -239,8 +232,7 @@ public class ProbePrinter {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void selectPrinter(MyPrinter myPrinter) {
+    private void selectPrinter(MyPrinter myPrinter) {
         myPrinter.setCurPrinter(this.context.getApplicationContext());
         Utils.savePref(this.context.getApplicationContext(), "PrintSetting", CommonDefine.RE_SEARCH, true);
         WiFiDirectManager.resetConnectInfo(this.context.getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_PRINTER);

app/src/main/java/epson/common/ble/util/BLEUtility.java

@@ -3,7 +3,7 @@ package com.epson.mobilephone.common.ble.util;
 import android.bluetooth.BluetoothManager;
 import android.content.Context;
 
-import android.support.annotation.Nullable;
+
 import com.epson.mobilephone.common.EpLog;
 
 public class BLEUtility {

app/src/main/java/epson/common/guide/NoticeGuideActivity.java

@@ -197,8 +197,7 @@ public class NoticeGuideActivity extends AppCompatActivity implements GuideWebvi
         private MyPageAdapter() {
         }
 
-        /* access modifiers changed from: private */
-        public void setPageSize(@NonNull ViewGroup viewGroup, int i) {
+        private void setPageSize(@NonNull ViewGroup viewGroup, int i) {
             this.mPagePosition = new ImageView[i];
             int i2 = 0;
             while (i2 < i) {

app/src/main/java/epson/common/license/InfoDisplayActivity.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
-import android.support.annotation.Nullable;
+
 import android.support.annotation.VisibleForTesting;
 import android.support.p003v7.app.ActionBar;
 
@@ -77,8 +77,7 @@ public class InfoDisplayActivity extends AppCompatActivity {
         return (TitleAndDocument) intent.getSerializableExtra(PARAM_KEY_TITLE_AND_DOCUMENT);
     }
 
-    /* access modifiers changed from: private */
-    public static int getTitleStringId(int i) {
+    private static int getTitleStringId(int i) {
         switch (i) {
             case 2:
                 return C1066R.string.Privacy_Statement_Title;

app/src/main/java/epson/common/license/LicenseTopActivity.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
-import android.support.annotation.Nullable;
+
 
 import android.view.View;
 import android.view.ViewGroup;
@@ -99,8 +99,7 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
         SimpleMessageDialogFragment.newInstance(getString(C1066R.string.Update_Message) + Constants.BREAK_LINE + str, 1).show(getSupportFragmentManager(), DIALOG_ID);
     }
 
-    /* access modifiers changed from: private */
-    public void onAgree() {
+    private void onAgree() {
         LicenseInfo licenseInfo = this.mLicenseInfo;
         if (licenseInfo == null) {
             finish();
@@ -126,13 +125,11 @@ public class LicenseTopActivity extends AppCompatActivity implements SimpleMessa
         }
     }
 
-    /* access modifiers changed from: private */
-    public void onDisagree() {
+    private void onDisagree() {
         SimpleMessageDialogFragment.newInstance(getString(C1066R.string.Disagree_License_Button_Message), 2).show(getSupportFragmentManager(), DIALOG_ID);
     }
 
-    /* access modifiers changed from: private */
-    public void startDocumentDisplayActivity(int i) {
+    private void startDocumentDisplayActivity(int i) {
         LicenseInfo licenseInfo = this.mLicenseInfo;
         if (licenseInfo != null) {
             startActivity(InfoDisplayActivity.getStartIntent(this, licenseInfo, i));

app/src/main/java/epson/common/license/SimpleMessageDialogFragment.java

@@ -48,8 +48,7 @@ public class SimpleMessageDialogFragment extends DialogFragment {
         return create;
     }
 
-    /* access modifiers changed from: private */
-    public void onOkClicked() {
+    private void onOkClicked() {
         this.mDialogCallback.onButtonClicked(this.mDialogId);
     }
 

app/src/main/java/epson/common/license/UserSurveyInfo.java

@@ -2,7 +2,7 @@ package com.epson.mobilephone.common.license;
 
 import android.content.Context;
 
-import android.support.annotation.Nullable;
+
 import java.io.Serializable;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

app/src/main/java/epson/common/license/UserSurveyInvitationActivity.java

@@ -75,8 +75,7 @@ public class UserSurveyInvitationActivity extends AppCompatActivity implements S
         }
     }
 
-    /* access modifiers changed from: private */
-    public void startPrivacyStatementDisplayActivity() {
+    private void startPrivacyStatementDisplayActivity() {
         LicenseInfo licenseInfo = this.mLicenseInfo;
         if (licenseInfo != null) {
             startActivity(InfoDisplayActivity.getStartIntent(this, licenseInfo, 2));
@@ -101,8 +100,7 @@ public class UserSurveyInvitationActivity extends AppCompatActivity implements S
         }
     }
 
-    /* access modifiers changed from: private */
-    public void finishWithStatus(boolean z) {
+    private void finishWithStatus(boolean z) {
         UserSurveyInfo userSurveyInfo = this.mUserSurveyInfo;
         if (userSurveyInfo != null) {
             userSurveyInfo.setUserSurveyAgreement(this, z);

app/src/main/java/epson/common/wifidirect/ActivityConnectP2P.java

@@ -17,7 +17,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentActivity;
 import android.widget.Toast;
@@ -144,14 +144,11 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
             }
         }
     };
-    /* access modifiers changed from: private */
-    public DialogProgressWiFiDirectViewModel mModelDialog;
+    private DialogProgressWiFiDirectViewModel mModelDialog;
     WifiP2pManager mWiFiP2PManager = null;
     WifiP2pManager.Channel p2pChannnel = null;
-    /* access modifiers changed from: private */
-    public WifiP2pConfig p2pConnectConfig = null;
-    /* access modifiers changed from: private */
-    public int p2pRetryCount = 0;
+    private WifiP2pConfig p2pConnectConfig = null;
+    private int p2pRetryCount = 0;
     WiFiDirectBroadcastReceiver p2pStateChangeReciever = null;
 
     public void onCancelDialog(String str) {
@@ -339,8 +336,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
         throw new UnsupportedOperationException("Method not decompiled: com.epson.mobilephone.common.wifidirect.ActivityConnectP2P.showDialog(java.lang.String):void");
     }
 
-    /* access modifiers changed from: private */
-    public void dismissDialog(String str) {
+    private void dismissDialog(String str) {
         DialogFragment dialogFragment = (DialogFragment) getSupportFragmentManager().findFragmentByTag(str);
         if (dialogFragment != null) {
             dialogFragment.dismiss();

app/src/main/java/epson/common/wifidirect/ActivityConnectSimpleAP.java

@@ -13,7 +13,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentActivity;
 import android.widget.Toast;
@@ -34,8 +34,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
     private static final int ID_RESULT = 0;
     private static final int MAX_RETRY_CONNECTING = 5;
     private static final String TAG = "ActivityConnectSimpleAP";
-    /* access modifiers changed from: private */
-    public int connectingNetworkId = -1;
+    private int connectingNetworkId = -1;
     boolean createSimpleAP = false;
     Handler mHandler = new Handler() {
         public void handleMessage(Message message) {
@@ -124,11 +123,9 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
             }
         }
     };
-    /* access modifiers changed from: private */
-    public DialogProgressWiFiDirectViewModel mModelDialog;
+    private DialogProgressWiFiDirectViewModel mModelDialog;
     NetworkStateChangeReciever networkStateChangeReciever = null;
-    /* access modifiers changed from: private */
-    public int retryConnecting = 0;
+    private int retryConnecting = 0;
     String targetPass = "";
 
     public void onCancelDialog(String str) {
@@ -361,8 +358,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         throw new UnsupportedOperationException("Method not decompiled: com.epson.mobilephone.common.wifidirect.ActivityConnectSimpleAP.showDialog(java.lang.String):void");
     }
 
-    /* access modifiers changed from: private */
-    public void dismissDialog(String str) {
+    private void dismissDialog(String str) {
         DialogFragment dialogFragment = (DialogFragment) getSupportFragmentManager().findFragmentByTag(str);
         if (dialogFragment != null) {
             dialogFragment.dismiss();

app/src/main/java/epson/common/wifidirect/ActivityRequestLocationPermission.java

@@ -17,7 +17,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.provider.Settings;
 
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.Fragment;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -47,8 +47,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
     private static final String REJECTED_REQUEST = "REJECTED_REQUEST";
     private static final String TAG = "ActivityRequestLocationPermission";
     private Handler mHandler = new innerHandler(this);
-    /* access modifiers changed from: private */
-    public String requestPermission;
+    private String requestPermission;
 
     public void onConnected(@Nullable Bundle bundle) {
     }
@@ -124,8 +123,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
         return false;
     }
 
-    /* access modifiers changed from: private */
-    public void setRejectRequestPermission() {
+    private void setRejectRequestPermission() {
         ComponentName callingActivity = getCallingActivity();
         if (callingActivity != null) {
             SharedPreferences.Editor edit = getPreferences(0).edit();
@@ -222,8 +220,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
         finish();
     }
 
-    /* access modifiers changed from: private */
-    public void checkLocationPreference() {
+    private void checkLocationPreference() {
         if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(this) == 0) {
             GoogleApiClient build = new GoogleApiClient.Builder(this).addApi(LocationServices.API).addConnectionCallbacks(this).addOnConnectionFailedListener(this).build();
             try {
@@ -378,8 +375,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
         return Build.VERSION.SDK_INT > 28 ? "android.permission.ACCESS_FINE_LOCATION" : "android.permission.ACCESS_COARSE_LOCATION";
     }
 
-    /* access modifiers changed from: private */
-    public static boolean isNeedChangeLocationSettings(Context context) {
+    private static boolean isNeedChangeLocationSettings(Context context) {
         if (Build.VERSION.SDK_INT >= 23 && Build.VERSION.SDK_INT >= 19) {
             try {
                 int i = Settings.Secure.getInt(context.getContentResolver(), "location_mode");

app/src/main/java/epson/common/wifidirect/ActivityWiFiDirectManual.java

@@ -9,7 +9,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentActivity;
 import android.view.View;
@@ -60,8 +60,7 @@ public class ActivityWiFiDirectManual extends ActivityWiFiDirectBase {
             }
         }
     };
-    /* access modifiers changed from: private */
-    public DialogProgressViewModel mModelDialog;
+    private DialogProgressViewModel mModelDialog;
     WebView mNoLcdGuidanceWebView;
     WifiManager mWifiManager = null;
     ViewGroup mWithLcdGuidanceView;

app/src/main/java/epson/common/wifidirect/ActivityWiFiDirectStart.java

@@ -34,8 +34,7 @@ public class ActivityWiFiDirectStart extends ActivityWiFiDirectBase {
         });
     }
 
-    /* access modifiers changed from: private */
-    public void startWifiManualSetup(boolean z) {
+    private void startWifiManualSetup(boolean z) {
         startActivityForResult(ActivityWiFiDirectManual.getStartIntent(this, z), 10);
     }
 

app/src/main/java/epson/common/wifidirect/ActivityiPrintConnect.java

@@ -31,8 +31,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     private static final int TIMEOUT_CONNECTING_TESTAP = 60;
     private static final int WAIT_CONNECTREALAP = 120;
     private static final int WAIT_RETRY = 2;
-    /* access modifiers changed from: private */
-    public static byte[] engineId;
+    private static byte[] engineId;
     private final int CONNECT_REALAP = 2;
     private final int CONNECT_TESTAP = 1;
     Button btnFinish;
@@ -45,8 +44,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     ProgressBar progress;
     escprLib.ConnectStrings settingsRealAp = new escprLib.ConnectStrings();
     escprLib.ConnectStrings settingsTempAp = new escprLib.ConnectStrings();
-    /* access modifiers changed from: private */
-    public Status status = Status.IDLE;
+    private Status status = Status.IDLE;
     AsyncTask<Void, Void, Boolean> taskGetConnectStrings = null;
     TextView textView1;
     TextView textView2;

app/src/main/java/epson/common/wifidirect/DialogProgressWiFiDirect.java

@@ -4,7 +4,7 @@ import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 
-import android.support.annotation.Nullable;
+
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentManager;
 
@@ -25,10 +25,8 @@ public class DialogProgressWiFiDirect extends DialogFragment {
     private static final String TAG_POSITION = "position";
     private static final String TAG_POSITIVE_MESSAGE = "positive_dialog_message";
     private static final String TAG_TITLE_MESSAGE = "title_message";
-    /* access modifiers changed from: private */
-    public DialogButtonClick mActivity;
-    /* access modifiers changed from: private */
-    public String mTag;
+    private DialogButtonClick mActivity;
+    private String mTag;
 
     public interface DialogButtonClick {
         void onCancelDialog(String str);

app/src/main/java/epson/common/wifidirect/EventWrapperWiFiDirect.java

@@ -1,6 +1,6 @@
 package com.epson.mobilephone.common.wifidirect;
 
-import android.support.annotation.Nullable;
+
 
 public class EventWrapperWiFiDirect<T> {
     private boolean handled = false;

app/src/main/java/epson/common/wifidirect/ManageDefaultNetwork.java

@@ -26,11 +26,9 @@ public class ManageDefaultNetwork {
     private static ManageDefaultNetwork manageDefaultNetwork;
     volatile boolean canConnected = false;
     private String checkedSSID = null;
-    /* access modifiers changed from: private */
-    public ConnectivityManager connectivityManager = null;
+    private ConnectivityManager connectivityManager = null;
     private boolean isOnline = false;
-    /* access modifiers changed from: private */
-    public volatile Object lock = new Object();
+    private volatile Object lock = new Object();
     private Context mContext = null;
     private ManageDefaultNetworkCallback manageDefaultNetworkCallback = null;
     private WifiManager wifiManager = null;

app/src/main/java/epson/common/wifidirect/SearchWiFiDirectPrinterTask.java

@@ -192,8 +192,7 @@ public class SearchWiFiDirectPrinterTask {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void onScanResultAvailable() {
+    private void onScanResultAvailable() {
         boolean z;
         int existSimpleApDisabled;
         long elapsedRealtime = SystemClock.elapsedRealtime();

app/src/main/java/epson/common/wifidirect/WiFiScanner.java

@@ -9,10 +9,8 @@ public class WiFiScanner {
     private static final int INTERVAL_SCAN = 30;
     private static Handler wifiScannerHandler;
     private static Object wifiScannerToken;
-    /* access modifiers changed from: private */
-    public String TAG = "WiFiScanner";
-    /* access modifiers changed from: private */
-    public WeakReference<WifiManager> refWiFiManager = null;
+    private String TAG = "WiFiScanner";
+    private WeakReference<WifiManager> refWiFiManager = null;
 
     private boolean startScan(WifiManager wifiManager) {
         if (Build.VERSION.SDK_INT >= 28) {

app/src/main/java/epson/common/wifidirect/WifiP2pUtils.java

@@ -14,8 +14,7 @@ public class WifiP2pUtils {
     private static final String TAG = "WifiP2pUtils";
     private static final int TIMEOUT_CONNECTIONINFO = 5000;
     private static WifiP2pUtils instance;
-    /* access modifiers changed from: private */
-    public volatile WifiP2pGroup groupInfo = null;
+    private volatile WifiP2pGroup groupInfo = null;
     private HandlerThread handlerThread = null;
     private volatile Object lock = new Object();
     private Context mAppContext = null;

app/src/main/java/epson/epsonconnectregistration/ECConfigurationTask.java

@@ -19,8 +19,7 @@ public class ECConfigurationTask extends ECBaseTask {
     private static final int CHECK_INTERVAL = 5000;
     private static final int MAX_RETRY = 6;
     private static final String TAG = "ECConfigurationTask";
-    /* access modifiers changed from: private */
-    public Uri registrationUri;
+    private Uri registrationUri;
 
     protected void onPreExecute() {
         super.onPreExecute();

app/src/main/java/epson/maintain/BatteryInfoAdapter.java

@@ -10,7 +10,7 @@ import android.widget.ImageView;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
-import epson.print.C2135R;
+import epson.print.R;
 import java.util.ArrayList;
 
 public class BatteryInfoAdapter extends ArrayAdapter<BatteryInfoList> {
@@ -34,9 +34,9 @@ public class BatteryInfoAdapter extends ArrayAdapter<BatteryInfoList> {
             view = this.mInflater.inflate(this.mResourceId, (ViewGroup) null);
         }
         BatteryInfoList batteryInfoList = this.mItems.get(i);
-        ((TextView) view.findViewById(C2135R.C2137id.bt_name)).setText(batteryInfoList.getBatteryName());
-        ((TextView) view.findViewById(C2135R.C2137id.bt_percentage)).setText(batteryInfoList.getBatteryStatusPercentage());
-        ((ImageView) view.findViewById(C2135R.C2137id.bt_status_icon)).setImageResource(batteryInfoList.getBatteryStatusIcon());
+        ((TextView) view.findViewById(R.id.bt_name)).setText(batteryInfoList.getBatteryName());
+        ((TextView) view.findViewById(R.id.bt_percentage)).setText(batteryInfoList.getBatteryStatusPercentage());
+        ((ImageView) view.findViewById(R.id.bt_status_icon)).setImageResource(batteryInfoList.getBatteryStatusIcon());
         return view;
     }
 
@@ -93,21 +93,21 @@ public class BatteryInfoAdapter extends ArrayAdapter<BatteryInfoList> {
                 setBatteryIcon(activity, batteryInfoList, i2, iArr[i3], iArr2[i3]);
                 arrayList.add(batteryInfoList);
             }
-            showListView(activity, new BatteryInfoAdapter(activity, C2135R.layout.maintain_battery_info, arrayList));
+            showListView(activity, new BatteryInfoAdapter(activity, R.layout.maintain_battery_info, arrayList));
         }
 
         public static void clearBatteryList(Activity activity) {
-            activity.findViewById(C2135R.C2137id.bt_PowerText).setVisibility(8);
+            activity.findViewById(R.id.bt_PowerText).setVisibility(8);
             showListView(activity, (BatteryInfoAdapter) null);
         }
 
         static void setBatteryName(Context context, BatteryInfoList batteryInfoList, int i, int i2) {
             int i3 = i2 + 1;
             if (i == 1) {
-                batteryInfoList.setBatteryStatusName(context.getString(C2135R.string.bi_remain));
+                batteryInfoList.setBatteryStatusName(context.getString(R.string.bi_remain));
                 return;
             }
-            batteryInfoList.setBatteryStatusName(context.getString(C2135R.string.bi_remain) + " " + i3);
+            batteryInfoList.setBatteryStatusName(context.getString(R.string.bi_remain) + " " + i3);
         }
 
         static void setBatteryPercentage(Context context, BatteryInfoList batteryInfoList, int i, int i2, int i3) {
@@ -115,7 +115,7 @@ public class BatteryInfoAdapter extends ArrayAdapter<BatteryInfoList> {
                 return;
             }
             if (i3 < 0 || i3 > 100) {
-                batteryInfoList.setBatteryStatusPercentage(context.getString(C2135R.string.bi_no_percentage));
+                batteryInfoList.setBatteryStatusPercentage(context.getString(R.string.bi_no_percentage));
                 return;
             }
             batteryInfoList.setBatteryStatusPercentage(i3 + " %");
@@ -123,18 +123,18 @@ public class BatteryInfoAdapter extends ArrayAdapter<BatteryInfoList> {
 
         static void setBatteryIcon(Activity activity, BatteryInfoList batteryInfoList, int i, int i2, int i3) {
             if (batteryIsUnknown(i, i2)) {
-                batteryInfoList.setBatteryStatusIcon(C2135R.C2136drawable.bi_not_inserted);
+                batteryInfoList.setBatteryStatusIcon(R.C2136drawable.bi_not_inserted);
                 return;
             }
             batteryInfoList.setBatteryStatusIcon(activity.getResources().getIdentifier(String.format("bi_%s_%d", new Object[]{i2 == 1 ? "charge" : "running", Integer.valueOf((76 > i3 || i3 > 100) ? (51 > i3 || i3 >= 76) ? (26 > i3 || i3 >= 51) ? (i3 <= 0 || i3 >= 26) ? 0 : 39 : 59 : 89 : 100)}), "drawable", activity.getPackageName()));
         }
 
         public static void showPowerText(Activity activity) {
-            activity.findViewById(C2135R.C2137id.bt_PowerText).setVisibility(0);
+            activity.findViewById(R.id.bt_PowerText).setVisibility(0);
         }
 
         static void showListView(Activity activity, BatteryInfoAdapter batteryInfoAdapter) {
-            ListView listView = (ListView) activity.findViewById(C2135R.C2137id.battery_list);
+            ListView listView = (ListView) activity.findViewById(R.id.battery_list);
             listView.setAdapter(batteryInfoAdapter);
             setListViewHeight(listView);
         }

app/src/main/java/epson/maintain/EfuReader.java

@@ -1,7 +1,7 @@
 package epson.maintain;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 import android.support.annotation.VisibleForTesting;
 import android.support.media.ExifInterface;
 import java.io.BufferedOutputStream;

app/src/main/java/epson/maintain/FirmInfFile.java

@@ -1,6 +1,6 @@
 package epson.maintain;
 
-import android.support.annotation.Nullable;
+
 import android.support.annotation.VisibleForTesting;
 import java.util.HashMap;
 

app/src/main/java/epson/maintain/FirmwareManager.java

@@ -2,8 +2,8 @@ package epson.maintain;
 
 import android.content.Context;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 import com.epson.iprint.prtlogger.Analytics;
@@ -28,32 +28,26 @@ public class FirmwareManager {
     static final boolean DEV_FWUPDATE = false;
     static final String EVAL_UPDATEINF_URL_PREFIX = "https://epsonpfu-stg.ebz.epson.net";
     static String FW_POST_FILE_NAME = "/FWUPDATE_POST_DATA.dat";
-    /* access modifiers changed from: private */
-    public static String FW_POST_FILE_PATH = null;
+    private static String FW_POST_FILE_PATH = null;
     private static final String TAG = "FirmwareManager";
     static final String UPDATEINF_URL_PREFIX = "https://epsonpfu.ebz.epson.net";
-    /* access modifiers changed from: private */
-    public final String boundary;
+    private final String boundary;
     private final String lineEnd;
     int mCurRomNum;
     String mCurVer;
     byte[] mDlData;
     AsyncTask<FWUpdateStep, Integer, FWUpdateProcResult> mFWUpdateTask;
-    /* access modifiers changed from: private */
-    public FirmInfFile mFirmInfFile;
+    private FirmInfFile mFirmInfFile;
     String mMarketID;
     String mNewVer;
-    /* access modifiers changed from: private */
-    public final MyPrinter mPrinter;
+    private final MyPrinter mPrinter;
     private String mPrinterMainVersion;
     FWUpdateProcResult mProcResult;
     FWUpdateStep mProcStep;
     String mSendProtocol;
     long mTotalSize;
-    /* access modifiers changed from: private */
-    public volatile String mUpdateInfUrl;
-    /* access modifiers changed from: private */
-    public volatile FWUpdateListener mUpdateListener;
+    private volatile String mUpdateInfUrl;
+    private volatile FWUpdateListener mUpdateListener;
     private final MaintainPrinterWrapper maintainPrinter;
     private final String twoHyphens;
 
@@ -159,8 +153,7 @@ public class FirmwareManager {
         return IPAddressUtils.buildURL(this.mSendProtocol, this.mPrinter.getIp(), "/DOWN/FIRMWAREUPDATE/ROM1");
     }
 
-    /* access modifiers changed from: private */
-    public String getNextRomURL() {
+    private String getNextRomURL() {
         this.mCurRomNum++;
         return this.mFirmInfFile.getRomUrl(this.mCurRomNum);
     }
@@ -394,14 +387,12 @@ public class FirmwareManager {
         LocalAsyncTask() {
         }
 
-        /* access modifiers changed from: protected */
-        public void onPreExecute() {
+        protected void onPreExecute() {
             FirmwareManager.this.mDlData = null;
             publishProgress(new Integer[0]);
         }
 
-        /* access modifiers changed from: protected */
-        public FWUpdateProcResult doInBackground(FWUpdateStep... fWUpdateStepArr) {
+        protected FWUpdateProcResult doInBackground(FWUpdateStep... fWUpdateStepArr) {
             FirmwareManager.this.mProcResult = FWUpdateProcResult.None;
             int[] iArr = C20021.$SwitchMap$epson$maintain$FirmwareManager$FWUpdateStep;
             FirmwareManager firmwareManager = FirmwareManager.this;
@@ -442,8 +433,7 @@ public class FirmwareManager {
             return FWUpdateProcResult.Fail;
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(FWUpdateProcResult fWUpdateProcResult) {
+        protected void onPostExecute(FWUpdateProcResult fWUpdateProcResult) {
             if (fWUpdateProcResult == FWUpdateProcResult.Success) {
                 switch (FirmwareManager.this.mProcStep) {
                     case GetPrinterFWVersion:
@@ -471,8 +461,7 @@ public class FirmwareManager {
             }
         }
 
-        /* access modifiers changed from: protected */
-        public void onProgressUpdate(Integer... numArr) {
+        protected void onProgressUpdate(Integer... numArr) {
             int i = 0;
             if (numArr.length == 1 && C20021.$SwitchMap$epson$maintain$FirmwareManager$FWUpdateStep[FirmwareManager.this.mProcStep.ordinal()] != 4) {
                 i = numArr[0].intValue();
@@ -480,8 +469,7 @@ public class FirmwareManager {
             FirmwareManager.this.mUpdateListener.fwManagerProcDoing(i);
         }
 
-        /* access modifiers changed from: protected */
-        public void onCancelled() {
+        protected void onCancelled() {
             Log.d(toString(), "onCancelled");
         }
 

app/src/main/java/epson/maintain/activity/CheckEulaActivity.java

@@ -7,7 +7,7 @@ import android.widget.Button;
 import android.widget.TextView;
 import com.epson.mobilephone.common.license.RestoreScrollView;
 import epson.common.IprintLicenseInfo;
-import epson.print.C2135R;
+import epson.print.R;
 
 public class CheckEulaActivity extends AppCompatActivity {
     private static final String KEY_SCROLL_Y = "scroll_y";
@@ -16,35 +16,32 @@ public class CheckEulaActivity extends AppCompatActivity {
     public void onBackPressed() {
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        setContentView((int) C2135R.layout.activity_check_eula);
-        ((Button) findViewById(C2135R.C2137id.eulaAgreeButton)).setOnClickListener(new View.OnClickListener() {
+        setContentView((int) R.layout.activity_check_eula);
+        ((Button) findViewById(R.id.eulaAgreeButton)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 CheckEulaActivity.this.finishWithResult(-1);
             }
         });
-        ((Button) findViewById(C2135R.C2137id.eulaDisagreeButton)).setOnClickListener(new View.OnClickListener() {
+        ((Button) findViewById(R.id.eulaDisagreeButton)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 CheckEulaActivity.this.finishWithResult(0);
             }
         });
-        this.mScrollView = (RestoreScrollView) findViewById(C2135R.C2137id.eulaCheckMainScrollView);
-        ((TextView) findViewById(C2135R.C2137id.eulaTextView)).setText(new IprintLicenseInfo().getDocumentString(this, 1));
+        this.mScrollView = (RestoreScrollView) findViewById(R.id.eulaCheckMainScrollView);
+        ((TextView) findViewById(R.id.eulaTextView)).setText(new IprintLicenseInfo().getDocumentString(this, 1));
         if (bundle != null) {
             this.mScrollView.setScrollY(bundle.getInt(KEY_SCROLL_Y, 0));
         }
     }
 
-    /* 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());
     }
 
-    /* access modifiers changed from: private */
-    public void finishWithResult(int i) {
+    private void finishWithResult(int i) {
         setResult(i);
         finish();
     }

app/src/main/java/epson/maintain/activity/EccPrintLog.java

@@ -11,7 +11,7 @@ import android.webkit.WebViewClient;
 import epson.common.DialogProgress;
 import epson.common.DialogProgressViewModel;
 import epson.print.ActivityIACommon;
-import epson.print.C2135R;
+import epson.print.R;
 import epson.print.Util.EPLog;
 import epson.print.ecclient.EccErrorInfo;
 import java.lang.ref.WeakReference;
@@ -37,11 +37,10 @@ public class EccPrintLog extends ActivityIACommon implements DialogProgress.Dial
     public void onNeutralClick(String str) {
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         EPLog.m313i(LOG_TAG, "onCreate() start");
         super.onCreate(bundle);
-        setContentView((int) C2135R.layout.epsonconnect_print_log);
+        setContentView((int) R.layout.epsonconnect_print_log);
         this.mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
         this.mModelDialog.getDialogJob().observe(this, new Observer() {
             public final void onChanged(Object obj) {
@@ -49,8 +48,8 @@ public class EccPrintLog extends ActivityIACommon implements DialogProgress.Dial
             }
         });
         this.mEccPrintLogViewModel = (EccPrintLogViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(EccPrintLogViewModel.class);
-        setActionBar((int) C2135R.string.epsonconnect_str_print_history, true);
-        this.mWebView = (WebView) findViewById(C2135R.C2137id.prtlog_webview);
+        setActionBar((int) R.string.epsonconnect_str_print_history, true);
+        this.mWebView = (WebView) findViewById(R.id.prtlog_webview);
         this.mWebView.setVerticalScrollbarOverlay(true);
         this.mWebView.getSettings().setJavaScriptEnabled(true);
         this.mWebView.setWebViewClient(new WebViewClient() {
@@ -107,54 +106,52 @@ public class EccPrintLog extends ActivityIACommon implements DialogProgress.Dial
         String str;
         String str2;
         String[] strArr = new String[2];
-        getString(C2135R.string.ECC_ERR_SVR_GENERAL_TITLE);
+        getString(R.string.ECC_ERR_SVR_GENERAL_TITLE);
         if (i != -1100) {
             if (i != 10) {
                 switch (i) {
                     case EccErrorInfo.ECC_ERR_SVR_HTTP_NOT_FOUND /*-1209*/:
                     case EccErrorInfo.ECC_ERR_SVR_BUSY /*-1208*/:
-                        str = getString(C2135R.string.ECC_ERR_SVR_BUSY_TITLE);
-                        str2 = getString(C2135R.string.ECC_ERR_SVR_BUSY);
+                        str = getString(R.string.ECC_ERR_SVR_BUSY_TITLE);
+                        str2 = getString(R.string.ECC_ERR_SVR_BUSY);
                         break;
                     default:
                         switch (i) {
                             case -1203:
-                                str = getString(C2135R.string.ECC_ERR_SVR_INVALID_ACCESSKEY_TITLE);
-                                str2 = getString(C2135R.string.ECC_ERR_SVR_INVALID_ACCESSKEY);
+                                str = getString(R.string.ECC_ERR_SVR_INVALID_ACCESSKEY_TITLE);
+                                str2 = getString(R.string.ECC_ERR_SVR_INVALID_ACCESSKEY);
                                 break;
                             case -1202:
-                                str = getString(C2135R.string.ECC_ERR_SVR_REMOTE_INVALID_TITLE);
-                                str2 = getString(C2135R.string.ECC_ERR_SVR_REMOTE_INVALID);
+                                str = getString(R.string.ECC_ERR_SVR_REMOTE_INVALID_TITLE);
+                                str2 = getString(R.string.ECC_ERR_SVR_REMOTE_INVALID);
                                 break;
                             case -1201:
-                                str = getString(C2135R.string.ECC_ERR_SVR_NOT_REGISTERED_TITLE);
-                                str2 = getString(C2135R.string.ECC_ERR_SVR_NOT_REGISTERED);
+                                str = getString(R.string.ECC_ERR_SVR_NOT_REGISTERED_TITLE);
+                                str2 = getString(R.string.ECC_ERR_SVR_NOT_REGISTERED);
                                 break;
                         }
                 }
             } else {
-                getString(C2135R.string.ECC_ERR_SVR_GENERAL_TITLE);
+                getString(R.string.ECC_ERR_SVR_GENERAL_TITLE);
             }
-            String string = getString(C2135R.string.ECC_ERR_SVR_GENERAL_TITLE);
-            str2 = getString(C2135R.string.ECC_ERR_SVR_GENERAL2) + "0X" + Integer.toHexString(i).toUpperCase(Locale.US) + getString(C2135R.string.ECC_ERR_SVR_GENERAL3);
+            String string = getString(R.string.ECC_ERR_SVR_GENERAL_TITLE);
+            str2 = getString(R.string.ECC_ERR_SVR_GENERAL2) + "0X" + Integer.toHexString(i).toUpperCase(Locale.US) + getString(R.string.ECC_ERR_SVR_GENERAL3);
             str = string;
         } else {
-            str = getString(C2135R.string.EC_ERR_COMM_ERROR_TITLE);
-            str2 = getString(C2135R.string.EC_ERR_COMM_ERROR);
+            str = getString(R.string.EC_ERR_COMM_ERROR_TITLE);
+            str2 = getString(R.string.EC_ERR_COMM_ERROR);
         }
         strArr[0] = str;
         strArr[1] = str2;
         return strArr;
     }
 
-    /* access modifiers changed from: private */
-    public void show_message_and_finish(int i) {
+    private void show_message_and_finish(int i) {
         this.mEccPrintLogViewModel.setTitleAndMessage(getErrorTitleAndMessage(i));
         this.mModelDialog.doShow(DIALOG_ERROR);
     }
 
-    /* access modifiers changed from: protected */
-    public void onDestroy() {
+    protected void onDestroy() {
         dissmissProgressDialog();
         super.onDestroy();
     }
@@ -279,8 +276,7 @@ public class EccPrintLog extends ActivityIACommon implements DialogProgress.Dial
             this.mEccPrintLog = new WeakReference<>(eccPrintLog);
         }
 
-        /* access modifiers changed from: protected */
-        public Void doInBackground(LogUrl... logUrlArr) {
+        protected Void doInBackground(LogUrl... logUrlArr) {
             try {
                 this.mLogUrl = logUrlArr[0].getUrl();
                 this.mErrorCode = 0;
@@ -291,8 +287,7 @@ public class EccPrintLog extends ActivityIACommon implements DialogProgress.Dial
             }
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(Void voidR) {
+        protected void onPostExecute(Void voidR) {
             EccPrintLog eccPrintLog;
             EPLog.m313i(EccPrintLog.LOG_TAG, "onPostExecute() begin");
             WeakReference<EccPrintLog> weakReference = this.mEccPrintLog;

app/src/main/java/epson/maintain/activity/EccPrintLogViewModel.java

@@ -5,13 +5,11 @@ import android.arch.lifecycle.ViewModel;
 public class EccPrintLogViewModel extends ViewModel {
     private String[] mTitleAndMessage;
 
-    /* access modifiers changed from: protected */
-    public void setTitleAndMessage(String[] strArr) {
+    protected void setTitleAndMessage(String[] strArr) {
         this.mTitleAndMessage = strArr;
     }
 
-    /* access modifiers changed from: protected */
-    public String[] getTitleAndMessage() {
+    protected String[] getTitleAndMessage() {
         return this.mTitleAndMessage;
     }
 }

app/src/main/java/epson/maintain/activity/FirmwareUpdateActivity.java

@@ -14,7 +14,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
 import epson.maintain.FirmwareManager;
-import epson.print.C2135R;
+import epson.print.R;
 import epson.print.MyPrinter;
 
 public class FirmwareUpdateActivity extends Activity implements FirmwareManager.FWUpdateListener {
@@ -39,15 +39,14 @@ public class FirmwareUpdateActivity extends Activity implements FirmwareManager.
     TextView mTitleText;
     private boolean mWaitEulaCheckActivityEnd;
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        setContentView(C2135R.layout.fwupdate_progress);
+        setContentView(R.layout.fwupdate_progress);
         this.mFWManager = new FirmwareManager(this, MyPrinter.getCurPrinter(this));
-        this.mMessageText = (TextView) findViewById(C2135R.C2137id.messageText);
-        this.mTitleText = (TextView) findViewById(C2135R.C2137id.messageTitle);
-        this.mProgress = (ProgressBar) findViewById(C2135R.C2137id.horizontalProgressBar);
-        this.mCancelButton = (Button) findViewById(C2135R.C2137id.cancelButton);
+        this.mMessageText = (TextView) findViewById(R.id.messageText);
+        this.mTitleText = (TextView) findViewById(R.id.messageTitle);
+        this.mProgress = (ProgressBar) findViewById(R.id.horizontalProgressBar);
+        this.mCancelButton = (Button) findViewById(R.id.cancelButton);
         this.mWaitEulaCheckActivityEnd = false;
         MyPrinter curPrinter = MyPrinter.getCurPrinter(this);
         Intent intent = getIntent();
@@ -56,13 +55,13 @@ public class FirmwareUpdateActivity extends Activity implements FirmwareManager.
             this.mPrinterIP = curPrinter.getIp();
         }
         this.mFWManager = new FirmwareManager(this, new MyPrinter(intent.getStringExtra(PRINTER_MODEL_NAME), this.mPrinterIP, curPrinter.getPrinterId(), curPrinter.getSerialNo()));
-        this.mCancelButton.setText(C2135R.string.str_cancel);
+        this.mCancelButton.setText(R.string.str_cancel);
         this.mCancelButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 FirmwareUpdateActivity.this.mFWManager.cancelProc();
             }
         });
-        setMessage(getResources().getString(C2135R.string.fw_checking_version), (String) null);
+        setMessage(getResources().getString(R.string.fw_checking_version), (String) null);
         setProcCancelable(false);
         if (bundle == null) {
             this.mFWManager.startVersionCheck(this);
@@ -71,17 +70,15 @@ public class FirmwareUpdateActivity extends Activity implements FirmwareManager.
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         Log.d(toString(), String.format("onResume mReconnectingSimpleAP=%b mInterrupted=%b", new Object[]{Boolean.valueOf(this.mReconnectingSimpleAP), Boolean.valueOf(this.mInterrupted)}));
         if (this.mInterrupted) {
-            showAlertDialog(getResources().getString(C2135R.string.fw_error_interrupted), getResources().getString(C2135R.string.fw_try_again), this.mGoBackOnClickListenner, (DialogInterface.OnClickListener) null);
+            showAlertDialog(getResources().getString(R.string.fw_error_interrupted), getResources().getString(R.string.fw_try_again), this.mGoBackOnClickListenner, (DialogInterface.OnClickListener) null);
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
         AlertDialog alertDialog = this.mDialog;
         if ((alertDialog == null || !alertDialog.isShowing()) && !this.mWaitEulaCheckActivityEnd && !this.mReconnectingSimpleAP) {
@@ -288,14 +285,14 @@ public class FirmwareUpdateActivity extends Activity implements FirmwareManager.
         if (fWUpdateProcResult == FirmwareManager.FWUpdateProcResult.Success && (i = C20104.$SwitchMap$epson$maintain$FirmwareManager$FWUpdateStep[fWUpdateStep.ordinal()]) != 5) {
             switch (i) {
                 case 1:
-                    showAlertDialog(str, str2, getString(C2135R.string.str_yes), new DialogInterface.OnClickListener() {
+                    showAlertDialog(str, str2, getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
                             FirmwareUpdateActivity.this.startEulaActivity();
                         }
-                    }, getString(C2135R.string.str_no), this.mGoBackOnClickListenner);
+                    }, getString(R.string.str_no), this.mGoBackOnClickListenner);
                     return;
                 case 2:
-                    setMessage(getResources().getString(C2135R.string.fw_transferring), (String) null);
+                    setMessage(getResources().getString(R.string.fw_transferring), (String) null);
                     getWindow().addFlags(128);
                     if (this.mShouldReconnectSimpleAP) {
                         this.mReconnectingSimpleAP = true;
@@ -329,8 +326,7 @@ public class FirmwareUpdateActivity extends Activity implements FirmwareManager.
         }
     }
 
-    /* access modifiers changed from: private */
-    public void startEulaActivity() {
+    private void startEulaActivity() {
         this.mWaitEulaCheckActivityEnd = true;
         startActivityForResult(new Intent(this, CheckEulaActivity.class), 101);
     }
@@ -339,7 +335,7 @@ public class FirmwareUpdateActivity extends Activity implements FirmwareManager.
         getWindow().addFlags(128);
         setProgressVisibility(true);
         setProcCancelable(true);
-        setMessage(getResources().getString(C2135R.string.fw_downloading), (String) null);
+        setMessage(getResources().getString(R.string.fw_downloading), (String) null);
         this.mFWManager.startFWDownload(this);
     }
 
@@ -372,9 +368,9 @@ public class FirmwareUpdateActivity extends Activity implements FirmwareManager.
     /* access modifiers changed from: package-private */
     public void showAlertDialog(String str, String str2, DialogInterface.OnClickListener onClickListener, DialogInterface.OnClickListener onClickListener2) {
         String str3 = null;
-        String string = onClickListener != null ? getString(C2135R.string.str_ok) : null;
+        String string = onClickListener != null ? getString(R.string.str_ok) : null;
         if (onClickListener2 != null) {
-            str3 = getString(C2135R.string.str_cancel);
+            str3 = getString(R.string.str_cancel);
         }
         showAlertDialog(str, str2, string, onClickListener, str3, onClickListener2);
     }
@@ -405,14 +401,12 @@ public class FirmwareUpdateActivity extends Activity implements FirmwareManager.
         DisconnectAndStartGetUpdateInfTask() {
         }
 
-        /* access modifiers changed from: protected */
-        public Boolean doInBackground(Void... voidArr) {
+        protected Boolean doInBackground(Void... voidArr) {
             FirmwareUpdateActivity firmwareUpdateActivity = FirmwareUpdateActivity.this;
             return Boolean.valueOf(MaintainActivity.disableSimpleApAndWait(firmwareUpdateActivity, firmwareUpdateActivity.mPrinterIP));
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(Boolean bool) {
+        protected void onPostExecute(Boolean bool) {
             super.onPostExecute(bool);
             if (bool.booleanValue()) {
                 FirmwareUpdateActivity firmwareUpdateActivity = FirmwareUpdateActivity.this;

app/src/main/java/epson/maintain/activity/GetPrinterReplyData.java

@@ -23,7 +23,7 @@ import epson.common.Constants;
 import epson.common.DialogProgress;
 import epson.common.DialogProgressViewModel;
 import epson.common.Utils;
-import epson.print.C2135R;
+import epson.print.R;
 import epson.print.CommonDefine;
 import epson.print.MyPrinter;
 import epson.print.Util.EPLog;
@@ -59,8 +59,7 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
     private static final int UPDATE_STT = 2;
     public static MaintainPrinter2 mPrinter;
     private Dialog customPro;
-    /* access modifiers changed from: private */
-    public SharedParamStatus extParam;
+    private SharedParamStatus extParam;
     boolean isGotError = false;
     boolean isResearchScanner = false;
     private Thread mBackGround;
@@ -71,14 +70,10 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
     boolean mIsStop = false;
     private Thread mLoadConfigThread;
     private DialogProgressViewModel mModelDialog;
-    /* access modifiers changed from: private */
-    public String mPrinterId;
-    /* access modifiers changed from: private */
-    public String mPrinterIp;
-    /* access modifiers changed from: private */
-    public int mPrinterLocation;
-    /* access modifiers changed from: private */
-    public String mPrinterName;
+    private String mPrinterId;
+    private String mPrinterIp;
+    private int mPrinterLocation;
+    private String mPrinterName;
     private int[] mPrinterStatus;
     boolean mStartSearch = false;
     Handler mUiHandler = new Handler() {
@@ -190,8 +185,7 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
     public void onPositiveClick(String str) {
     }
 
-    /* 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() {
@@ -291,14 +285,13 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
         this.mLoadConfigThread.start();
     }
 
-    /* access modifiers changed from: private */
-    public void setupErrorMessage(int i) {
-        Utils.makeMessageBox(this, getString(C2135R.string.EPS_PRNERR_DISABEL_CLEANING_TITLE), getString(C2135R.string.EPS_PRNERR_DISABEL_CLEANING_MSG), getString(C2135R.string.str_ok)).show();
+    private void setupErrorMessage(int i) {
+        Utils.makeMessageBox(this, getString(R.string.EPS_PRNERR_DISABEL_CLEANING_TITLE), getString(R.string.EPS_PRNERR_DISABEL_CLEANING_MSG), getString(R.string.str_ok)).show();
     }
 
     public void showProDia() {
         if (this.customPro == null) {
-            this.customPro = new CustomProDialog(this, C2135R.style.AppTheme_Translucent, C2135R.layout.maintain_executing_dialog);
+            this.customPro = new CustomProDialog(this, R.style.AppTheme_Translucent, R.layout.maintain_executing_dialog);
         }
         this.customPro.show();
     }
@@ -320,7 +313,7 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
         if (((str.hashCode() == -21731516 && str.equals(DIALOG_PROGRESS)) ? (char) 0 : 65535) != 0) {
             dialogProgress = null;
         } else {
-            dialogProgress = DialogProgress.newInstance(str, 0, getString(C2135R.string.str_wait));
+            dialogProgress = DialogProgress.newInstance(str, 0, getString(R.string.str_wait));
         }
         if (dialogProgress != null) {
             dialogProgress.setCancelable(true);
@@ -401,8 +394,7 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
         this.mUiHandler.sendMessage(message);
     }
 
-    /* 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) {
@@ -514,20 +506,17 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onDestroy() {
+    protected void onDestroy() {
         stopAllThread();
         super.onDestroy();
         EPLog.m313i(TAG, "onDestroy");
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
     }
 
-    /* access modifiers changed from: protected */
-    public void OLDonPause() {
+    protected void OLDonPause() {
         this.mIsStop = true;
         this.mIsCancelProbe = true;
         cancelLoadConPro();
@@ -538,13 +527,11 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
         super.onPause();
     }
 
-    /* access modifiers changed from: protected */
-    public void onStop() {
+    protected void onStop() {
         super.onStop();
     }
 
-    /* access modifiers changed from: private */
-    public void loadConfig() {
+    private void loadConfig() {
         MyPrinter curPrinter = MyPrinter.getCurPrinter(this);
         this.mPrinterId = curPrinter.getPrinterId();
         this.mPrinterName = curPrinter.getName();
@@ -574,13 +561,12 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
             setCancelable(false);
         }
 
-        /* access modifiers changed from: protected */
-        public void onCreate(Bundle bundle) {
+        protected void onCreate(Bundle bundle) {
             super.onCreate(bundle);
             requestWindowFeature(1);
             View inflate = getLayoutInflater().inflate(this.mLayoutId, (ViewGroup) null);
-            if (this.mLayoutId == C2135R.layout.maintain_executing_dialog) {
-                ((Button) inflate.findViewById(C2135R.C2137id.close_btn)).setOnClickListener(new View.OnClickListener() {
+            if (this.mLayoutId == R.layout.maintain_executing_dialog) {
+                ((Button) inflate.findViewById(R.id.close_btn)).setOnClickListener(new View.OnClickListener() {
                     public void onClick(View view) {
                         CustomProDialog.this.cancel();
                         GetPrinterReplyData.this.interrupMaintainThread();

app/src/main/java/epson/maintain/activity/MaintainActivity.java

@@ -21,7 +21,7 @@ import android.os.IBinder;
 import android.os.Message;
 import android.os.RemoteException;
 import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
+
 import android.support.p000v4.app.DialogFragment;
 import android.support.p000v4.app.FragmentActivity;
 import android.support.p000v4.content.ContextCompat;
@@ -52,7 +52,7 @@ import epson.common.Utils;
 import epson.epsonconnectregistration.ActivityECConfiguration;
 import epson.maintain.BatteryInfoAdapter;
 import epson.print.ActivityIACommon;
-import epson.print.C2135R;
+import epson.print.R;
 import epson.print.CommonDefine;
 import epson.print.MyPrinter;
 import epson.print.Util.AsyncTaskExecutor;
@@ -112,20 +112,14 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
     private static final int UPDATE_STT = 2;
     private static boolean isMessageScreenShowing = false;
     private Switch btnToggleAlert;
-    /* access modifiers changed from: private */
-    public Switch btnTogglePreview;
+    private Switch btnTogglePreview;
     private Dialog customPro;
-    /* access modifiers changed from: private */
-    public int escprSetPrinterSuccessed = -1;
-    /* access modifiers changed from: private */
-    public boolean isGotError = false;
-    /* access modifiers changed from: private */
-    public boolean isKeepSimpleAPConnection = false;
-    /* access modifiers changed from: private */
-    public boolean isRemotePrinter = false;
+    private int escprSetPrinterSuccessed = -1;
+    private boolean isGotError = false;
+    private boolean isKeepSimpleAPConnection = false;
+    private boolean isRemotePrinter = false;
     boolean isResearchScanner = false;
-    /* access modifiers changed from: private */
-    public boolean isTryConnectSimpleAp = false;
+    private boolean isTryConnectSimpleAp = false;
     private View mAlertMesseageSeparater;
     private LinearLayout mAlertMesseageView;
     private Thread mBackGround;
@@ -133,8 +127,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
     private int mBuyInkGroupVisibility;
     private View mBuyInkSeparator;
     private LinearLayout mBuyInkView;
-    /* access modifiers changed from: private */
-    public IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
+    private IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
         public void onFindPrinterResult(String str, String str2, String str3, String str4, String str5) throws RemoteException {
         }
 
@@ -182,8 +175,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
             }
         }
     };
-    /* access modifiers changed from: private */
-    public IEpsonService mEpsonService = null;
+    private IEpsonService mEpsonService = null;
     private TextView mFWUpdateText;
     private LinearLayout mFWUpdateView;
     boolean mHavePrinter = false;
@@ -191,11 +183,9 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
     private LinearLayout mHeadCleanView;
     private LinearLayout mInkDsView;
     private LinearLayout mInkView;
-    /* access modifiers changed from: private */
-    public volatile boolean mIsCancelProbe = false;
+    private volatile boolean mIsCancelProbe = false;
     private Boolean mIsNozzleCheckEnable = true;
-    /* access modifiers changed from: private */
-    public volatile boolean mIsStillUpdate = true;
+    private volatile boolean mIsStillUpdate = true;
     boolean mIsStop = false;
     private LinearLayout mLLSerialNo;
     private View mLoadConPro;
@@ -209,21 +199,17 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
     private View mPrintHistorySeparator;
     private LinearLayout mPrintHistoryView;
     private LinearLayout mPrintPreviewView;
-    /* access modifiers changed from: private */
-    public MaintainPrinter2 mPrinter = MaintainPrinter2.getInstance();
+    private MaintainPrinter2 mPrinter = MaintainPrinter2.getInstance();
     private View mPrinterSettingSeparator;
     private LinearLayout mPrinterSettingView;
-    /* access modifiers changed from: private */
-    public int[] mPrinterStatus;
+    private int[] mPrinterStatus;
     boolean mStartSearch = false;
     private TextView mTextMaintenance;
-    /* access modifiers changed from: private */
-    public TextView mTvPrinterName;
+    private TextView mTvPrinterName;
     private TextView mTvPrinterStatus;
     private TextView mTvPrinterStatusDetail;
     private TextView mTvSerialNo;
-    /* access modifiers changed from: private */
-    public Handler mUiHandler = new Handler(new Handler.Callback() {
+    private Handler mUiHandler = new Handler(new Handler.Callback() {
         public boolean handleMessage(Message message) {
             switch (message.what) {
                 case 0:
@@ -258,20 +244,20 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                     MaintainActivity.this.mTvPrinterName.setText(MaintainActivity.this.printerName);
                     switch (MaintainActivity.this.printerLocation) {
                         case 2:
-                            ((ImageView) MaintainActivity.this.findViewById(C2135R.C2137id.imageViewPrinterLocation)).setVisibility(0);
-                            ((ImageView) MaintainActivity.this.findViewById(C2135R.C2137id.imageViewPrinterLocation)).setImageResource(C2135R.C2136drawable.print_remote);
+                            ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setVisibility(0);
+                            ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_remote);
                             break;
                         case 3:
-                            ((ImageView) MaintainActivity.this.findViewById(C2135R.C2137id.imageViewPrinterLocation)).setVisibility(0);
-                            ((ImageView) MaintainActivity.this.findViewById(C2135R.C2137id.imageViewPrinterLocation)).setImageResource(C2135R.C2136drawable.print_ip);
+                            ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setVisibility(0);
+                            ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_ip);
                             break;
                         default:
                             if (!MaintainActivity.this.printerName.equals("")) {
-                                ((ImageView) MaintainActivity.this.findViewById(C2135R.C2137id.imageViewPrinterLocation)).setVisibility(0);
-                                ((ImageView) MaintainActivity.this.findViewById(C2135R.C2137id.imageViewPrinterLocation)).setImageResource(C2135R.C2136drawable.print_local);
+                                ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setVisibility(0);
+                                ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setImageResource(R.C2136drawable.print_local);
                                 break;
                             } else {
-                                ((ImageView) MaintainActivity.this.findViewById(C2135R.C2137id.imageViewPrinterLocation)).setVisibility(8);
+                                ((ImageView) MaintainActivity.this.findViewById(R.id.imageViewPrinterLocation)).setVisibility(8);
                                 break;
                             }
                     }
@@ -303,16 +289,11 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
     private View mVSerialSeparator;
     private boolean mWaiteInkDsDialog;
     private MaintainBuyInkOnlineRegTask modelBuyInkOnlineRegTask;
-    /* access modifiers changed from: private */
-    public String printerId = "";
-    /* access modifiers changed from: private */
-    public String printerIp = "";
-    /* access modifiers changed from: private */
-    public int printerLocation = 1;
-    /* access modifiers changed from: private */
-    public String printerName = "";
-    /* access modifiers changed from: private */
-    public int serverLoginStatus = -2;
+    private String printerId = "";
+    private String printerIp = "";
+    private int printerLocation = 1;
+    private String printerName = "";
+    private int serverLoginStatus = -2;
 
     private static int calcInkWidth(int i, float f) {
         if (i <= 0) {
@@ -337,66 +318,65 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         EpLog.m78i(TAG, "onCreate IN");
         super.onCreate(bundle);
-        setContentView((int) C2135R.layout.maintain);
+        setContentView((int) R.layout.maintain);
         this.mContext = this;
         this.mBuyInkGroupVisibility = 0;
-        setActionBar((int) C2135R.string.str_maintenance, true);
+        setActionBar((int) R.string.str_maintenance, true);
         if (this.mEpsonService == null) {
             bindService(new Intent(this, EpsonService.class), this.mEpsonConnection, 1);
         }
         this.mDisplay = getWindowManager().getDefaultDisplay();
-        findViewById(C2135R.C2137id.printer).setOnClickListener(this);
-        this.mTvPrinterName = (TextView) findViewById(C2135R.C2137id.printer_name);
-        this.mVSerialSeparator = findViewById(C2135R.C2137id.serial_separator);
-        this.mLLSerialNo = (LinearLayout) findViewById(C2135R.C2137id.serial);
-        this.mTvSerialNo = (TextView) findViewById(C2135R.C2137id.serial_no);
-        this.mTvPrinterStatus = (TextView) findViewById(C2135R.C2137id.printer_status);
-        this.mTvPrinterStatusDetail = (TextView) findViewById(C2135R.C2137id.printer_status_detail);
-        this.mTextMaintenance = (TextView) findViewById(C2135R.C2137id.text_maintenance);
-        this.mInkView = (LinearLayout) findViewById(C2135R.C2137id.ink_view_ln);
-        this.mMaintenanceBoxText = (TextView) findViewById(C2135R.C2137id.maintenance_box_text);
-        this.mMaintenanceBoxView = (LinearLayout) findViewById(C2135R.C2137id.maintenance_box_info_layout);
-        this.mCleanCheckView = (LinearLayout) findViewById(C2135R.C2137id.clean_check);
-        this.mHeadCleanView = (LinearLayout) findViewById(C2135R.C2137id.head_clean_view);
+        findViewById(R.id.printer).setOnClickListener(this);
+        this.mTvPrinterName = (TextView) findViewById(R.id.printer_name);
+        this.mVSerialSeparator = findViewById(R.id.serial_separator);
+        this.mLLSerialNo = (LinearLayout) findViewById(R.id.serial);
+        this.mTvSerialNo = (TextView) findViewById(R.id.serial_no);
+        this.mTvPrinterStatus = (TextView) findViewById(R.id.printer_status);
+        this.mTvPrinterStatusDetail = (TextView) findViewById(R.id.printer_status_detail);
+        this.mTextMaintenance = (TextView) findViewById(R.id.text_maintenance);
+        this.mInkView = (LinearLayout) findViewById(R.id.ink_view_ln);
+        this.mMaintenanceBoxText = (TextView) findViewById(R.id.maintenance_box_text);
+        this.mMaintenanceBoxView = (LinearLayout) findViewById(R.id.maintenance_box_info_layout);
+        this.mCleanCheckView = (LinearLayout) findViewById(R.id.clean_check);
+        this.mHeadCleanView = (LinearLayout) findViewById(R.id.head_clean_view);
         this.mHeadCleanView.setOnClickListener(this);
-        this.mHeadCleanText = (TextView) findViewById(C2135R.C2137id.head_clean_text);
-        this.mNozzleCheckView = (LinearLayout) findViewById(C2135R.C2137id.nozzle_check_view);
+        this.mHeadCleanText = (TextView) findViewById(R.id.head_clean_text);
+        this.mNozzleCheckView = (LinearLayout) findViewById(R.id.nozzle_check_view);
         this.mNozzleCheckView.setOnClickListener(this);
-        this.mNozzleCheckText = (TextView) findViewById(C2135R.C2137id.nozzle_check_text);
-        this.mFWUpdateView = (LinearLayout) findViewById(C2135R.C2137id.fwupdate_view);
+        this.mNozzleCheckText = (TextView) findViewById(R.id.nozzle_check_text);
+        this.mFWUpdateView = (LinearLayout) findViewById(R.id.fwupdate_view);
         this.mFWUpdateView.setOnClickListener(this);
-        this.mFWUpdateText = (TextView) findViewById(C2135R.C2137id.fwupdate_text);
-        this.btnTogglePreview = (Switch) findViewById(C2135R.C2137id.togglePreview);
+        this.mFWUpdateText = (TextView) findViewById(R.id.fwupdate_text);
+        this.btnTogglePreview = (Switch) findViewById(R.id.togglePreview);
         this.btnTogglePreview.setOnClickListener(this);
-        this.btnToggleAlert = (Switch) findViewById(C2135R.C2137id.toggleAlert);
+        this.btnToggleAlert = (Switch) findViewById(R.id.toggleAlert);
         this.btnToggleAlert.setOnClickListener(this);
-        this.mPrinterSettingView = (LinearLayout) findViewById(C2135R.C2137id.printer_setting);
+        this.mPrinterSettingView = (LinearLayout) findViewById(R.id.printer_setting);
         this.mPrinterSettingView.setOnClickListener(this);
-        this.mEpsonConnectView = (LinearLayout) findViewById(C2135R.C2137id.epsonconnect_option);
+        this.mEpsonConnectView = (LinearLayout) findViewById(R.id.epsonconnect_option);
         this.mEpsonConnectView.setOnClickListener(this);
-        this.mPrintHistoryView = (LinearLayout) findViewById(C2135R.C2137id.print_history);
+        this.mPrintHistoryView = (LinearLayout) findViewById(R.id.print_history);
         this.mPrintHistoryView.setOnClickListener(this);
-        this.mOnlineRegistrationView = (LinearLayout) findViewById(C2135R.C2137id.online_registration);
+        this.mOnlineRegistrationView = (LinearLayout) findViewById(R.id.online_registration);
         this.mOnlineRegistrationView.setOnClickListener(this);
-        this.mBuyInkGroup = (LinearLayout) findViewById(C2135R.C2137id.mentenance_buy_ink_frame);
-        this.mBuyInkView = (LinearLayout) findViewById(C2135R.C2137id.mentenance_buy_ink);
+        this.mBuyInkGroup = (LinearLayout) findViewById(R.id.mentenance_buy_ink_frame);
+        this.mBuyInkView = (LinearLayout) findViewById(R.id.mentenance_buy_ink);
         this.mBuyInkView.setOnClickListener(this);
-        this.mBuyInkSeparator = findViewById(C2135R.C2137id.buy_ink_separator);
-        this.mInkDsView = (LinearLayout) findViewById(C2135R.C2137id.maintenance_inkds);
+        this.mBuyInkSeparator = findViewById(R.id.buy_ink_separator);
+        this.mInkDsView = (LinearLayout) findViewById(R.id.maintenance_inkds);
         this.mInkDsView.setOnClickListener(this);
-        this.mPrintPreviewView = (LinearLayout) findViewById(C2135R.C2137id.print_preview);
-        this.mAlertMesseageView = (LinearLayout) findViewById(C2135R.C2137id.alert_messeage);
-        this.mPrinterSettingSeparator = findViewById(C2135R.C2137id.printer_setting_separator);
-        this.mPrintHistorySeparator = findViewById(C2135R.C2137id.print_history_separator);
-        this.mOnlineRegistrationSeparator = findViewById(C2135R.C2137id.online_registration_separator);
-        this.mAlertMesseageSeparater = findViewById(C2135R.C2137id.comm_messeage_separator);
+        this.mPrintPreviewView = (LinearLayout) findViewById(R.id.print_preview);
+        this.mAlertMesseageView = (LinearLayout) findViewById(R.id.alert_messeage);
+        this.mPrinterSettingSeparator = findViewById(R.id.printer_setting_separator);
+        this.mPrintHistorySeparator = findViewById(R.id.print_history_separator);
+        this.mOnlineRegistrationSeparator = findViewById(R.id.online_registration_separator);
+        this.mAlertMesseageSeparater = findViewById(R.id.comm_messeage_separator);
         this.mPrinterSettingView.setEnabled(false);
-        ((TextView) findViewById(C2135R.C2137id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(C2135R.color.light_gray));
-        ((ImageView) findViewById(C2135R.C2137id.printer_setting_arrow)).setVisibility(8);
+        ((TextView) findViewById(R.id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(R.color.light_gray));
+        ((ImageView) findViewById(R.id.printer_setting_arrow)).setVisibility(8);
         this.mVSerialSeparator.setVisibility(8);
         this.mLLSerialNo.setVisibility(8);
         EpLog.m78i(TAG, "onCreate :: doInitDriver");
@@ -671,14 +651,13 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         this.mLoadConfigThread.start();
     }
 
-    /* access modifiers changed from: private */
-    public void updateButton() {
+    private void updateButton() {
         switch (this.printerLocation) {
             case 0:
-                this.mTvPrinterName.setText(getString(C2135R.string.str_lbl_title_scan));
-                ((ImageView) findViewById(C2135R.C2137id.imageViewPrinterLocation)).setVisibility(8);
-                this.mTvPrinterStatus.setText(C2135R.string.EPS_PRNERR_NOT_SELECTED_TITTLE);
-                this.mTvPrinterStatusDetail.setText(C2135R.string.EPS_PRNERR_NOT_SELECTED);
+                this.mTvPrinterName.setText(getString(R.string.str_lbl_title_scan));
+                ((ImageView) findViewById(R.id.imageViewPrinterLocation)).setVisibility(8);
+                this.mTvPrinterStatus.setText(R.string.EPS_PRNERR_NOT_SELECTED_TITTLE);
+                this.mTvPrinterStatusDetail.setText(R.string.EPS_PRNERR_NOT_SELECTED);
                 LinearLayout linearLayout = this.mInkView;
                 if (linearLayout != null) {
                     linearLayout.removeAllViews();
@@ -690,8 +669,8 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 this.mNozzleCheckView.setEnabled(false);
                 this.mFWUpdateView.setEnabled(false);
                 this.mPrinterSettingView.setEnabled(false);
-                ((TextView) findViewById(C2135R.C2137id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(C2135R.color.light_gray));
-                ((ImageView) findViewById(C2135R.C2137id.printer_setting_arrow)).setVisibility(8);
+                ((TextView) findViewById(R.id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(R.color.light_gray));
+                ((ImageView) findViewById(R.id.printer_setting_arrow)).setVisibility(8);
                 localSetBuyInkGroupVisibility(8);
                 this.mOnlineRegistrationSeparator.setVisibility(8);
                 this.mOnlineRegistrationView.setVisibility(8);
@@ -730,16 +709,16 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                     this.mNozzleCheckView.setEnabled(true);
                     this.mFWUpdateView.setEnabled(true);
                     this.mPrinterSettingView.setEnabled(true);
-                    ((TextView) findViewById(C2135R.C2137id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(C2135R.color.black));
-                    ((ImageView) findViewById(C2135R.C2137id.printer_setting_arrow)).setVisibility(0);
+                    ((TextView) findViewById(R.id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(R.color.black));
+                    ((ImageView) findViewById(R.id.printer_setting_arrow)).setVisibility(0);
                     setEpsonConnectButton(0);
                 } else {
                     this.mHeadCleanView.setEnabled(false);
                     this.mNozzleCheckView.setEnabled(false);
                     this.mFWUpdateView.setEnabled(false);
                     this.mPrinterSettingView.setEnabled(false);
-                    ((TextView) findViewById(C2135R.C2137id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(C2135R.color.light_gray));
-                    ((ImageView) findViewById(C2135R.C2137id.printer_setting_arrow)).setVisibility(8);
+                    ((TextView) findViewById(R.id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(R.color.light_gray));
+                    ((ImageView) findViewById(R.id.printer_setting_arrow)).setVisibility(8);
                     setEpsonConnectButton(1);
                 }
                 if (MyPrinter.PRINTER_USB.equals(this.printerIp)) {
@@ -765,9 +744,9 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                     linearLayout2.removeAllViews();
                 }
                 TextView textView = new TextView(this.mContext);
-                textView.setTextColor(getResources().getColor(C2135R.color.black));
+                textView.setTextColor(getResources().getColor(R.color.black));
                 textView.setTextSize(16.0f);
-                textView.setText(getString(C2135R.string.epsonconnect_str_status_inkinfo_error));
+                textView.setText(getString(R.string.epsonconnect_str_status_inkinfo_error));
                 this.mInkView.addView(textView);
                 SharedPreferences sharedPreferences = getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0);
                 boolean z = sharedPreferences.getBoolean(Constants.ENABLE_SHOW_PREVIEW, true);
@@ -791,34 +770,34 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 this.mMaintenanceBoxView.setVisibility(8);
                 int i = this.serverLoginStatus;
                 if (i == 0) {
-                    this.mTvPrinterStatus.setText(getString(C2135R.string.EPS_PRNST_IDLE_TITLE));
-                    this.mTvPrinterStatusDetail.setText(getString(C2135R.string.EPS_PRNST_IDLE_MSG));
+                    this.mTvPrinterStatus.setText(getString(R.string.EPS_PRNST_IDLE_TITLE));
+                    this.mTvPrinterStatusDetail.setText(getString(R.string.EPS_PRNST_IDLE_MSG));
                     this.mPrintHistoryView.setEnabled(true);
-                    ((TextView) findViewById(C2135R.C2137id.text_print_history)).setTextColor(this.mContext.getResources().getColor(C2135R.color.black));
-                    ((ImageView) findViewById(C2135R.C2137id.print_history_arrow)).setVisibility(0);
+                    ((TextView) findViewById(R.id.text_print_history)).setTextColor(this.mContext.getResources().getColor(R.color.black));
+                    ((ImageView) findViewById(R.id.print_history_arrow)).setVisibility(0);
                     this.mPrinterSettingView.setEnabled(true);
-                    ((TextView) findViewById(C2135R.C2137id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(C2135R.color.black));
-                    ((ImageView) findViewById(C2135R.C2137id.printer_setting_arrow)).setVisibility(0);
+                    ((TextView) findViewById(R.id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(R.color.black));
+                    ((ImageView) findViewById(R.id.printer_setting_arrow)).setVisibility(0);
                     return;
                 } else if (i == -1) {
-                    this.mTvPrinterStatus.setText(getString(C2135R.string.EC_ERR_COMM_ERROR_TITLE));
-                    this.mTvPrinterStatusDetail.setText(getString(C2135R.string.EC_ERR_COMM_ERROR));
+                    this.mTvPrinterStatus.setText(getString(R.string.EC_ERR_COMM_ERROR_TITLE));
+                    this.mTvPrinterStatusDetail.setText(getString(R.string.EC_ERR_COMM_ERROR));
                     this.mPrintHistoryView.setEnabled(false);
-                    ((TextView) findViewById(C2135R.C2137id.text_print_history)).setTextColor(this.mContext.getResources().getColor(C2135R.color.light_gray));
-                    ((ImageView) findViewById(C2135R.C2137id.print_history_arrow)).setVisibility(8);
+                    ((TextView) findViewById(R.id.text_print_history)).setTextColor(this.mContext.getResources().getColor(R.color.light_gray));
+                    ((ImageView) findViewById(R.id.print_history_arrow)).setVisibility(8);
                     this.mPrinterSettingView.setEnabled(false);
-                    ((TextView) findViewById(C2135R.C2137id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(C2135R.color.light_gray));
-                    ((ImageView) findViewById(C2135R.C2137id.printer_setting_arrow)).setVisibility(8);
+                    ((TextView) findViewById(R.id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(R.color.light_gray));
+                    ((ImageView) findViewById(R.id.printer_setting_arrow)).setVisibility(8);
                     return;
                 } else {
-                    this.mTvPrinterStatus.setText(C2135R.string.epsonconnect_str_status_login_error_title);
-                    this.mTvPrinterStatusDetail.setText(getString(C2135R.string.epsonconnect_str_status_login_error));
+                    this.mTvPrinterStatus.setText(R.string.epsonconnect_str_status_login_error_title);
+                    this.mTvPrinterStatusDetail.setText(getString(R.string.epsonconnect_str_status_login_error));
                     this.mPrintHistoryView.setEnabled(false);
-                    ((TextView) findViewById(C2135R.C2137id.text_print_history)).setTextColor(this.mContext.getResources().getColor(C2135R.color.light_gray));
-                    ((ImageView) findViewById(C2135R.C2137id.print_history_arrow)).setVisibility(8);
+                    ((TextView) findViewById(R.id.text_print_history)).setTextColor(this.mContext.getResources().getColor(R.color.light_gray));
+                    ((ImageView) findViewById(R.id.print_history_arrow)).setVisibility(8);
                     this.mPrinterSettingView.setEnabled(false);
-                    ((TextView) findViewById(C2135R.C2137id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(C2135R.color.light_gray));
-                    ((ImageView) findViewById(C2135R.C2137id.printer_setting_arrow)).setVisibility(8);
+                    ((TextView) findViewById(R.id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(R.color.light_gray));
+                    ((ImageView) findViewById(R.id.printer_setting_arrow)).setVisibility(8);
                     return;
                 }
             case 3:
@@ -843,16 +822,16 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                     this.mHeadCleanView.setEnabled(true);
                     this.mNozzleCheckView.setEnabled(true);
                     this.mPrinterSettingView.setEnabled(true);
-                    ((TextView) findViewById(C2135R.C2137id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(C2135R.color.black));
-                    ((ImageView) findViewById(C2135R.C2137id.printer_setting_arrow)).setVisibility(0);
+                    ((TextView) findViewById(R.id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(R.color.black));
+                    ((ImageView) findViewById(R.id.printer_setting_arrow)).setVisibility(0);
                     setEpsonConnectButton(0);
                     return;
                 }
                 this.mHeadCleanView.setEnabled(false);
                 this.mNozzleCheckView.setEnabled(false);
                 this.mPrinterSettingView.setEnabled(false);
-                ((TextView) findViewById(C2135R.C2137id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(C2135R.color.light_gray));
-                ((ImageView) findViewById(C2135R.C2137id.printer_setting_arrow)).setVisibility(8);
+                ((TextView) findViewById(R.id.text_printer_setting)).setTextColor(this.mContext.getResources().getColor(R.color.light_gray));
+                ((ImageView) findViewById(R.id.printer_setting_arrow)).setVisibility(8);
                 setEpsonConnectButton(1);
                 return;
             default:
@@ -904,21 +883,20 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         this.mBuyInkSeparator.setVisibility(i2);
     }
 
-    /* access modifiers changed from: private */
-    public void setupErrorMessage(int i) {
-        Utils.makeMessageBox(this, getString(C2135R.string.EPS_PRNERR_DISABEL_CLEANING_TITLE), getString(C2135R.string.EPS_PRNERR_DISABEL_CLEANING_MSG), getString(C2135R.string.str_cancel)).show();
+    private void setupErrorMessage(int i) {
+        Utils.makeMessageBox(this, getString(R.string.EPS_PRNERR_DISABEL_CLEANING_TITLE), getString(R.string.EPS_PRNERR_DISABEL_CLEANING_MSG), getString(R.string.str_cancel)).show();
     }
 
     public void onClick(View view) {
         int id = view.getId();
-        int i = C2135R.string.str_nozzle_check;
+        int i = R.string.str_nozzle_check;
         switch (id) {
-            case C2135R.C2137id.epsonconnect_option /*2131231020*/:
+            case R.id.epsonconnect_option /*2131231020*/:
                 Intent intent = new Intent(this, ActivityECConfiguration.class);
                 intent.putExtra(ActivityECConfiguration.INTENT_EC_BLE_CONTENT, false);
                 startActivity(intent);
                 return;
-            case C2135R.C2137id.fwupdate_view /*2131231071*/:
+            case R.id.fwupdate_view /*2131231071*/:
                 Analytics.sendAction(getApplicationContext(), Analytics.ACTION_ID_MAINTENANCE_FIRMWARE_UPDATE);
                 Intent intent2 = new Intent(this, FirmwareUpdateActivity.class);
                 intent2.putExtra(Constants.PRINTER_IP, this.printerIp);
@@ -926,66 +904,64 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 this.isKeepSimpleAPConnection = true;
                 startActivity(intent2);
                 return;
-            case C2135R.C2137id.head_clean_view /*2131231097*/:
+            case R.id.head_clean_view /*2131231097*/:
                 Analytics.sendAction(getApplicationContext(), Analytics.ACTION_ID_MAINTENANCE_HEAD_CLEANING);
-                AlertDialog.Builder icon = new AlertDialog.Builder(this).setIcon(C2135R.C2136drawable.ic_action_warning);
-                if (view.getId() != C2135R.C2137id.nozzle_check_view) {
-                    i = C2135R.string.str_head_clean;
+                AlertDialog.Builder icon = new AlertDialog.Builder(this).setIcon(R.C2136drawable.ic_action_warning);
+                if (view.getId() != R.id.nozzle_check_view) {
+                    i = R.string.str_head_clean;
                 }
-                icon.setTitle(i).setPositiveButton(C2135R.string.str_yes, new DialogInterface.OnClickListener() {
+                icon.setTitle(i).setPositiveButton(R.string.str_yes, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         MaintainActivity.this.performMaintain(2);
                     }
-                }).setNegativeButton(C2135R.string.str_no, new DialogInterface.OnClickListener() {
+                }).setNegativeButton(R.string.str_no, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                     }
                 }).show();
                 return;
-            case C2135R.C2137id.maintenance_inkds /*2131231241*/:
+            case R.id.maintenance_inkds /*2131231241*/:
                 Analytics.sendAction(this, Analytics.ACTION_ID_MAINTENANCE_READY_INK);
                 startBrowsReadyInkUrl();
                 return;
-            case C2135R.C2137id.mentenance_buy_ink /*2131231247*/:
+            case R.id.mentenance_buy_ink /*2131231247*/:
                 Analytics.sendAction(this, Analytics.ACTION_ID_MAINTENANCE_BUY_INK);
                 showDialog(DIALOG_PROGRESS);
                 BuyInkTask(1, this.printerIp);
                 return;
-            case C2135R.C2137id.nozzle_check_view /*2131231280*/:
+            case R.id.nozzle_check_view /*2131231280*/:
                 Analytics.sendAction(getApplicationContext(), Analytics.ACTION_ID_MAINTENANCE_NOZZLE_CHECK);
-                AlertDialog.Builder icon2 = new AlertDialog.Builder(this).setIcon(C2135R.C2136drawable.ic_action_warning);
-                if (view.getId() != C2135R.C2137id.nozzle_check_view) {
-                    i = C2135R.string.str_head_clean;
+                AlertDialog.Builder icon2 = new AlertDialog.Builder(this).setIcon(R.C2136drawable.ic_action_warning);
+                if (view.getId() != R.id.nozzle_check_view) {
+                    i = R.string.str_head_clean;
                 }
-                icon2.setTitle(i).setPositiveButton(C2135R.string.str_yes, new DialogInterface.OnClickListener() {
+                icon2.setTitle(i).setPositiveButton(R.string.str_yes, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         new NozzleCheckTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
                     }
-                }).setNegativeButton(C2135R.string.str_no, new DialogInterface.OnClickListener() {
+                }).setNegativeButton(R.string.str_no, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                     }
                 }).show();
                 return;
-            case C2135R.C2137id.online_registration /*2131231289*/:
+            case R.id.online_registration /*2131231289*/:
                 showDialog(DIALOG_PROGRESS);
                 OnlineRegTask(this.printerIp);
                 return;
-            case C2135R.C2137id.print_history /*2131231348*/:
+            case R.id.print_history /*2131231348*/:
                 startActivity(new Intent(this, EccPrintLog.class));
                 return;
-            case C2135R.C2137id.printer /*2131231358*/:
+            case R.id.printer /*2131231358*/:
                 EPLog.m305d(TAG, "onClick() R.id.printer");
                 new AsyncTask<Void, Void, Void>() {
                     WorkingDialog dialog = new WorkingDialog(MaintainActivity.this);
 
-                    /* access modifiers changed from: protected */
-                    public void onPreExecute() {
+                    protected void onPreExecute() {
                         super.onPreExecute();
                         MaintainActivity.this.hideLoadProgressBar();
                         this.dialog.show();
                     }
 
-                    /* access modifiers changed from: protected */
-                    public Void doInBackground(Void... voidArr) {
+                    protected Void doInBackground(Void... voidArr) {
                         MaintainActivity.this.stopLoadConfigThread();
                         MaintainActivity.this.endBackGroundThread();
                         MaintainActivity maintainActivity = MaintainActivity.this;
@@ -993,14 +969,13 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                         return null;
                     }
 
-                    /* access modifiers changed from: protected */
-                    public void onPostExecute(Void voidR) {
+                    protected void onPostExecute(Void voidR) {
                         MaintainActivity.this.startSelectPrinterActivity();
                         this.dialog.dismiss();
                     }
                 }.execute(new Void[0]);
                 return;
-            case C2135R.C2137id.printer_setting /*2131231369*/:
+            case R.id.printer_setting /*2131231369*/:
                 switch (this.printerLocation) {
                     case 1:
                     case 3:
@@ -1009,7 +984,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                             startActivity(new Intent("android.intent.action.VIEW", Uri.parse(IPAddressUtils.buildURL(Analytics.EXTENSION_STRING_WEB, this.printerIp, CommonDefine.SLASH))));
                             return;
                         }
-                        new AlertDialog.Builder(this.mContext).setCancelable(false).setMessage(C2135R.string.str_webconfig_warn_message).setPositiveButton(C2135R.string.str_ok, new DialogInterface.OnClickListener() {
+                        new AlertDialog.Builder(this.mContext).setCancelable(false).setMessage(R.string.str_webconfig_warn_message).setPositiveButton(R.string.str_ok, new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialogInterface, int i) {
                                 boolean unused = MaintainActivity.this.isKeepSimpleAPConnection = true;
                                 MaintainActivity maintainActivity = MaintainActivity.this;
@@ -1024,7 +999,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                     default:
                         return;
                 }
-            case C2135R.C2137id.toggleAlert /*2131231560*/:
+            case R.id.toggleAlert /*2131231560*/:
                 if (this.btnToggleAlert.isChecked()) {
                     SharedPreferences.Editor edit = getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).edit();
                     edit.putBoolean(Constants.ENABLE_SHOW_WARNING, true);
@@ -1035,7 +1010,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 edit2.putBoolean(Constants.ENABLE_SHOW_WARNING, false);
                 edit2.commit();
                 return;
-            case C2135R.C2137id.togglePreview /*2131231563*/:
+            case R.id.togglePreview /*2131231563*/:
                 if (!this.btnTogglePreview.isChecked()) {
                     SharedPreferences.Editor edit3 = getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).edit();
                     edit3.putBoolean(Constants.ENABLE_SHOW_PREVIEW, false);
@@ -1055,8 +1030,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         }
     }
 
-    /* access modifiers changed from: private */
-    public void startSelectPrinterActivity() {
+    private void startSelectPrinterActivity() {
         this.mWaiteInkDsDialog = true;
         Intent intent = new Intent(this, MaintainPrinterSearchActivity.class);
         intent.putExtra(Constants.PRINTER_ID, this.printerId);
@@ -1068,8 +1042,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         startActivity(new Intent(this, JumpUrlProgressActivity.class));
     }
 
-    /* access modifiers changed from: private */
-    public void showNozzleCheckGuidanceDialog() {
+    private void showNozzleCheckGuidanceDialog() {
         if (!checkGaga()) {
             new NozzleGuidanceDialog().show(getSupportFragmentManager(), DIALOG_TAG_NOZZLE_GUIDANCE);
         }
@@ -1086,7 +1059,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
     private void showMessageDialog() {
         isMessageScreenShowing = true;
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setMessage(getString(C2135R.string.epsonconnect_str_preview_warning) + "\n\n" + getString(C2135R.string.epsonconnect_str_preview_warning2));
+        builder.setMessage(getString(R.string.epsonconnect_str_preview_warning) + "\n\n" + getString(R.string.epsonconnect_str_preview_warning2));
         C20299 r1 = new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 SharedPreferences.Editor edit = MaintainActivity.this.getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).edit();
@@ -1099,23 +1072,21 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 MaintainActivity.this.btnTogglePreview.setChecked(false);
             }
         };
-        builder.setPositiveButton(C2135R.string.str_yes, r1);
-        builder.setNegativeButton(C2135R.string.str_no, r2);
+        builder.setPositiveButton(R.string.str_yes, r1);
+        builder.setNegativeButton(R.string.str_no, r2);
         builder.setCancelable(false);
         builder.show();
         isMessageScreenShowing = false;
     }
 
-    /* access modifiers changed from: private */
-    public void showProDia() {
+    private void showProDia() {
         if (this.customPro == null) {
-            this.customPro = new CustomProDialog(this, C2135R.style.AppTheme_Translucent, C2135R.layout.maintain_executing_dialog);
+            this.customPro = new CustomProDialog(this, R.style.AppTheme_Translucent, R.layout.maintain_executing_dialog);
         }
         this.customPro.show();
     }
 
-    /* access modifiers changed from: private */
-    public void cancelProDia() {
+    private void cancelProDia() {
         Dialog dialog = this.customPro;
         if (dialog != null && dialog.isShowing()) {
             this.customPro.cancel();
@@ -1123,32 +1094,28 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         }
     }
 
-    /* access modifiers changed from: private */
-    public void showLoadProgressBar() {
+    private void showLoadProgressBar() {
         if (this.mLoadConPro == null) {
-            this.mLoadConPro = findViewById(C2135R.C2137id.progress_status);
+            this.mLoadConPro = findViewById(R.id.progress_status);
         }
         this.mLoadConPro.setVisibility(0);
     }
 
-    /* access modifiers changed from: private */
-    public void hideLoadProgressBar() {
+    private void hideLoadProgressBar() {
         View view = this.mLoadConPro;
         if (view != null) {
             view.setVisibility(8);
         }
     }
 
-    /* access modifiers changed from: private */
-    public void stopLoadConfigThread() {
+    private void stopLoadConfigThread() {
         this.mIsCancelProbe = true;
         Thread thread = this.mLoadConfigThread;
         if (thread != null && thread.isAlive()) {
             this.mPrinter.doCancelFindPrinter();
             if (this.mEpsonService != null) {
                 new AsyncTaskExecutor<Void, Void, Void>() {
-                    /* access modifiers changed from: protected */
-                    public Void doInBackground(Void... voidArr) {
+                    protected Void doInBackground(Void... voidArr) {
                         try {
                             MaintainActivity.this.mEpsonService.EpsonConnectCancel();
                             return null;
@@ -1231,14 +1198,12 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         this.mBackGround.start();
     }
 
-    /* access modifiers changed from: private */
-    public void sendMaintenanceBoxInfoMessage(Handler handler, int[] iArr) {
+    private void sendMaintenanceBoxInfoMessage(Handler handler, int[] iArr) {
         this.mUiHandler.removeMessages(16);
         handler.sendMessage(handler.obtainMessage(16, 0, 0, iArr));
     }
 
-    /* access modifiers changed from: private */
-    public void endBackGroundThread() {
+    private void endBackGroundThread() {
         this.mIsStillUpdate = false;
         Thread thread = this.mBackGround;
         if (thread != null && thread.isAlive()) {
@@ -1256,8 +1221,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         super.onConfigurationChanged(configuration);
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         IEpsonService iEpsonService;
         super.onActivityResult(i, i2, intent);
         switch (i) {
@@ -1304,8 +1268,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         startActivityForResult(InkRplnProgressDialog.getStartIntent(this), 100);
     }
 
-    /* access modifiers changed from: private */
-    public void updateSelectedPrinter() {
+    private void updateSelectedPrinter() {
         hideLoadProgressBar();
         stopLoadConfigThread();
         this.mIsNozzleCheckEnable = true;
@@ -1336,8 +1299,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         this.printerIp = this.mPrinter.doGetIp();
     }
 
-    /* access modifiers changed from: private */
-    public synchronized void updateStatus(int i) {
+    private synchronized void updateStatus(int i) {
         this.mUiHandler.sendEmptyMessage(11);
         if (i == 0) {
             if (isPrinterReady() != 1) {
@@ -1397,8 +1359,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         createInkView(this.mPrinter.getMPrinterInfor(), i);
     }
 
-    /* access modifiers changed from: private */
-    public void updateBatteryInfoEx(int i, BatteryInfoEx batteryInfoEx) {
+    private void updateBatteryInfoEx(int i, BatteryInfoEx batteryInfoEx) {
         int i2 = batteryInfoEx.number;
         int i3 = batteryInfoEx.powerSourceType;
         if (i != 0 || i2 <= 0 || i3 == -1) {
@@ -1411,8 +1372,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         BatteryInfoAdapter.BatteryInfoManager.showBatteryList(this, i2, i3, iArr, iArr2);
     }
 
-    /* access modifiers changed from: private */
-    public void updateMaintenanceBoxInfo(int[] iArr) {
+    private void updateMaintenanceBoxInfo(int[] iArr) {
         int i = this.mBuyInkGroupVisibility;
         if (iArr == null || iArr.length <= 0) {
             this.mMaintenanceBoxText.setVisibility(8);
@@ -1436,25 +1396,24 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
             int i5 = i4 * 2;
             int i6 = iArr[i5];
             int i7 = iArr[i5 + 1];
-            View inflate = from.inflate(C2135R.layout.ink_item, this.mMaintenanceBoxView, false);
-            ((TextView) inflate.findViewById(C2135R.C2137id.ink_name)).setVisibility(8);
-            ((RelativeLayout) inflate.findViewById(C2135R.C2137id.ink_holder)).getLayoutParams().width = i3;
-            ViewGroup viewGroup = (ViewGroup) inflate.findViewById(C2135R.C2137id.ink_level);
+            View inflate = from.inflate(R.layout.ink_item, this.mMaintenanceBoxView, false);
+            ((TextView) inflate.findViewById(R.id.ink_name)).setVisibility(8);
+            ((RelativeLayout) inflate.findViewById(R.id.ink_holder)).getLayoutParams().width = i3;
+            ViewGroup viewGroup = (ViewGroup) inflate.findViewById(R.id.ink_level);
             if (i7 <= 0 || isMaintenanceBoxStatusDisplayX(i6)) {
                 viewGroup.getLayoutParams().width = 0;
-                inflate.findViewById(C2135R.C2137id.ink_error).setVisibility(0);
+                inflate.findViewById(R.id.ink_error).setVisibility(0);
                 viewGroup.setVisibility(4);
             } else {
                 viewGroup.getLayoutParams().width = (int) ((((float) (i3 - 4)) / 100.0f) * ((float) i7));
-                viewGroup.setBackgroundResource(C2135R.color.maintenance_box_info);
+                viewGroup.setBackgroundResource(R.color.maintenance_box_info);
                 viewGroup.setVisibility(0);
             }
             this.mMaintenanceBoxView.addView(inflate);
         }
     }
 
-    /* access modifiers changed from: private */
-    public void handlerError(int i, boolean z) {
+    private void handlerError(int i, boolean z) {
         hideLoadProgressBar();
         if (i == -1351 || i == -1100) {
             i = -1300;
@@ -1504,8 +1463,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         return 1;
     }
 
-    /* access modifiers changed from: private */
-    public void interrupMaintainThread() {
+    private void interrupMaintainThread() {
         Thread thread = this.mDoMaintainThread;
         if (thread != null && thread.isAlive()) {
             this.mDoMaintainThread.interrupt();
@@ -1513,8 +1471,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onDestroy() {
+    protected void onDestroy() {
         super.onDestroy();
         EPLog.m313i(TAG, "onDestroy");
         IEpsonService iEpsonService = this.mEpsonService;
@@ -1528,8 +1485,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         EPLog.m307e("MaintainActivity", "onResume()");
         super.onResume();
         this.isKeepSimpleAPConnection = false;
@@ -1538,8 +1494,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         EPLog.m305d("MaintainActivity", "onPause");
         this.mIsCancelProbe = true;
         hideLoadProgressBar();
@@ -1554,13 +1509,11 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         super.onPause();
     }
 
-    /* access modifiers changed from: protected */
-    public void onStop() {
+    protected void onStop() {
         super.onStop();
     }
 
-    /* access modifiers changed from: private */
-    public void performMaintain(final int i) {
+    private void performMaintain(final int i) {
         if (isPrinterReady() == 1) {
             this.mUiHandler.sendEmptyMessage(0);
             this.mDoMaintainThread = new Thread(new Runnable() {
@@ -1665,8 +1618,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         }
     }
 
-    /* access modifiers changed from: private */
-    public void loadConfig() {
+    private void loadConfig() {
         MyPrinter curPrinter = MyPrinter.getCurPrinter(this);
         this.printerName = curPrinter.getUserDefName(this);
         if (this.printerName == null) {
@@ -1695,7 +1647,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         }
         int inkNum = maintainPrinterInfo2.getInkNum();
         if (inkNum > 0) {
-            findViewById(C2135R.C2137id.ink_text).setVisibility(0);
+            findViewById(R.id.ink_text).setVisibility(0);
             this.mInkView.setVisibility(0);
             this.mBuyInkGroup.setVisibility(this.mBuyInkGroupVisibility);
             for (int i3 = 0; i3 < inkNum; i3++) {
@@ -1713,21 +1665,21 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 } else {
                     logColorInfo(inkName, colorName);
                 }
-                View inflate = from.inflate(C2135R.layout.ink_item, (ViewGroup) null);
-                TextView textView = (TextView) inflate.findViewById(C2135R.C2137id.ink_name);
+                View inflate = from.inflate(R.layout.ink_item, (ViewGroup) null);
+                TextView textView = (TextView) inflate.findViewById(R.id.ink_name);
                 if (colorName[1].intValue() != 0) {
                     textView.setText(colorName[1].intValue());
                 } else {
                     textView.setText("");
                 }
-                ((RelativeLayout) inflate.findViewById(C2135R.C2137id.ink_holder)).getLayoutParams().width = i2;
-                ViewGroup viewGroup = (ViewGroup) inflate.findViewById(C2135R.C2137id.ink_level);
+                ((RelativeLayout) inflate.findViewById(R.id.ink_holder)).getLayoutParams().width = i2;
+                ViewGroup viewGroup = (ViewGroup) inflate.findViewById(R.id.ink_level);
                 float f = (float) (i2 - 4);
                 if (maintainPrinterInfo22.getInkStatus(i3) == -4 || i != 0) {
                     viewGroup.getLayoutParams().width = 0;
                     viewGroup.setVisibility(4);
                     if (maintainPrinterInfo22.getInkStatus(i3) != -4) {
-                        inflate.findViewById(C2135R.C2137id.ink_error).setVisibility(0);
+                        inflate.findViewById(R.id.ink_error).setVisibility(0);
                     }
                 } else {
                     viewGroup.getLayoutParams().width = calcInkWidth(inkRemainingAmount, f);
@@ -1735,7 +1687,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                         viewGroup.getLayoutParams().width = 0;
                     }
                     if (checkIfWhite(colorName[0].intValue())) {
-                        View findViewById = inflate.findViewById(C2135R.C2137id.white_ink_level);
+                        View findViewById = inflate.findViewById(R.id.white_ink_level);
                         findViewById.setBackgroundResource(colorName[0].intValue());
                         findViewById.setVisibility(0);
                     } else {
@@ -1743,14 +1695,14 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                     }
                     viewGroup.setVisibility(0);
                     if (inkRemainingAmount <= 0) {
-                        inflate.findViewById(C2135R.C2137id.ink_error).setVisibility(0);
+                        inflate.findViewById(R.id.ink_error).setVisibility(0);
                     }
                 }
                 this.mInkView.addView(inflate);
             }
             return;
         }
-        findViewById(C2135R.C2137id.ink_text).setVisibility(8);
+        findViewById(R.id.ink_text).setVisibility(8);
         this.mInkView.setVisibility(8);
     }
 
@@ -1805,13 +1757,12 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
             setCancelable(false);
         }
 
-        /* access modifiers changed from: protected */
-        public void onCreate(Bundle bundle) {
+        protected void onCreate(Bundle bundle) {
             super.onCreate(bundle);
             requestWindowFeature(1);
             View inflate = getLayoutInflater().inflate(this.mLayoutId, (ViewGroup) null);
-            if (this.mLayoutId == C2135R.layout.maintain_executing_dialog) {
-                ((Button) inflate.findViewById(C2135R.C2137id.close_btn)).setOnClickListener(new View.OnClickListener() {
+            if (this.mLayoutId == R.layout.maintain_executing_dialog) {
+                ((Button) inflate.findViewById(R.id.close_btn)).setOnClickListener(new View.OnClickListener() {
                     public void onClick(View view) {
                         CustomProDialog.this.cancel();
                         MaintainActivity.this.interrupMaintainThread();
@@ -1822,51 +1773,49 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         }
     }
 
-    /* access modifiers changed from: private */
-    public void setButtonClickable(boolean z) {
+    private void setButtonClickable(boolean z) {
         this.mNozzleCheckView.setClickable(z);
         this.mHeadCleanView.setClickable(z);
         this.mFWUpdateView.setClickable(z);
         if (z) {
             if (!this.mIsNozzleCheckEnable.booleanValue()) {
-                this.mNozzleCheckText.setTextColor(this.mContext.getResources().getColor(C2135R.color.light_gray));
+                this.mNozzleCheckText.setTextColor(this.mContext.getResources().getColor(R.color.light_gray));
             } else {
-                this.mNozzleCheckText.setTextColor(this.mContext.getResources().getColor(C2135R.color.black));
+                this.mNozzleCheckText.setTextColor(this.mContext.getResources().getColor(R.color.black));
             }
-            this.mHeadCleanText.setTextColor(this.mContext.getResources().getColor(C2135R.color.black));
-            this.mFWUpdateText.setTextColor(this.mContext.getResources().getColor(C2135R.color.black));
+            this.mHeadCleanText.setTextColor(this.mContext.getResources().getColor(R.color.black));
+            this.mFWUpdateText.setTextColor(this.mContext.getResources().getColor(R.color.black));
             return;
         }
-        this.mNozzleCheckText.setTextColor(this.mContext.getResources().getColor(C2135R.color.light_gray));
-        this.mHeadCleanText.setTextColor(this.mContext.getResources().getColor(C2135R.color.light_gray));
-        this.mFWUpdateText.setTextColor(this.mContext.getResources().getColor(C2135R.color.light_gray));
+        this.mNozzleCheckText.setTextColor(this.mContext.getResources().getColor(R.color.light_gray));
+        this.mHeadCleanText.setTextColor(this.mContext.getResources().getColor(R.color.light_gray));
+        this.mFWUpdateText.setTextColor(this.mContext.getResources().getColor(R.color.light_gray));
     }
 
-    /* access modifiers changed from: private */
-    public void setEpsonConnectButton(int i) {
+    private void setEpsonConnectButton(int i) {
         switch (i) {
             case 0:
                 this.mEpsonConnectView.setClickable(true);
                 this.mEpsonConnectView.setEnabled(true);
-                ((TextView) findViewById(C2135R.C2137id.text_epson_connect)).setTextColor(this.mContext.getResources().getColor(C2135R.color.black));
-                ((ImageView) findViewById(C2135R.C2137id.epsonconnect_arrow)).setVisibility(0);
-                findViewById(C2135R.C2137id.epsonconnect_separator).setVisibility(0);
+                ((TextView) findViewById(R.id.text_epson_connect)).setTextColor(this.mContext.getResources().getColor(R.color.black));
+                ((ImageView) findViewById(R.id.epsonconnect_arrow)).setVisibility(0);
+                findViewById(R.id.epsonconnect_separator).setVisibility(0);
                 this.mEpsonConnectView.setVisibility(0);
                 return;
             case 1:
                 this.mEpsonConnectView.setClickable(false);
                 this.mEpsonConnectView.setEnabled(false);
-                ((TextView) findViewById(C2135R.C2137id.text_epson_connect)).setTextColor(this.mContext.getResources().getColor(C2135R.color.light_gray));
-                ((ImageView) findViewById(C2135R.C2137id.epsonconnect_arrow)).setVisibility(8);
-                findViewById(C2135R.C2137id.epsonconnect_separator).setVisibility(0);
+                ((TextView) findViewById(R.id.text_epson_connect)).setTextColor(this.mContext.getResources().getColor(R.color.light_gray));
+                ((ImageView) findViewById(R.id.epsonconnect_arrow)).setVisibility(8);
+                findViewById(R.id.epsonconnect_separator).setVisibility(0);
                 this.mEpsonConnectView.setVisibility(0);
                 return;
             case 2:
                 this.mEpsonConnectView.setClickable(false);
                 this.mEpsonConnectView.setEnabled(false);
-                ((TextView) findViewById(C2135R.C2137id.text_epson_connect)).setTextColor(this.mContext.getResources().getColor(C2135R.color.light_gray));
-                ((ImageView) findViewById(C2135R.C2137id.epsonconnect_arrow)).setVisibility(8);
-                findViewById(C2135R.C2137id.epsonconnect_separator).setVisibility(8);
+                ((TextView) findViewById(R.id.text_epson_connect)).setTextColor(this.mContext.getResources().getColor(R.color.light_gray));
+                ((ImageView) findViewById(R.id.epsonconnect_arrow)).setVisibility(8);
+                findViewById(R.id.epsonconnect_separator).setVisibility(8);
                 this.mEpsonConnectView.setVisibility(8);
                 return;
             default:
@@ -1914,7 +1863,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
     }
 
     private void showDialog(String str) {
-        DialogProgress newInstance = DialogProgress.newInstance(str, 0, getString(C2135R.string.str_wait));
+        DialogProgress newInstance = DialogProgress.newInstance(str, 0, getString(R.string.str_wait));
         newInstance.setCancelable(false);
         newInstance.show(getSupportFragmentManager(), str);
     }
@@ -1930,18 +1879,15 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         private NozzleCheckTask() {
         }
 
-        /* access modifiers changed from: protected */
-        public void onPreExecute() {
+        protected void onPreExecute() {
             MaintainActivity.this.showProDia();
         }
 
-        /* access modifiers changed from: protected */
-        public Integer doInBackground(Void... voidArr) {
+        protected Integer doInBackground(Void... voidArr) {
             return Integer.valueOf(MaintainActivity.this.mPrinter.doDoMainteCmd(3));
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(Integer num) {
+        protected void onPostExecute(Integer num) {
             MaintainActivity.this.cancelProDia();
             if (num.intValue() == 108) {
                 MaintainActivity.this.setupErrorMessage(10);

app/src/main/java/epson/maintain/activity/MaintainBuyInkOnlineRegTask.java

@@ -44,14 +44,12 @@ public class MaintainBuyInkOnlineRegTask extends AndroidViewModel {
     public void loadData(final int i, final String str) {
         final Application application = getApplication();
         new AsyncTask<Void, Void, Uri>() {
-            /* access modifiers changed from: protected */
-            public void onPreExecute() {
+            protected void onPreExecute() {
                 super.onPreExecute();
                 MaintainBuyInkOnlineRegTask.this.setReady(false);
             }
 
-            /* access modifiers changed from: protected */
-            public Uri doInBackground(Void... voidArr) {
+            protected Uri doInBackground(Void... voidArr) {
                 MaintainActivity.disableSimpleApAndWait(application, str);
                 if (i != 2) {
                     return BuyInkUrl.getBuyInkUri(application);
@@ -59,8 +57,7 @@ public class MaintainBuyInkOnlineRegTask extends AndroidViewModel {
                 return BuyInkUrl.getNozzleCheckGuidanceUri(application);
             }
 
-            /* access modifiers changed from: protected */
-            public void onPostExecute(Uri uri) {
+            protected void onPostExecute(Uri uri) {
                 super.onPostExecute(uri);
                 MaintainBuyInkOnlineRegTask.this.setUriEvent(uri);
                 MaintainBuyInkOnlineRegTask.this.setReady(true);
@@ -71,20 +68,17 @@ public class MaintainBuyInkOnlineRegTask extends AndroidViewModel {
     public void loadData(final String str) {
         final Application application = getApplication();
         new AsyncTask<Void, Void, Uri>() {
-            /* access modifiers changed from: protected */
-            public void onPreExecute() {
+            protected void onPreExecute() {
                 super.onPreExecute();
                 MaintainBuyInkOnlineRegTask.this.setReady(false);
             }
 
-            /* access modifiers changed from: protected */
-            public Uri doInBackground(Void... voidArr) {
+            protected Uri doInBackground(Void... voidArr) {
                 MaintainActivity.disableSimpleApAndWait(application, str);
                 return Uri.parse(BuyInkUrl.urlSupport(application, CommonDefine.URL_ONLINE_REGISTRATION));
             }
 
-            /* access modifiers changed from: protected */
-            public void onPostExecute(Uri uri) {
+            protected void onPostExecute(Uri uri) {
                 super.onPostExecute(uri);
                 MaintainBuyInkOnlineRegTask.this.setUriEvent(uri);
                 MaintainBuyInkOnlineRegTask.this.setReady(true);

app/src/main/java/epson/maintain/activity/MaintainPrinterSearchActivity.java

@@ -44,7 +44,7 @@ import epson.common.Constants;
 import epson.common.ExternalFileUtils;
 import epson.common.Utils;
 import epson.print.ActivityIACommon;
-import epson.print.C2135R;
+import epson.print.R;
 import epson.print.CustomTitleDialogFragment;
 import epson.print.EPPrinterManager;
 import epson.print.MyPrinter;
@@ -71,10 +71,8 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
     private static final int Menu_Delete = 1;
     private static final int Menu_Edit = 2;
     private static final String TAG = "MaintainPrinterSearchActivity";
-    /* access modifiers changed from: private */
-    public static final Object mLock = new Object();
-    /* access modifiers changed from: private */
-    public static escanLib mScanner = new escanLib();
+    private static final Object mLock = new Object();
+    private static escanLib mScanner = new escanLib();
     private final int BLE_SET_PRINTER = 15;
     private final int CANCEL_FIND_PRINTER = 2;
     private final int CONNECT_SIMPLEAP = 9;
@@ -98,25 +96,19 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
     private boolean bCheckWiFiStatus = false;
     private boolean bRejectLocationPermission = false;
     ListControlHelper helper = null;
-    /* access modifiers changed from: private */
-    public volatile boolean isFinishSearchPrinter = true;
-    /* access modifiers changed from: private */
-    public Boolean isFocused = true;
+    private volatile boolean isFinishSearchPrinter = true;
+    private Boolean isFocused = true;
     private boolean isJapaneseLocale = false;
-    /* access modifiers changed from: private */
-    public volatile boolean isSearchSimpleAp = false;
+    private volatile boolean isSearchSimpleAp = false;
     private AdapterView.AdapterContextMenuInfo listItemIndex;
     View mAboutRemoteButton;
     private boolean mActivityForegroundLifetime;
     Button mAddButton;
-    /* access modifiers changed from: private */
-    public RelativeLayout mBleButton;
+    private RelativeLayout mBleButton;
     private BLEUtility.BleWorkCallback mBleFind = null;
     AbstractListBuilder mBuilder;
-    /* access modifiers changed from: private */
-    public Context mContext = null;
-    /* access modifiers changed from: private */
-    public int mDeletePos = -1;
+    private Context mContext = null;
+    private int mDeletePos = -1;
     Handler mHandler = new Handler(new Handler.Callback() {
         /* JADX DEBUG: Multi-variable search result rejected for TypeSearchVarInfo{r8v46, resolved type: java.lang.Object} */
         /* JADX DEBUG: Multi-variable search result rejected for TypeSearchVarInfo{r2v19, resolved type: epson.print.MyPrinter} */
@@ -516,11 +508,9 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
     boolean mIsClickSelect = false;
     ViewGroup mLayout;
     private TextView mListEmptyMessageTextView;
-    /* access modifiers changed from: private */
-    public ListView mListView;
+    private ListView mListView;
     RadioButton mLocalButton;
-    /* access modifiers changed from: private */
-    public MaintainPrinter2 mPrinter = MaintainPrinter2.getInstance();
+    private MaintainPrinter2 mPrinter = MaintainPrinter2.getInstance();
     ProgressBar mProgressBar;
     RadioButton mRemoteButton;
     Button mSearchButton;
@@ -530,29 +520,26 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
     private String printerEmailAddress = "";
     private String printerId = "";
     private String printerKey = "";
-    /* access modifiers changed from: private */
-    public volatile int printer_location = 0;
+    private volatile int printer_location = 0;
     AsyncTask<Void, Void, Integer> probePrinterThread = null;
     WorkingDialog progress;
-    /* access modifiers changed from: private */
-    public SearchWiFiDirectPrinterTask searchWiFiDirectPrinter = null;
+    private SearchWiFiDirectPrinterTask searchWiFiDirectPrinter = null;
     WiFiDirectPrinterListUtils wiFiDirectPrinterListUtils = null;
 
     public void onLocalNegativeCallback(int i) {
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         if (Locale.getDefault().getLanguage().equalsIgnoreCase(Locale.JAPAN.getLanguage()) || Locale.getDefault().getLanguage().equalsIgnoreCase(Locale.JAPANESE.getLanguage())) {
             this.isJapaneseLocale = true;
         } else {
             this.isJapaneseLocale = false;
         }
-        this.mLayout = (ViewGroup) getLayoutInflater().inflate(C2135R.layout.search_printer_layout, (ViewGroup) null);
+        this.mLayout = (ViewGroup) getLayoutInflater().inflate(R.layout.search_printer_layout, (ViewGroup) null);
         addWiFiSetupButton();
         addAboutRemoteButton();
-        this.mListEmptyMessageTextView = (TextView) this.mLayout.findViewById(C2135R.C2137id.list_empty_message);
+        this.mListEmptyMessageTextView = (TextView) this.mLayout.findViewById(R.id.list_empty_message);
         this.mListView = (ListView) this.mLayout.findViewById(16908298);
         init();
         setContentView((View) this.mLayout);
@@ -561,11 +548,11 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         if (this.printer_location != 1) {
             displaySearchResult();
             this.mSearchButton.setVisibility(8);
-            ((TextView) this.mLayout.findViewById(C2135R.C2137id.empty)).setVisibility(8);
+            ((TextView) this.mLayout.findViewById(R.id.empty)).setVisibility(8);
         }
         setNotFoundPrinterButton();
         setBleWifiSetupButton();
-        setActionBar((int) C2135R.string.title_addprint, true);
+        setActionBar((int) R.string.title_addprint, true);
         requestLocationPermission();
     }
 
@@ -600,7 +587,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
     }
 
     private void setBleWifiSetupButton() {
-        this.mBleButton = (RelativeLayout) this.mLayout.findViewById(C2135R.C2137id.ble_wifi_setting);
+        this.mBleButton = (RelativeLayout) this.mLayout.findViewById(R.id.ble_wifi_setting);
         this.mBleButton.setVisibility(8);
         this.mBleButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
@@ -614,7 +601,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
     }
 
     private void setNotFoundPrinterButton() {
-        this.mLayout.findViewById(C2135R.C2137id.not_found_printer_epsonsn).setOnClickListener(new View.OnClickListener() {
+        this.mLayout.findViewById(R.id.not_found_printer_epsonsn).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 MaintainPrinterSearchActivity maintainPrinterSearchActivity = MaintainPrinterSearchActivity.this;
                 maintainPrinterSearchActivity.startActivity(PrinterNotFoundDialogCreator.getStartIntent(maintainPrinterSearchActivity.getApplicationContext()));
@@ -624,11 +611,11 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
 
     /* access modifiers changed from: package-private */
     public void addWiFiSetupButton() {
-        this.mWiFiSettingButton = this.mLayout.findViewById(C2135R.C2137id.rlWifiSettings);
+        this.mWiFiSettingButton = this.mLayout.findViewById(R.id.rlWifiSettings);
         if (this.isJapaneseLocale) {
-            ((TextView) this.mWiFiSettingButton).setText(C2135R.string.str_goto_wifidirect_settings);
+            ((TextView) this.mWiFiSettingButton).setText(R.string.str_goto_wifidirect_settings);
         } else {
-            ((TextView) this.mWiFiSettingButton).setText(C2135R.string.str_wifidirect_settings);
+            ((TextView) this.mWiFiSettingButton).setText(R.string.str_wifidirect_settings);
         }
         this.mWiFiSettingButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
@@ -637,14 +624,13 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         });
     }
 
-    /* access modifiers changed from: private */
-    public void startWifiPrinterSelect() {
+    private void startWifiPrinterSelect() {
         startActivityForResult(new Intent(this, ActivityWiFiDirectStart.class), 9);
     }
 
     /* access modifiers changed from: package-private */
     public void addAboutRemoteButton() {
-        this.mAboutRemoteButton = this.mLayout.findViewById(C2135R.C2137id.AboutRemoteFrame);
+        this.mAboutRemoteButton = this.mLayout.findViewById(R.id.AboutRemoteFrame);
         this.mAboutRemoteButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 MaintainPrinterSearchActivity.this.startActivity(new Intent("android.intent.action.VIEW", Uri.parse("https://www.epsonconnect.com/iguide/")));
@@ -652,23 +638,22 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         });
     }
 
-    /* access modifiers changed from: private */
-    public void buildElements() {
-        this.mSearchButton = (Button) this.mLayout.findViewById(C2135R.C2137id.function_button);
-        this.mProgressBar = (ProgressBar) this.mLayout.findViewById(C2135R.C2137id.progress_bar);
-        this.mAddButton = (Button) this.mLayout.findViewById(C2135R.C2137id.edit_button);
-        this.mTextDetail = (TextView) this.mLayout.findViewById(C2135R.C2137id.detail);
+    private void buildElements() {
+        this.mSearchButton = (Button) this.mLayout.findViewById(R.id.function_button);
+        this.mProgressBar = (ProgressBar) this.mLayout.findViewById(R.id.progress_bar);
+        this.mAddButton = (Button) this.mLayout.findViewById(R.id.edit_button);
+        this.mTextDetail = (TextView) this.mLayout.findViewById(R.id.detail);
         searchButtonSetEnabled(false);
         this.mProgressBar.setVisibility(0);
         this.mAddButton.setVisibility(8);
         this.mTextDetail.setVisibility(0);
         this.mWiFiSettingButton.setVisibility(0);
-        this.mLocalButton = (RadioButton) this.mLayout.findViewById(C2135R.C2137id.btn_local);
-        this.mIpButton = (RadioButton) this.mLayout.findViewById(C2135R.C2137id.btn_ip);
-        this.mRemoteButton = (RadioButton) this.mLayout.findViewById(C2135R.C2137id.btn_remote);
-        Utils.setDrawble2TextView(this, this.mLocalButton, C2135R.C2136drawable.printer_selector_icon_local);
-        Utils.setDrawble2TextView(this, this.mIpButton, C2135R.C2136drawable.printer_selector_icon_ip);
-        Utils.setDrawble2TextView(this, this.mRemoteButton, C2135R.C2136drawable.printer_selector_icon_remote);
+        this.mLocalButton = (RadioButton) this.mLayout.findViewById(R.id.btn_local);
+        this.mIpButton = (RadioButton) this.mLayout.findViewById(R.id.btn_ip);
+        this.mRemoteButton = (RadioButton) this.mLayout.findViewById(R.id.btn_remote);
+        Utils.setDrawble2TextView(this, this.mLocalButton, R.C2136drawable.printer_selector_icon_local);
+        Utils.setDrawble2TextView(this, this.mIpButton, R.C2136drawable.printer_selector_icon_ip);
+        Utils.setDrawble2TextView(this, this.mRemoteButton, R.C2136drawable.printer_selector_icon_remote);
         TextView textView = null;
         switch (this.printer_location) {
             case 1:
@@ -681,8 +666,8 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
                 this.helper = new ListControlHelper((PrinterInfoBuilder) this.mBuilder);
                 this.wiFiDirectPrinterListUtils = new WiFiDirectPrinterListUtils(this, this.mBuilder.getData(), this.helper, connectInfo);
                 this.mLocalButton.setChecked(true);
-                this.mTextDetail.setText(C2135R.string.str_detailtext_local);
-                this.mLayout.findViewById(C2135R.C2137id.not_found_printer_epsonsn).setVisibility(0);
+                this.mTextDetail.setText(R.string.str_detailtext_local);
+                this.mLayout.findViewById(R.id.not_found_printer_epsonsn).setVisibility(0);
                 RelativeLayout relativeLayout = this.mBleButton;
                 if (!(relativeLayout == null || relativeLayout.getTag() == null)) {
                     this.mBleButton.setVisibility(0);
@@ -690,15 +675,15 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
                 }
             case 2:
                 this.mAddButton.setVisibility(0);
-                this.mListEmptyMessageTextView.setText(C2135R.string.printer_list_empty_message);
+                this.mListEmptyMessageTextView.setText(R.string.printer_list_empty_message);
                 textView = this.mListEmptyMessageTextView;
                 this.mBuilder = new PrinterInfoECBuilder(getBaseContext(), this.mLayout);
                 this.mBuilder.setResource(this.printerEmailAddress);
                 this.mRemoteButton.setChecked(true);
-                this.mTextDetail.setText(C2135R.string.str_detailtext_remote);
+                this.mTextDetail.setText(R.string.str_detailtext_remote);
                 this.mSearchButton.setVisibility(8);
                 this.mWiFiSettingButton.setVisibility(8);
-                this.mLayout.findViewById(C2135R.C2137id.not_found_printer_epsonsn).setVisibility(8);
+                this.mLayout.findViewById(R.id.not_found_printer_epsonsn).setVisibility(8);
                 RelativeLayout relativeLayout2 = this.mBleButton;
                 if (relativeLayout2 != null) {
                     relativeLayout2.setVisibility(8);
@@ -707,15 +692,15 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
                 break;
             case 3:
                 this.mAddButton.setVisibility(0);
-                this.mListEmptyMessageTextView.setText(C2135R.string.printer_list_empty_message);
+                this.mListEmptyMessageTextView.setText(R.string.printer_list_empty_message);
                 textView = this.mListEmptyMessageTextView;
                 this.mBuilder = new PrinterInfoIpBuilder(getBaseContext(), this.mLayout, 0);
                 this.mBuilder.setResource(this.printerKey);
                 this.mIpButton.setChecked(true);
-                this.mTextDetail.setText(C2135R.string.str_detailtext_ip);
+                this.mTextDetail.setText(R.string.str_detailtext_ip);
                 this.mSearchButton.setVisibility(8);
                 this.mWiFiSettingButton.setVisibility(8);
-                this.mLayout.findViewById(C2135R.C2137id.not_found_printer_epsonsn).setVisibility(8);
+                this.mLayout.findViewById(R.id.not_found_printer_epsonsn).setVisibility(8);
                 RelativeLayout relativeLayout3 = this.mBleButton;
                 if (relativeLayout3 != null) {
                     relativeLayout3.setVisibility(8);
@@ -774,21 +759,21 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
                 switch (MaintainPrinterSearchActivity.this.printer_location) {
                     case 2:
                         if (MaintainPrinterSearchActivity.this.mBuilder.getData().size() >= 32) {
-                            new AlertDialog.Builder(MaintainPrinterSearchActivity.this.mContext).setCancelable(false).setTitle(MaintainPrinterSearchActivity.this.getString(C2135R.string.epsonconnect_err_regist_remote_printer_max_size_title)).setMessage(MaintainPrinterSearchActivity.this.getString(C2135R.string.epsonconnect_err_regist_remote_printer_max_size)).setPositiveButton(MaintainPrinterSearchActivity.this.getString(C2135R.string.str_yes), new DialogInterface.OnClickListener() {
+                            new AlertDialog.Builder(MaintainPrinterSearchActivity.this.mContext).setCancelable(false).setTitle(MaintainPrinterSearchActivity.this.getString(R.string.epsonconnect_err_regist_remote_printer_max_size_title)).setMessage(MaintainPrinterSearchActivity.this.getString(R.string.epsonconnect_err_regist_remote_printer_max_size)).setPositiveButton(MaintainPrinterSearchActivity.this.getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialogInterface, int i) {
                                 }
                             }).show();
                             return;
                         } else if (MaintainPrinterSearchActivity.this.getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).getBoolean(Constants.ENABLE_SHOW_WARNING, true)) {
                             AlertDialog.Builder cancelable = new AlertDialog.Builder(MaintainPrinterSearchActivity.this.mContext).setCancelable(false);
-                            cancelable.setMessage(MaintainPrinterSearchActivity.this.getString(C2135R.string.epsonconnect_str_remote_print_warning) + "\n\n" + MaintainPrinterSearchActivity.this.getString(C2135R.string.epsonconnect_str_remote_print_warning2)).setPositiveButton(MaintainPrinterSearchActivity.this.getString(C2135R.string.str_yes), new DialogInterface.OnClickListener() {
+                            cancelable.setMessage(MaintainPrinterSearchActivity.this.getString(R.string.epsonconnect_str_remote_print_warning) + "\n\n" + MaintainPrinterSearchActivity.this.getString(R.string.epsonconnect_str_remote_print_warning2)).setPositiveButton(MaintainPrinterSearchActivity.this.getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialogInterface, int i) {
                                     Message message = new Message();
                                     message.what = 7;
                                     message.obj = null;
                                     MaintainPrinterSearchActivity.this.mHandler.sendMessage(message);
                                 }
-                            }).setNegativeButton(MaintainPrinterSearchActivity.this.getString(C2135R.string.str_no), new DialogInterface.OnClickListener() {
+                            }).setNegativeButton(MaintainPrinterSearchActivity.this.getString(R.string.str_no), new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialogInterface, int i) {
                                 }
                             }).show();
@@ -802,7 +787,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
                         }
                     case 3:
                         if (MaintainPrinterSearchActivity.this.mBuilder.getData().size() >= 32) {
-                            new AlertDialog.Builder(MaintainPrinterSearchActivity.this.mContext).setCancelable(false).setTitle(MaintainPrinterSearchActivity.this.getString(C2135R.string.epsonconnect_err_regist_remote_printer_max_size_title)).setMessage(MaintainPrinterSearchActivity.this.getString(C2135R.string.epsonconnect_err_regist_remote_printer_max_size)).setPositiveButton(MaintainPrinterSearchActivity.this.getString(C2135R.string.str_yes), new DialogInterface.OnClickListener() {
+                            new AlertDialog.Builder(MaintainPrinterSearchActivity.this.mContext).setCancelable(false).setTitle(MaintainPrinterSearchActivity.this.getString(R.string.epsonconnect_err_regist_remote_printer_max_size_title)).setMessage(MaintainPrinterSearchActivity.this.getString(R.string.epsonconnect_err_regist_remote_printer_max_size)).setPositiveButton(MaintainPrinterSearchActivity.this.getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialogInterface, int i) {
                                 }
                             }).show();
@@ -829,7 +814,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
             public void onClick(View view) {
                 if (MaintainPrinterSearchActivity.this.printer_location != 1) {
                     MaintainPrinterSearchActivity.this.mAddButton.setVisibility(8);
-                    ((TextView) MaintainPrinterSearchActivity.this.mLayout.findViewById(C2135R.C2137id.empty)).setVisibility(0);
+                    ((TextView) MaintainPrinterSearchActivity.this.mLayout.findViewById(R.id.empty)).setVisibility(0);
                     MaintainPrinterSearchActivity.this.interruptSearch();
                     int unused = MaintainPrinterSearchActivity.this.printer_location = 1;
                     MaintainPrinterSearchActivity.this.buildElements();
@@ -842,7 +827,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
                 if (MaintainPrinterSearchActivity.this.printer_location != 2) {
                     int unused = MaintainPrinterSearchActivity.this.printer_location = 2;
                     MaintainPrinterSearchActivity.this.interruptSearch();
-                    ((TextView) MaintainPrinterSearchActivity.this.mLayout.findViewById(C2135R.C2137id.empty)).setVisibility(8);
+                    ((TextView) MaintainPrinterSearchActivity.this.mLayout.findViewById(R.id.empty)).setVisibility(8);
                     MaintainPrinterSearchActivity.this.mBuilder.refresh();
                     MaintainPrinterSearchActivity.this.buildElements();
                     MaintainPrinterSearchActivity.this.displaySearchResult();
@@ -855,7 +840,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
                 if (MaintainPrinterSearchActivity.this.printer_location != 3) {
                     int unused = MaintainPrinterSearchActivity.this.printer_location = 3;
                     MaintainPrinterSearchActivity.this.interruptSearch();
-                    ((TextView) MaintainPrinterSearchActivity.this.mLayout.findViewById(C2135R.C2137id.empty)).setVisibility(8);
+                    ((TextView) MaintainPrinterSearchActivity.this.mLayout.findViewById(R.id.empty)).setVisibility(8);
                     MaintainPrinterSearchActivity.this.mBuilder.refresh();
                     MaintainPrinterSearchActivity.this.buildElements();
                     MaintainPrinterSearchActivity.this.displaySearchResult();
@@ -867,9 +852,9 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
 
     public void onCreateContextMenu(ContextMenu contextMenu, View view, ContextMenu.ContextMenuInfo contextMenuInfo) {
         super.onCreateContextMenu(contextMenu, view, contextMenuInfo);
-        contextMenu.setHeaderTitle(C2135R.string.str_edit_bookmark);
-        contextMenu.add(0, 1, 0, C2135R.string.str_delete);
-        contextMenu.add(0, 2, 0, C2135R.string.str_edit_bookmark);
+        contextMenu.setHeaderTitle(R.string.str_edit_bookmark);
+        contextMenu.add(0, 1, 0, R.string.str_delete);
+        contextMenu.add(0, 2, 0, R.string.str_edit_bookmark);
     }
 
     public boolean onContextItemSelected(MenuItem menuItem) {
@@ -879,13 +864,13 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         }
         switch (menuItem.getItemId()) {
             case 1:
-                new AlertDialog.Builder(this.mContext).setCancelable(false).setTitle(getString(C2135R.string.delete_file)).setIcon(getResources().getDrawable(C2135R.C2136drawable.delete_file)).setNegativeButton(getString(C2135R.string.str_ok), new DialogInterface.OnClickListener() {
+                new AlertDialog.Builder(this.mContext).setCancelable(false).setTitle(getString(R.string.delete_file)).setIcon(getResources().getDrawable(R.C2136drawable.delete_file)).setNegativeButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         Message obtainMessage = MaintainPrinterSearchActivity.this.mHandler.obtainMessage();
                         obtainMessage.what = 6;
                         MaintainPrinterSearchActivity.this.mHandler.sendMessageDelayed(obtainMessage, 100);
                     }
-                }).setPositiveButton(getString(C2135R.string.str_cancel), new DialogInterface.OnClickListener() {
+                }).setPositiveButton(getString(R.string.str_cancel), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                     }
                 }).show();
@@ -907,8 +892,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         return true;
     }
 
-    /* access modifiers changed from: protected */
-    public void onDestroy() {
+    protected void onDestroy() {
         this.mBuilder.destructor();
         super.onDestroy();
     }
@@ -921,8 +905,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         finish();
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         this.mActivityForegroundLifetime = true;
         super.onResume();
         EpLog.m78i(TAG, "onResume()");
@@ -938,8 +921,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         EpLog.m76i();
         super.onPause();
         this.mActivityForegroundLifetime = false;
@@ -948,19 +930,16 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         removeAllDialog();
     }
 
-    /* access modifiers changed from: protected */
-    public void onStart() {
+    protected void onStart() {
         super.onStart();
     }
 
-    /* access modifiers changed from: protected */
-    public void onStop() {
+    protected void onStop() {
         EpLog.m76i();
         super.onStop();
     }
 
-    /* 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);
         interruptSearch();
         switch (i) {
@@ -1013,8 +992,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         }
     }
 
-    /* access modifiers changed from: private */
-    public void search() {
+    private void search() {
         interruptSearch();
         synchronized (mLock) {
             this.mBuilder.refresh();
@@ -1024,7 +1002,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         this.isFinishSearchPrinter = false;
         searchButtonSetEnabled(false);
         this.mProgressBar.setVisibility(0);
-        ((TextView) this.mLayout.findViewById(C2135R.C2137id.empty)).setText(getString(C2135R.string.searching_text));
+        ((TextView) this.mLayout.findViewById(R.id.empty)).setText(getString(R.string.searching_text));
         this.isFocused = true;
         if (WiFiDirectManager.getCurSSID(this) != null) {
             this.mHandler.sendEmptyMessageDelayed(13, 5000);
@@ -1203,7 +1181,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         if (!this.mIsClickSelect) {
             boolean z = false;
             if (this.mBuilder.getData().size() <= 0) {
-                ((TextView) this.mLayout.findViewById(C2135R.C2137id.empty)).setText(C2135R.string.str_printer_search_result_none);
+                ((TextView) this.mLayout.findViewById(R.id.empty)).setText(R.string.str_printer_search_result_none);
                 if (this.printer_location == 1 && this.mActivityForegroundLifetime) {
                     if (WiFiDirectManager.getCurSSID(this) == null) {
                         z = true;
@@ -1211,25 +1189,24 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
                     PrinterNotFoundDialogCreator.getPrinterNotFoundDialog(this, z, 1).show(getSupportFragmentManager(), DIALOG_TAG_PRINTER_NOT_FOUND);
                 }
             } else if (Locale.getDefault().getLanguage().equalsIgnoreCase(Locale.JAPAN.getLanguage()) || Locale.getDefault().getLanguage().equalsIgnoreCase(Locale.JAPANESE.getLanguage())) {
-                ((TextView) this.mLayout.findViewById(C2135R.C2137id.empty)).setText(getString(C2135R.string.numberOfPrintersAvailable));
+                ((TextView) this.mLayout.findViewById(R.id.empty)).setText(getString(R.string.numberOfPrintersAvailable));
             } else {
-                ((TextView) this.mLayout.findViewById(C2135R.C2137id.empty)).setText(String.format(getString(C2135R.string.numberOfPrintersAvailable), new Object[]{Integer.valueOf(this.mBuilder.getData().size())}));
+                ((TextView) this.mLayout.findViewById(R.id.empty)).setText(String.format(getString(R.string.numberOfPrintersAvailable), new Object[]{Integer.valueOf(this.mBuilder.getData().size())}));
             }
         }
         this.mProgressBar.setVisibility(8);
         searchButtonSetEnabled(true);
     }
 
-    /* access modifiers changed from: protected */
-    public Dialog onCreateDialog(int i) {
+    protected Dialog onCreateDialog(int i) {
         String str;
         Dialog onCreateDialog = super.onCreateDialog(i);
-        if (i != C2135R.string.EPS_ERR_PRINTER_NOT_FOUND_RESEARCH) {
+        if (i != R.string.EPS_ERR_PRINTER_NOT_FOUND_RESEARCH) {
             switch (i) {
-                case C2135R.string.EPS_PRNERR_COMM1 /*2131624360*/:
-                    return Utils.makeMessageBox(this, getString(C2135R.string.EPS_ERR_PRINTER_NOT_FOUND_TITLE), getString(i), getString(C2135R.string.str_ok));
-                case C2135R.string.EPS_PRNERR_COMM1_NOWIFI /*2131624361*/:
-                    return Utils.makeMessageBox(this, getString(C2135R.string.EPS_ERR_PRINTER_NOT_FOUND_TITLE), getString(C2135R.string.EPS_PRNERR_COMM1_NOWIFI), getString(C2135R.string.str_ok));
+                case R.string.EPS_PRNERR_COMM1 /*2131624360*/:
+                    return Utils.makeMessageBox(this, getString(R.string.EPS_ERR_PRINTER_NOT_FOUND_TITLE), getString(i), getString(R.string.str_ok));
+                case R.string.EPS_PRNERR_COMM1_NOWIFI /*2131624361*/:
+                    return Utils.makeMessageBox(this, getString(R.string.EPS_ERR_PRINTER_NOT_FOUND_TITLE), getString(R.string.EPS_PRNERR_COMM1_NOWIFI), getString(R.string.str_ok));
                 default:
                     return onCreateDialog;
             }
@@ -1237,11 +1214,11 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
             String string = getString(i);
             String ssid = Utils.getSSID(this);
             if (!Utils.isConnectedWifi(this) || ssid == null) {
-                str = getString(C2135R.string.EPS_PRNERR_COMM4);
+                str = getString(R.string.EPS_PRNERR_COMM4);
             } else {
                 str = String.format(string, new Object[]{ssid});
             }
-            return Utils.makeMessageBox(this, getString(C2135R.string.EPS_ERR_PRINTER_NOT_FOUND_TITLE), str, getString(C2135R.string.str_ok));
+            return Utils.makeMessageBox(this, getString(R.string.EPS_ERR_PRINTER_NOT_FOUND_TITLE), str, getString(R.string.str_ok));
         }
     }
 

app/src/main/java/epson/maintain/activity/NozzleGuidanceDialog.java

@@ -9,18 +9,18 @@ import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
-import epson.print.C2135R;
+import epson.print.R;
 
 public class NozzleGuidanceDialog extends DialogFragment {
     public Dialog onCreateDialog(Bundle bundle) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        View inflate = getActivity().getLayoutInflater().inflate(C2135R.layout.dialog_nozzle_check_guidance, (ViewGroup) null);
-        ((Button) inflate.findViewById(C2135R.C2137id.close_button)).setOnClickListener(new View.OnClickListener() {
+        View inflate = getActivity().getLayoutInflater().inflate(R.layout.dialog_nozzle_check_guidance, (ViewGroup) null);
+        ((Button) inflate.findViewById(R.id.close_button)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 NozzleGuidanceDialog.this.dismiss();
             }
         });
-        ((Button) inflate.findViewById(C2135R.C2137id.browse_button)).setOnClickListener(new View.OnClickListener() {
+        ((Button) inflate.findViewById(R.id.browse_button)).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
                 NozzleGuidanceDialog.this.startBrowser();
                 NozzleGuidanceDialog.this.dismiss();
@@ -37,8 +37,7 @@ public class NozzleGuidanceDialog extends DialogFragment {
         return create;
     }
 
-    /* access modifiers changed from: private */
-    public void startBrowser() {
+    private void startBrowser() {
         MaintainActivity maintainActivity = (MaintainActivity) getActivity();
         if (maintainActivity != null) {
             maintainActivity.startBrowseNozzleCheckGuidance();

app/src/main/java/epson/maintain/activity/PrinterNotFoundDialogCreator.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import epson.common.Utils;
-import epson.print.C2135R;
+import epson.print.R;
 import epson.print.CommonDefine;
 import epson.print.CustomLayoutDialogFragment;
 
@@ -12,20 +12,20 @@ public class PrinterNotFoundDialogCreator {
     public static CustomLayoutDialogFragment getPrinterNotFoundDialog(Context context, boolean z, int i) {
         String str;
         if (z) {
-            str = context.getString(C2135R.string.EPS_PRNERR_COMM1_NOWIFI);
+            str = context.getString(R.string.EPS_PRNERR_COMM1_NOWIFI);
         } else if (Utils.getPrefBoolean(context, "PrintSetting", CommonDefine.RE_SEARCH)) {
             String ssid = Utils.getSSID(context);
             if (!Utils.isConnectedWifi(context) || ssid == null) {
-                return CustomLayoutDialogFragment.newInstance(i, context.getString(C2135R.string.EPS_PRNERR_COMM4), (int) C2135R.string.EPS_ERR_PRINTER_NOT_FOUND_TITLE, 0, (int) C2135R.string.str_btn_close);
+                return CustomLayoutDialogFragment.newInstance(i, context.getString(R.string.EPS_PRNERR_COMM4), (int) R.string.EPS_ERR_PRINTER_NOT_FOUND_TITLE, 0, (int) R.string.str_btn_close);
             }
-            str = context.getString(C2135R.string.EPS_ERR_PRINTER_NOT_FOUND_RESEARCH2, new Object[]{ssid});
+            str = context.getString(R.string.EPS_ERR_PRINTER_NOT_FOUND_RESEARCH2, new Object[]{ssid});
         } else {
-            str = context.getString(C2135R.string.EPS_PRNERR_COMM1);
+            str = context.getString(R.string.EPS_PRNERR_COMM1);
         }
-        return CustomLayoutDialogFragment.newInstance(i, str + "\n\n" + context.getString(C2135R.string.confirm_browse_wlan_setup_info), (int) C2135R.string.EPS_ERR_PRINTER_NOT_FOUND_TITLE, (int) C2135R.string.browse_site, (int) C2135R.string.str_btn_close);
+        return CustomLayoutDialogFragment.newInstance(i, str + "\n\n" + context.getString(R.string.confirm_browse_wlan_setup_info), (int) R.string.EPS_ERR_PRINTER_NOT_FOUND_TITLE, (int) R.string.browse_site, (int) R.string.str_btn_close);
     }
 
     public static Intent getStartIntent(Context context) {
-        return new Intent("android.intent.action.VIEW", Uri.parse(context.getString(C2135R.string.printer_not_found_guidance_url)));
+        return new Intent("android.intent.action.VIEW", Uri.parse(context.getString(R.string.printer_not_found_guidance_url)));
     }
 }