a

app/src/main/AndroidManifest.xml

@@ -609,8 +609,6 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths_scannedfile" />
         </provider>
-
-
         <meta-data
             android:name="com.epson.iprint.prtlogger2.queryserver"
             android:value="0" />

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

@@ -3,7 +3,7 @@ package com.epson.cameracopy.printlayout;
 import android.os.Parcel;
 import android.os.Parcelable;
 
-import android.support.annotation.VisibleForTesting;
+
 
 import com.epson.cameracopy.alt.SimpleBmpMerger;
 

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

@@ -330,9 +330,9 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
             }
             if (str2.equals("do_dismiss")) {
                 cropImageActivity.dismissDialog(str);
-                EpLog.m69d("dismissDialog");
+                EpLog.d("dismissDialog");
                 if (cropImageActivity.mCropImageMessageShow) {
-                    EpLog.m69d("TOAST");
+                    EpLog.d("TOAST");
                     cropImageActivity.mCropImageMessageShow = false;
                     cropImageActivity.ToastMessage(cropImageActivity.getString(R.string.crop_image_message));
                 }
@@ -366,7 +366,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
 
     private void CancelToast() {
         if (mCustomToast != null) {
-            EpLog.m69d(" Toast Cancel");
+            EpLog.d(" Toast Cancel");
             mCustomToast.cancel();
             mCustomToast = null;
         }
@@ -775,7 +775,7 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
                 }).start();
                 return;
             case MSG_PREVIEW_LOAD_FINISH /*912*/:
-                EpLog.m69d("MSG_PREVIEW_LOAD_FINISH");
+                EpLog.d("MSG_PREVIEW_LOAD_FINISH");
                 if (mBitmapPreview != null) {
                     mImageCollectView.SetPreviewBitmapAndCropData(mBitmapPreview, mImageCollect.GetCornerPoints());
                 }
@@ -1222,17 +1222,17 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
         }
 
         public void show() {
-            EpLog.m69d("show :");
+            EpLog.d("show :");
             if (!mBreak) {
-                EpLog.m69d("run:show");
+                EpLog.d("run:show");
                 mToast.show();
                 return;
             }
-            EpLog.m69d("run:break");
+            EpLog.d("run:break");
         }
 
         public void cancel() {
-            EpLog.m69d("cancel");
+            EpLog.d("cancel");
             mBreak = true;
             mToast.cancel();
         }

app/src/main/java/com/epson/iprint/prtlogger/LoggerRecord.java

@@ -3,7 +3,7 @@ package com.epson.iprint.prtlogger;
 import android.content.Context;
 import android.content.SharedPreferences;
 
-import android.support.annotation.VisibleForTesting;
+
 
 public class LoggerRecord {
     private static final String ANALYTICS_PREFS_NAME = "logger6_3";

app/src/main/java/com/epson/iprint/shared/EpsoniPrintSharedActivity.java

@@ -153,8 +153,7 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public boolean CheckAction(String str) throws SharedDataException {
+    private boolean CheckAction(String str) throws SharedDataException {
         if (str.equals(ACTION_PHOTO_PRINT) || str.equals(ACTION_SCAN) || str.equals(ACTION_WEB_PRINT) || str.equals(GET_PRINTER_INFORMATION) || str.equals(ACTION_CONFIRM_PRINTER_SCANNER_SELECTION)) {
             return true;
         }

app/src/main/java/com/epson/iprint/storage/StorageActivity.java

@@ -46,18 +46,15 @@ class StorageActivity extends ActivityIACommon {
             show((String) null, (CancelRequestCallback) null);
         }
 
-        /* access modifiers changed from: package-private */
-        public void show(String str) {
+        private void show(String str) {
             show(str, (CancelRequestCallback) null);
         }
 
-        /* access modifiers changed from: package-private */
-        public void show(String str, CancelRequestCallback cancelRequestCallback) {
+        private void show(String str, CancelRequestCallback cancelRequestCallback) {
             show(str, cancelRequestCallback, true);
         }
 
-        /* access modifiers changed from: package-private */
-        public void show(String str, CancelRequestCallback cancelRequestCallback, boolean z) {
+        private void show(String str, CancelRequestCallback cancelRequestCallback, boolean z) {
             Intent intent = new Intent(StorageActivity.this, StorageWaitingActivity.class);
             intent.putExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, this.mRequestCode);
             if (str != null) {
@@ -77,16 +74,14 @@ class StorageActivity extends ActivityIACommon {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public void changeMessage(String str) {
+        private void changeMessage(String str) {
             Intent intent = new Intent(StorageWaitingActivity.CHANGE_ACTION);
             intent.putExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, this.mRequestCode);
             intent.putExtra(StorageWaitingActivity.EXTRA_MESSAGE, str);
             StorageActivity.this.sendBroadcast(intent);
         }
 
-        /* access modifiers changed from: package-private */
-        public void registerCancelCallback(CancelRequestCallback cancelRequestCallback) {
+        private void registerCancelCallback(CancelRequestCallback cancelRequestCallback) {
             Intent intent = new Intent(StorageWaitingActivity.REGISTER_ACTION);
             intent.putExtra(StorageWaitingActivity.EXTRA_REQUEST_CODE, this.mRequestCode);
             intent.putExtra(StorageWaitingActivity.EXTRA_CANCEL_ENABLED, true);
@@ -101,8 +96,7 @@ class StorageActivity extends ActivityIACommon {
             setCancelReceiver((BroadcastReceiver) null);
         }
 
-        /* access modifiers changed from: package-private */
-        public void setCancelReceiver(BroadcastReceiver broadcastReceiver) {
+        private void setCancelReceiver(BroadcastReceiver broadcastReceiver) {
             BroadcastReceiver broadcastReceiver2 = this.mCancelReceiver;
             if (broadcastReceiver2 != null) {
                 StorageActivity.this.unregisterReceiver(broadcastReceiver2);
@@ -110,8 +104,7 @@ class StorageActivity extends ActivityIACommon {
             this.mCancelReceiver = broadcastReceiver;
         }
 
-        /* access modifiers changed from: package-private */
-        public void registerCancelRequestReceiver(final CancelRequestCallback cancelRequestCallback) {
+        private void registerCancelRequestReceiver(final CancelRequestCallback cancelRequestCallback) {
             C09221 r0 = new BroadcastReceiver() {
                 public void onReceive(Context context, Intent intent) {
                     String action = intent.getAction();
@@ -131,18 +124,15 @@ class StorageActivity extends ActivityIACommon {
         showErrorDialog(str, (Intent) null);
     }
 
-    /* access modifiers changed from: package-private */
-    public void showErrorDialog(int i) {
+    private void showErrorDialog(int i) {
         showErrorDialog(getString(i));
     }
 
-    /* access modifiers changed from: package-private */
-    public void showConnectionError() {
+    private void showConnectionError() {
         showErrorDialog(getString(R.string.network_error_mes), new Intent("android.settings.WIRELESS_SETTINGS"));
     }
 
-    /* access modifiers changed from: package-private */
-    public void showErrorDialog(String str, final Intent intent) {
+    private void showErrorDialog(String str, final Intent intent) {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setMessage(str);
         builder.setCancelable(false);
@@ -159,8 +149,7 @@ class StorageActivity extends ActivityIACommon {
         builder.create().show();
     }
 
-    /* access modifiers changed from: package-private */
-    public void showErrorDialogAndFinish(String str) {
+    private void showErrorDialogAndFinish(String str) {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setMessage(str);
         builder.setCancelable(false);
@@ -180,13 +169,11 @@ class StorageActivity extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void bindClearButton(int i, int i2) {
+    private void bindClearButton(int i, int i2) {
         bindClearButton(i, i2, (OnVisibilityListener) null);
     }
 
-    /* access modifiers changed from: package-private */
-    public void bindClearButton(int i, int i2, final OnVisibilityListener onVisibilityListener) {
+    private void bindClearButton(int i, int i2, final OnVisibilityListener onVisibilityListener) {
         final EditText editText = (EditText) findViewById(i);
         final Button button = (Button) findViewById(i2);
         editText.addTextChangedListener(new TextWatcher() {
@@ -226,13 +213,11 @@ class StorageActivity extends ActivityIACommon {
         return false;
     }
 
-    /* access modifiers changed from: package-private */
-    public void setInputMaxLength(EditText editText, int i) {
+    private void setInputMaxLength(EditText editText, int i) {
         editText.setFilters(new InputFilter[]{new InputFilter.LengthFilter(i)});
     }
 
-    /* access modifiers changed from: package-private */
-    public void setTitle(String str) {
+    private void setTitle(String str) {
         super.setTitle(str);
     }
 }

app/src/main/java/com/epson/iprint/storage/StorageItem.java

@@ -49,8 +49,7 @@ public class StorageItem {
         this.userInfo = obj;
     }
 
-    /* access modifiers changed from: package-private */
-    public String getDownloadLocalPath(Context context) {
+    private String getDownloadLocalPath(Context context) {
         File file = new File(ExternalFileUtils.getInstance(context).getDownloadDir());
         if (!file.exists()) {
             file.mkdirs();

app/src/main/java/com/epson/iprint/storage/StorageProcessActivity.java

@@ -27,11 +27,9 @@ public abstract class StorageProcessActivity extends StorageActivity {
         SIGNED_OUT
     }
 
-    /* access modifiers changed from: package-private */
-    public abstract void onSignInStatus(SignInStatus signInStatus);
+    private abstract void onSignInStatus(SignInStatus signInStatus);
 
-    /* access modifiers changed from: package-private */
-    public abstract void onUpdateProcessView();
+    private abstract void onUpdateProcessView();
 
     public /* bridge */ /* synthetic */ boolean isConnected() {
         return super.isConnected();
@@ -115,8 +113,7 @@ public abstract class StorageProcessActivity extends StorageActivity {
         onSignInStatus(signInStatus);
     }
 
-    /* access modifiers changed from: package-private */
-    public void setSignInButtonEnabled(boolean z) {
+    private void setSignInButtonEnabled(boolean z) {
         this.bEnableSighIn = z;
         invalidateOptionsMenu();
     }

app/src/main/java/com/epson/iprint/storage/StorageProcessDownloadActivity.java

@@ -92,8 +92,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void onSignInStatus(StorageProcessActivity.SignInStatus signInStatus) {
+    private void onSignInStatus(StorageProcessActivity.SignInStatus signInStatus) {
         if (signInStatus == StorageProcessActivity.SignInStatus.SIGNED_IN) {
             this.mListView.setVisibility(0);
             return;
@@ -124,8 +123,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         this.mIsDownloadInterruption = false;
     }
 
-    /* access modifiers changed from: package-private */
-    public void onUpdateProcessView() {
+    private void onUpdateProcessView() {
         if (this.mListView.getAdapter() != null) {
             return;
         }
@@ -422,8 +420,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
             this.viewCache = new HashMap<>();
         }
 
-        /* access modifiers changed from: package-private */
-        public void setViewComponents(View view, String str, int i, int i2) {
+        private void setViewComponents(View view, String str, int i, int i2) {
             ((TextView) view.findViewById(R.id.file_folder_name)).setText(str);
             ImageView imageView = (ImageView) view.findViewById(R.id.file_folder_icon);
             if (i == -12345) {
@@ -441,20 +438,17 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
             imageView2.setVisibility(0);
         }
 
-        /* access modifiers changed from: package-private */
-        public void setTaskingStatus(boolean z) {
+        private void setTaskingStatus(boolean z) {
             this.taskRunningNow = z;
         }
 
-        /* access modifiers changed from: package-private */
-        public void addLoaedMoreItems(List<StorageItem> list) {
+        private void addLoaedMoreItems(List<StorageItem> list) {
             List<StorageItem> list2 = this.storageItems;
             list2.remove(list2.size() - 1);
             this.storageItems.addAll(list);
         }
 
-        /* access modifiers changed from: package-private */
-        public ImageView getIconView(View view) {
+        private ImageView getIconView(View view) {
             return (ImageView) view.findViewById(R.id.file_folder_icon);
         }
     }

app/src/main/java/com/epson/iprint/storage/StorageProcessUploadActivity.java

@@ -33,8 +33,7 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
     List<String> mUploadFileLocalPathList;
     String mUploadFilename;
 
-    /* access modifiers changed from: package-private */
-    public void onUpdateProcessView() {
+    private void onUpdateProcessView() {
     }
 
     /* access modifiers changed from: protected */
@@ -91,8 +90,7 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
         this.mUploadFilename = bundle.getString("Upload.Editing.Filename");
     }
 
-    /* access modifiers changed from: package-private */
-    public void onSignInStatus(StorageProcessActivity.SignInStatus signInStatus) {
+    private void onSignInStatus(StorageProcessActivity.SignInStatus signInStatus) {
         updateUploadSection(signInStatus);
         updateSaveButton(signInStatus);
     }
@@ -209,8 +207,7 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void updateUploadSection(StorageProcessActivity.SignInStatus signInStatus) {
+    private void updateUploadSection(StorageProcessActivity.SignInStatus signInStatus) {
         ViewGroup viewGroup = (ViewGroup) findViewById(R.id.upload_file_name_file_type_section);
         if (signInStatus == StorageProcessActivity.SignInStatus.SIGNED_IN) {
             viewGroup.setVisibility(0);
@@ -225,13 +222,11 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
         viewGroup.setVisibility(4);
     }
 
-    /* access modifiers changed from: package-private */
-    public void updateSaveButton(StorageProcessActivity.SignInStatus signInStatus) {
+    private void updateSaveButton(StorageProcessActivity.SignInStatus signInStatus) {
         setEnabledSaveButton(signInStatus == StorageProcessActivity.SignInStatus.SIGNED_IN);
     }
 
-    /* access modifiers changed from: package-private */
-    public void setEnabledSaveButton(boolean z) {
+    private void setEnabledSaveButton(boolean z) {
         Button button = (Button) findViewById(R.id.save_button);
         if (z) {
             button.setEnabled(true);
@@ -240,29 +235,24 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public String getFilename() {
+    private String getFilename() {
         return ((TextView) findViewById(R.id.upload_dialog_file_name)).getText().toString();
     }
 
-    /* access modifiers changed from: package-private */
-    public void setFilename(String str) {
+    private void setFilename(String str) {
         ((EditText) findViewById(R.id.upload_dialog_file_name)).setText(str);
     }
 
-    /* access modifiers changed from: package-private */
-    public StorageServiceClient.UploadFileType getFiletype() {
+    private StorageServiceClient.UploadFileType getFiletype() {
         return ((RadioGroup) findViewById(R.id.file_type_for_upload)).getCheckedRadioButtonId() == R.id.pdf_type ? StorageServiceClient.UploadFileType.PDF : StorageServiceClient.UploadFileType.JPEG;
     }
 
-    /* access modifiers changed from: package-private */
-    public String generateUploadFilename(int i) {
+    private String generateUploadFilename(int i) {
         int count = ScanFileNumber.getCount(this);
         return "EPSON" + new Utils().editNumber(count + i);
     }
 
-    /* access modifiers changed from: package-private */
-    public String getTotalFileSize(List<String> list) {
+    private String getTotalFileSize(List<String> list) {
         Long l = 0L;
         for (String file : list) {
             l = Long.valueOf(l.longValue() + new File(file).length());

app/src/main/java/com/epson/iprint/storage/StorageSecureStore.java

@@ -70,8 +70,7 @@ public class StorageSecureStore {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public byte[] encodeAes(byte[] bArr, String str) {
+    private byte[] encodeAes(byte[] bArr, String str) {
         if (bArr == null || str == null) {
             return null;
         }
@@ -85,8 +84,7 @@ public class StorageSecureStore {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public byte[] decodeAes(byte[] bArr, String str) {
+    private byte[] decodeAes(byte[] bArr, String str) {
         if (bArr == null || str == null) {
             return null;
         }
@@ -100,8 +98,7 @@ public class StorageSecureStore {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public byte[] makeKeyBytes(int i, byte[] bArr) {
+    private byte[] makeKeyBytes(int i, byte[] bArr) {
         byte[] bArr2 = new byte[i];
         for (int i2 = 0; i2 < bArr2.length; i2++) {
             if (i2 < bArr.length) {
@@ -122,8 +119,7 @@ public class StorageSecureStore {
         reloadCache();
     }
 
-    /* access modifiers changed from: package-private */
-    public void reloadCache() {
+    private void reloadCache() {
         KeyValueDatabase keyValueDatabase = new KeyValueDatabase(this.mContext);
         this.mKeyValueMap = keyValueDatabase.select();
         keyValueDatabase.close();
@@ -221,8 +217,7 @@ public class StorageSecureStore {
         }
 
         /* JADX WARNING: type inference failed for: r1v0, types: [java.lang.String[], android.database.Cursor] */
-        /* access modifiers changed from: package-private */
-        public synchronized Map<String, String> select() {
+        private synchronized Map<String, String> select() {
             HashMap hashMap;
             hashMap = new HashMap();
             Cursor cursor = 0;

app/src/main/java/com/epson/iprint/storage/StorageWaitingActivity.java

@@ -47,8 +47,7 @@ public class StorageWaitingActivity extends Activity {
         super.onDestroy();
     }
 
-    /* access modifiers changed from: package-private */
-    public void registerBroadcastReceiver(Intent intent) {
+    private void registerBroadcastReceiver(Intent intent) {
         this.mRequestCode = intent.getIntExtra(EXTRA_REQUEST_CODE, 0);
         this.mBroadcastReceiver = new BroadcastReceiver() {
             public void onReceive(Context context, Intent intent) {
@@ -71,8 +70,7 @@ public class StorageWaitingActivity extends Activity {
         registerReceiver(this.mBroadcastReceiver, intentFilter);
     }
 
-    /* access modifiers changed from: package-private */
-    public Dialog createCancelDialog() {
+    private Dialog createCancelDialog() {
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setMessage(getString(R.string.str_msg_scan_cancel));
         builder.setCancelable(false);
@@ -95,8 +93,7 @@ public class StorageWaitingActivity extends Activity {
         return builder.create();
     }
 
-    /* access modifiers changed from: package-private */
-    public void setCancelRequest(Intent intent) {
+    private void setCancelRequest(Intent intent) {
         this.mCancelButton = (Button) findViewById(R.id.cancelButton);
         this.mCancelButton.setText(getString(R.string.str_cancel));
         if (intent.getBooleanExtra(EXTRA_CANCEL_ENABLED, false)) {
@@ -111,8 +108,7 @@ public class StorageWaitingActivity extends Activity {
         this.mCancelButton.setVisibility(8);
     }
 
-    /* access modifiers changed from: package-private */
-    public void setMessage(Intent intent) {
+    private void setMessage(Intent intent) {
         this.mMessageText = (TextView) findViewById(R.id.messageText);
         String stringExtra = intent.getStringExtra(EXTRA_MESSAGE);
         if (stringExtra != null) {

app/src/main/java/com/epson/iprint/storage/evernote/EvernoteClient.java

@@ -142,8 +142,7 @@ public class EvernoteClient extends StorageServiceClient {
             StorageServiceClient.EnumerateCompletion enumerated;
             EvernoteRequest request = new EvernoteRequest(context);
 
-            /* access modifiers changed from: package-private */
-            public List<StorageItem> getPrintableItems(List<StorageItem> list) {
+            private List<StorageItem> getPrintableItems(List<StorageItem> list) {
                 ArrayList arrayList = new ArrayList();
                 for (StorageItem next : list) {
                     if (next.type != StorageItem.ItemType.FILE || EvernoteClient.this.isPrintableFileTypes(next)) {

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

@@ -103,8 +103,7 @@ public class EvernoteRequest {
         throw new IOException("Invalid ItemType");
     }
 
-    /* access modifiers changed from: package-private */
-    public StorageItem getUploadFolder() throws TException, EDAMUserException, EDAMSystemException {
+    private StorageItem getUploadFolder() throws TException, EDAMUserException, EDAMSystemException {
         StorageItem storageItem = null;
         for (Notebook next : EvernoteClient.getEvernoteSession(this.mContext).getEvernoteClientFactory().getNoteStoreClient().listNotebooks()) {
             if ("Epson iPrint".equals(next.getName())) {
@@ -118,8 +117,7 @@ public class EvernoteRequest {
         return storageItem;
     }
 
-    /* access modifiers changed from: package-private */
-    public StorageItem newUploadFolder() throws TException, EDAMUserException, EDAMSystemException {
+    private StorageItem newUploadFolder() throws TException, EDAMUserException, EDAMSystemException {
         EvernoteSession evernoteSession = EvernoteClient.getEvernoteSession(this.mContext);
         Notebook notebook = new Notebook();
         notebook.setName("Epson iPrint");
@@ -138,8 +136,7 @@ public class EvernoteRequest {
         UploadHandler() {
         }
 
-        /* access modifiers changed from: package-private */
-        public StorageServiceClient.ProcessError upload(StorageItem storageItem, String str, String str2) throws FileNotFoundException, NoSuchAlgorithmException, TException, EDAMUserException, EDAMSystemException, EDAMNotFoundException {
+        private StorageServiceClient.ProcessError upload(StorageItem storageItem, String str, String str2) throws FileNotFoundException, NoSuchAlgorithmException, TException, EDAMUserException, EDAMSystemException, EDAMNotFoundException {
             EvernoteSession evernoteSession = EvernoteClient.getEvernoteSession(EvernoteRequest.this.mContext);
             File file = new File(str);
             Resource resource = new Resource();
@@ -163,8 +160,7 @@ public class EvernoteRequest {
             return this.canceled ? StorageServiceClient.ProcessError.CANCELED : StorageServiceClient.ProcessError.NONE;
         }
 
-        /* access modifiers changed from: package-private */
-        public void cancel() {
+        private void cancel() {
             this.canceled = true;
             EPLog.m305d(EvernoteRequest.TAG, "Upload Canceled！！");
         }
@@ -176,8 +172,7 @@ public class EvernoteRequest {
         DownloadHandler() {
         }
 
-        /* access modifiers changed from: package-private */
-        public StorageServiceClient.ProcessError download(String str, String str2) throws TException, EDAMUserException, EDAMSystemException, EDAMNotFoundException, IOException {
+        private StorageServiceClient.ProcessError download(String str, String str2) throws TException, EDAMUserException, EDAMSystemException, EDAMNotFoundException, IOException {
             Resource resource = EvernoteClient.getEvernoteSession(EvernoteRequest.this.mContext).getEvernoteClientFactory().getNoteStoreClient().getResource(str, true, false, true, false);
             resource.getAttributes().getFileName();
             Data data = resource.getData();
@@ -200,8 +195,7 @@ public class EvernoteRequest {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public void cancel() {
+        private void cancel() {
             this.canceled = true;
         }
     }
@@ -219,13 +213,11 @@ public class EvernoteRequest {
         return StorageServiceClient.ProcessError.ERROR;
     }
 
-    /* access modifiers changed from: package-private */
-    public UploadHandler getUploadHandler() {
+    private UploadHandler getUploadHandler() {
         return new UploadHandler();
     }
 
-    /* access modifiers changed from: package-private */
-    public DownloadHandler getDownloadHandler() {
+    private DownloadHandler getDownloadHandler() {
         return new DownloadHandler();
     }
 

app/src/main/java/com/epson/iprint/storage/evernote/EvernoteSignInActivity.java

@@ -41,8 +41,7 @@ public class EvernoteSignInActivity extends StorageSignInActivity {
         finish();
     }
 
-    /* access modifiers changed from: package-private */
-    public void revokeUserData() {
+    private void revokeUserData() {
         EvernoteClient.logout(this);
     }
 }

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

@@ -5,7 +5,7 @@ import android.content.Context;
 import android.os.AsyncTask;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+
 import epson.common.ExternalFileUtils;
 import epson.common.Utils;
 import epson.print.CommonDefine;

app/src/main/java/com/epson/iprint/storage/gdrivev3/FileListAdapter.java

@@ -2,7 +2,7 @@ package com.epson.iprint.storage.gdrivev3;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
-import android.support.annotation.UiThread;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

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

@@ -269,8 +269,7 @@ public class GoogleDownloader {
             this.mCurrentFolder.getId();
         }
 
-        /* access modifiers changed from: package-private */
-        public String getCurrentFolderId() {
+        private String getCurrentFolderId() {
             OnlineFile onlineFile = this.mCurrentFolder;
             if (onlineFile == null) {
                 return GoogleDownloader.ROOT_ID;

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

@@ -312,8 +312,7 @@ public class OneDriveClient extends StorageServiceClient {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void getOneDriveClient(Activity activity, final OneDriveAuthenticator.OnOneDriveAuthenticatorListener onOneDriveAuthenticatorListener) {
+    private void getOneDriveClient(Activity activity, final OneDriveAuthenticator.OnOneDriveAuthenticatorListener onOneDriveAuthenticatorListener) {
         OneDriveAuthenticator.getOneDriveClient(activity, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
             public void onNotifyOneDriveClient(IOneDriveClient iOneDriveClient) {
                 IOneDriveClient unused = OneDriveClient.this.oneDriveClient = iOneDriveClient;

app/src/main/java/com/epson/lib/escani2/ScanSize.java

@@ -1,7 +1,7 @@
 package com.epson.lib.escani2;
 
 
-import android.support.annotation.VisibleForTesting;
+
 
 import com.epson.lib.escani2.EscanI2Lib;
 

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

@@ -18,7 +18,7 @@ public class EscprLibPrinter {
     MaintainPrinter2 mMaintainPrinter;
 
     public int init(Context context, int i, boolean z) {
-        EpLog.m76i();
+        EpLog.i();
         MyPrinter currentPrinter = getCurrentPrinter(context);
         String printerId = currentPrinter.getPrinterId();
         String ip = currentPrinter.getIp();

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

@@ -4,7 +4,7 @@ import android.app.Application;
 import android.arch.lifecycle.AndroidViewModel;
 import android.arch.lifecycle.MutableLiveData;
 
-import android.support.annotation.VisibleForTesting;
+
 
 import java.util.Locale;
 

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

@@ -34,10 +34,10 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
     private Activity m_Activity;
 
     public static void setStop(boolean z) {
-        EpLog.m69d("mStop   " + z);
+        EpLog.d("mStop   " + z);
         mStop = z;
         if (z) {
-            EpLog.m69d("★ stopScan");
+            EpLog.d("★ stopScan");
             BleScanWork.getInstace().stopScan();
             if (mTimeOutTask != null) {
                 mTimeOutTask = null;
@@ -55,9 +55,9 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
                 try {
                     BleAsyncTask.this.get(BleAsyncTask.mTimeOut, TimeUnit.MILLISECONDS);
                 } catch (InterruptedException unused) {
-                    EpLog.m71e("InterruptedException");
+                    EpLog.e("InterruptedException");
                 } catch (ExecutionException unused2) {
-                    EpLog.m71e("ExecutionException");
+                    EpLog.e("ExecutionException");
                 } catch (TimeoutException unused3) {
                     EpLog.m77i("Running task has timed out!!");
                     if (BleAsyncTask.mBleWork != null) {
@@ -65,7 +65,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
                     }
                     BleAsyncTask.mTask.cancel(true);
                 } catch (CancellationException unused4) {
-                    EpLog.m71e("CancellationException");
+                    EpLog.e("CancellationException");
                 }
             }
         };
@@ -80,9 +80,9 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
                 try {
                     BleAsyncTask.this.get(BleAsyncTask.mTimeOut, TimeUnit.MILLISECONDS);
                 } catch (InterruptedException unused) {
-                    EpLog.m71e("InterruptedException");
+                    EpLog.e("InterruptedException");
                 } catch (ExecutionException unused2) {
-                    EpLog.m71e("ExecutionException");
+                    EpLog.e("ExecutionException");
                 } catch (TimeoutException unused3) {
                     EpLog.m77i("Running task has timed out!!");
                     if (BleAsyncTask.mBleWork != null) {
@@ -90,7 +90,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
                     }
                     BleAsyncTask.mTask.cancel(true);
                 } catch (CancellationException unused4) {
-                    EpLog.m71e("CancellationException");
+                    EpLog.e("CancellationException");
                 }
             }
         };
@@ -169,13 +169,13 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
             boolean r0 = mStop
             r5.append(r0)
             java.lang.String r5 = r5.toString()
-            com.epson.mobilephone.common.EpLog.m69d(r5)
+            com.epson.mobilephone.common.EpLog.d(r5)
             r0 = 2000(0x7d0, double:9.88E-321)
             java.lang.Thread.sleep(r0)     // Catch:{ InterruptedException -> 0x008e }
             goto L_0x0093
         L_0x008e:
             java.lang.String r5 = "InterruptedException"
-            com.epson.mobilephone.common.EpLog.m71e((java.lang.String) r5)
+            com.epson.mobilephone.common.EpLog.e((java.lang.String) r5)
         L_0x0093:
             boolean r5 = r4.isCancelled()
             if (r5 != 0) goto L_0x009d
@@ -183,9 +183,9 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
             if (r5 == 0) goto L_0x006e
         L_0x009d:
             java.lang.String r5 = "死にます"
-            com.epson.mobilephone.common.EpLog.m69d(r5)
+            com.epson.mobilephone.common.EpLog.d(r5)
             java.lang.String r5 = "★ stopScan"
-            com.epson.mobilephone.common.EpLog.m69d(r5)
+            com.epson.mobilephone.common.EpLog.d(r5)
             com.epson.mobilephone.common.ble.BleScanWork r5 = r4.mBleWork
             r5.stopScan()
         L_0x00ac:
@@ -196,7 +196,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
             java.lang.Boolean r0 = r4.mFind
             r5.append(r0)
             java.lang.String r5 = r5.toString()
-            com.epson.mobilephone.common.EpLog.m69d(r5)
+            com.epson.mobilephone.common.EpLog.d(r5)
             java.lang.Boolean r5 = r4.mFind
             return r5
         */
@@ -205,7 +205,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
 
     protected void onPostExecute(Boolean bool) {
         super.onPostExecute(bool);
-        EpLog.m69d("" + bool);
+        EpLog.d("" + bool);
     }
 
     private void showAdvanceToSettingDialog() {
@@ -215,13 +215,13 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
             for (ScannedDevice next : mDevicelist) {
                 arrayList.add(new ScannedDevice(next.getDevice(), next.getRssi(), next.getDisplayName(), next.getHardwareType()));
             }
-            EpLog.m69d(" ★　mDevicelist " + arrayList.size());
+            EpLog.d(" ★　mDevicelist " + arrayList.size());
             mCallBack.call(arrayList);
             return;
         }
         dialog = new AlertDialog.Builder(m_Activity).setCancelable(false).setMessage(m_Activity.getString(R.string.BLE_find_unconfigured_printer_title)).setPositiveButton(m_Activity.getString(R.string.BLE_find_unconfigured_printer_setup_button), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                EpLog.m69d("★ stopScan");
+                EpLog.d("★ stopScan");
                 BleAsyncTask.mBleWork.stopScan();
                 BleAsyncTask bleAsyncTask = BleAsyncTask.this;
                 List unused = bleAsyncTask.mDevicelist = bleAsyncTask.mBleWork.getScannedDeviceList();
@@ -235,7 +235,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
             }
         }).setNegativeButton(m_Activity.getString(R.string.BLE_find_unconfigured_printer_not_now_button), new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
-                EpLog.m69d("★ stopScan");
+                EpLog.d("★ stopScan");
                 BleAsyncTask.mBleWork.stopScan();
                 BleAsyncTask.setStop(true);
             }
@@ -245,7 +245,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
 
     protected void onCancelled(Boolean bool) {
         super.onCancelled(bool);
-        EpLog.m69d("死にました。  " + bool);
+        EpLog.d("死にました。  " + bool);
     }
 
     protected void onCancelled() {
@@ -259,14 +259,14 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
 
     public static void blePrinterCheck(Context context) {
         setStop(false);
-        EpLog.m76i();
+        EpLog.i();
         AlertDialog alertDialog = dialog;
         if (alertDialog == null || !alertDialog.isShowing()) {
             final Activity activity = (Activity) context;
             if (BLEUtility.isThreadAlive("bleCheck")) {
-                EpLog.m69d("isAlive bleCheck");
+                EpLog.d("isAlive bleCheck");
             } else if (handlerThread != null) {
-                EpLog.m71e("handlerThread != null   ");
+                EpLog.e("handlerThread != null   ");
             } else {
                 EpLog.m77i("★　　　　　handlerThread　start   ");
                 handlerThread = new HandlerThread("bleCheck");
@@ -284,10 +284,10 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
 
     public static void blePrinterCheck(Context context, final BLEUtility.BleWorkCallback bleWorkCallback) {
         setStop(false);
-        EpLog.m76i();
+        EpLog.i();
         final Activity activity = (Activity) context;
         if (BLEUtility.isThreadAlive("bleCheck")) {
-            EpLog.m69d("　　　‼　isAlive bleCheck");
+            EpLog.d("　　　‼　isAlive bleCheck");
             return;
         }
         EpLog.m77i("handlerThread");
@@ -303,7 +303,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
     }
 
     public static void blePrinterCheckStop() {
-        EpLog.m76i();
+        EpLog.i();
         if (handlerThread != null) {
             setStop(true);
             handlerThread.quitSafely();
@@ -320,7 +320,7 @@ public class BleAsyncTask extends AsyncTask<Void, Void, Boolean> {
                     EpLog.m77i("join");
                     thread.join(50);
                 } catch (InterruptedException e) {
-                    EpLog.m71e(e.getMessage());
+                    EpLog.e(e.getMessage());
                 }
             }
         } else {

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

@@ -68,7 +68,7 @@ public class BleScanWork {
                 public void onScanResult(int i, @NonNull ScanResult scanResult) {
                     ScanRecord scanRecord = scanResult.getScanRecord();
                     if (scanRecord == null) {
-                        EpLog.m71e("scanRecord is NULL !!");
+                        EpLog.e("scanRecord is NULL !!");
                         return;
                     }
                     SparseArray<byte[]> manufacturerSpecificData = scanRecord.getManufacturerSpecificData();
@@ -81,7 +81,7 @@ public class BleScanWork {
                             }
                             String deviceName = getDeviceName(scanResult);
                             if (deviceName != null && !deviceName.isEmpty() && scanResult.getRssi() >= -75 && scanResult.getRssi() < 127 && BleScanWork.this.update(scanResult.getDevice(), scanResult.getRssi(), deviceName, valueAt) && BleScanWork.mScannedDeviceList.size() > 0 && BleScanWork.mSuccess != null) {
-                                EpLog.m71e("mScannedDeviceList --- " + BleScanWork.mScannedDeviceList.size());
+                                EpLog.e("mScannedDeviceList --- " + BleScanWork.mScannedDeviceList.size());
                                 BleScanWork.mSuccess.call(BleScanWork.mScannedDeviceList);
                                 return;
                             }
@@ -91,7 +91,7 @@ public class BleScanWork {
                 }
 
                 public void onScanFailed(int i) {
-                    EpLog.m71e("onScanFailed " + i);
+                    EpLog.e("onScanFailed " + i);
                 }
 
                 @Nullable
@@ -122,9 +122,9 @@ public class BleScanWork {
                     String name = bluetoothDevice.getName();
                     byte[] bArr2 = new byte[3];
                     System.arraycopy(bArr, 7, bArr2, 0, bArr2.length);
-                    EpLog.m69d(name + " Company information = " + sb2 + " getManufacturerSpecificData = " + sb3);
+                    EpLog.d(name + " Company information = " + sb2 + " getManufacturerSpecificData = " + sb3);
                     if (BleScanWork.this.update(bluetoothDevice, i, name, bArr2) && BleScanWork.mSuccess != null && name != null) {
-                        EpLog.m71e("mScannedDeviceList --- " + BleScanWork.mScannedDeviceList.size());
+                        EpLog.e("mScannedDeviceList --- " + BleScanWork.mScannedDeviceList.size());
                         BleScanWork.mSuccess.call(BleScanWork.mScannedDeviceList);
                     }
                 }
@@ -188,7 +188,7 @@ public class BleScanWork {
             }
         }
         stopScan();
-        EpLog.m69d("★ stopScan");
+        EpLog.d("★ stopScan");
         return true;
     }
 

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

@@ -190,7 +190,7 @@ public class BleWork {
         mSequence = jobSequence.UNINITIALIZED;
         mGattcallback = null;
         if (mGattcallback != null) {
-            EpLog.m71e("mGattcallback != null");
+            EpLog.e("mGattcallback != null");
         }
         mGattcallback = new BluetoothGattCallback() {
             public void onMtuChanged(BluetoothGatt bluetoothGatt, int i, int i2) {
@@ -215,10 +215,10 @@ public class BleWork {
                     BleWork bleWork = BleWork.this;
                     bleWork.mStatus = i2;
                     if (bleWork.mConnGatt == null) {
-                        EpLog.m71e("mConnGatt  NULL !");
+                        EpLog.e("mConnGatt  NULL !");
                     }
                     if (bluetoothGatt == null) {
-                        EpLog.m71e("gatt  NULL !");
+                        EpLog.e("gatt  NULL !");
                     }
                     BluetoothGatt unused = BleWork.mConnGatt = bluetoothGatt;
                     BleWork.this.handlerWrite.removeCallbacks((Runnable) null);
@@ -227,10 +227,10 @@ public class BleWork {
                             EpLog.m77i("discoverServices");
                             try {
                                 if (!((BluetoothGatt) Objects.requireNonNull(BleWork.mConnGatt)).discoverServices()) {
-                                    EpLog.m71e("discoverServices error");
+                                    EpLog.e("discoverServices error");
                                 }
                             } catch (NullPointerException unused) {
-                                EpLog.m71e("mConnGatt NULL !");
+                                EpLog.e("mConnGatt NULL !");
                             }
                         }
                     }, 500);
@@ -239,7 +239,7 @@ public class BleWork {
                     if (!BleWork.mReconnect && BleWork.mSequence == jobSequence.UNINITIALIZED) {
                         BleWork.this.failedProcessing();
                     } else if (BleWork.mReconnect || BleWork.mSequence == jobSequence.UNINITIALIZED || BleWork.mSequence == jobSequence.MIB_REBOOT_NW || BleWork.mSequence == jobSequence.DISCONNECTED || BleWork.mSequence == jobSequence.MIB_SET_SSID || BleWork.mSequence == jobSequence.AFTER_SETTING_PASSWORD) {
-                        EpLog.m69d("★ stopScan");
+                        EpLog.d("★ stopScan");
                         BleScanWork.getInstace().stopScan();
                         BleWork bleWork2 = BleWork.this;
                         bleWork2.mStatus = i2;
@@ -262,7 +262,7 @@ public class BleWork {
                             }
                             EpLog.m82w("retry " + BleWork.mRetry);
                             BleWork.access$508(BleWork.this);
-                            EpLog.m71e("init");
+                            EpLog.e("init");
                             boolean unused2 = BleWork.this.init();
                             return;
                         }
@@ -278,7 +278,7 @@ public class BleWork {
             }
 
             public void onServicesDiscovered(BluetoothGatt bluetoothGatt, int i) {
-                EpLog.m76i();
+                EpLog.i();
                 try {
                     for (BluetoothGattService next : bluetoothGatt.getServices()) {
                         if (next != null) {
@@ -302,7 +302,7 @@ public class BleWork {
                         }
                     }
                 } catch (BleException e) {
-                    EpLog.m71e(e.getMessage());
+                    EpLog.e(e.getMessage());
                     e.printStackTrace();
                     BleWork.this.failedProcessing();
                 }
@@ -310,7 +310,7 @@ public class BleWork {
 
             public void onCharacteristicChanged(BluetoothGatt bluetoothGatt, @NonNull BluetoothGattCharacteristic bluetoothGattCharacteristic) {
                 super.onCharacteristicChanged(bluetoothGatt, bluetoothGattCharacteristic);
-                EpLog.m69d("onCharacteristicChanged");
+                EpLog.d("onCharacteristicChanged");
                 if (BLEUuid.CHAR_SNMP_STATUS_STRING.equals(bluetoothGattCharacteristic.getUuid().toString())) {
                     Short valueOf = Short.valueOf(bluetoothGattCharacteristic.getIntValue(17, 0).shortValue());
                     String sh = valueOf.toString();
@@ -319,7 +319,7 @@ public class BleWork {
                         BleWork.this.characteristicRead();
                         return;
                     }
-                    EpLog.m71e("[Notify]SNMP Status" + sh);
+                    EpLog.e("[Notify]SNMP Status" + sh);
                     BleWork.this.failedProcessing();
                 } else if (BLEUuid.CHAR_SECURITY_TYPE_STRING.equals(bluetoothGattCharacteristic.getUuid().toString())) {
                     Short valueOf2 = Short.valueOf(bluetoothGattCharacteristic.getIntValue(17, 0).shortValue());
@@ -334,7 +334,7 @@ public class BleWork {
                     }
                 } else {
                     String sh3 = Short.valueOf(bluetoothGattCharacteristic.getIntValue(17, 0).shortValue()).toString();
-                    EpLog.m71e("[Notify]unKnown type" + sh3);
+                    EpLog.e("[Notify]unKnown type" + sh3);
                 }
             }
 
@@ -356,7 +356,7 @@ public class BleWork {
                     java.lang.String r0 = r0.toString()
                     if (r0 != 0) goto L_0x0011
                     java.lang.String r7 = "characteristic NULL !!"
-                    com.epson.mobilephone.common.EpLog.m71e((java.lang.String) r7)
+                    com.epson.mobilephone.common.EpLog.e((java.lang.String) r7)
                     goto L_0x03a1
                 L_0x0011:
                     java.lang.String r0 = r0.toLowerCase()
@@ -565,7 +565,7 @@ public class BleWork {
                     goto L_0x03a1
                 L_0x0198:
                     java.lang.String r7 = "[Read]SNMP Response :error "
-                    com.epson.mobilephone.common.EpLog.m71e((java.lang.String) r7)
+                    com.epson.mobilephone.common.EpLog.e((java.lang.String) r7)
                     goto L_0x03a1
                 L_0x019f:
                     java.lang.StringBuilder r7 = new java.lang.StringBuilder
@@ -578,7 +578,7 @@ public class BleWork {
                     int r0 = r0.requestId
                     r7.append(r0)
                     java.lang.String r7 = r7.toString()
-                    com.epson.mobilephone.common.EpLog.m69d(r7)
+                    com.epson.mobilephone.common.EpLog.d(r7)
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
                     com.epson.mobilephone.common.escpr.EscprLib r7 = r7.mEscprlib
                     com.epson.mobilephone.common.ble.BleWork r0 = com.epson.mobilephone.common.ble.BleWork.this
@@ -678,7 +678,7 @@ public class BleWork {
                     goto L_0x03a1
                 L_0x02b6:
                     java.lang.String r7 = "[Read]SNMP Response :failed"
-                    com.epson.mobilephone.common.EpLog.m71e((java.lang.String) r7)
+                    com.epson.mobilephone.common.EpLog.e((java.lang.String) r7)
                     goto L_0x03a1
                 L_0x02bd:
                     java.lang.Integer r7 = r7.getIntValue(r1, r4)
@@ -699,19 +699,19 @@ public class BleWork {
                     if (r7 != 0) goto L_0x03a1
                     r6.IncrementSequence()
                     java.lang.String r7 = " @@  checkSSID  @@ "
-                    com.epson.mobilephone.common.EpLog.m69d(r7)
+                    com.epson.mobilephone.common.EpLog.d(r7)
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
                     android.bluetooth.BluetoothGatt r7 = r7.mConnGatt
                     if (r7 != 0) goto L_0x0302
                     java.lang.String r7 = "mConnGatt  NULL !"
-                    com.epson.mobilephone.common.EpLog.m71e((java.lang.String) r7)
+                    com.epson.mobilephone.common.EpLog.e((java.lang.String) r7)
                 L_0x0302:
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
                     short r7 = r7.getSecurityType()
                     r0 = 255(0xff, float:3.57E-43)
                     if (r7 != r0) goto L_0x0328
                     java.lang.String r7 = " skip  "
-                    com.epson.mobilephone.common.EpLog.m69d(r7)
+                    com.epson.mobilephone.common.EpLog.d(r7)
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
                     com.epson.mobilephone.common.ble.util.BLEUtility$BleWorkCallback r7 = r7.mSequenceCallbackSuccess
                     if (r7 == 0) goto L_0x03a1
@@ -741,7 +741,7 @@ public class BleWork {
                     r0 = 65535(0xffff, float:9.1834E-41)
                     if (r7 != r0) goto L_0x0367
                     java.lang.String r7 = "password error !"
-                    com.epson.mobilephone.common.EpLog.m71e((java.lang.String) r7)
+                    com.epson.mobilephone.common.EpLog.e((java.lang.String) r7)
                     com.epson.mobilephone.common.ble.BleWork r7 = com.epson.mobilephone.common.ble.BleWork.this
                     com.epson.mobilephone.common.ble.BleWork$jobSequence r0 = com.epson.mobilephone.common.ble.BleWork.jobSequence.FAILED
                     r7.mSequence = r0
@@ -805,13 +805,13 @@ public class BleWork {
 
             private void notifySet(@NonNull BluetoothGattCharacteristic bluetoothGattCharacteristic) {
                 if (!BleWork.mConnGatt.setCharacteristicNotification(bluetoothGattCharacteristic, true)) {
-                    EpLog.m71e("Notification set ERROR");
+                    EpLog.e("Notification set ERROR");
                 }
                 BluetoothGattDescriptor descriptor = bluetoothGattCharacteristic.getDescriptor(UUID.fromString(BLEUuid.CLIENT_CHARACTERISTIC_CONFIG));
                 descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
                 EpLog.m77i("notify set");
                 if (!BleWork.mConnGatt.writeDescriptor(descriptor)) {
-                    EpLog.m71e("Notification write ERROR");
+                    EpLog.e("Notification write ERROR");
                 }
             }
         };
@@ -888,10 +888,10 @@ public class BleWork {
         if (mConnGatt != null) {
             int i = mStatus;
             if (!(i == 3 || i == 0)) {
-                EpLog.m69d(" !! mConnGatt disconnect");
+                EpLog.d(" !! mConnGatt disconnect");
                 mConnGatt.disconnect();
             }
-            EpLog.m69d(" !! mConnGatt close " + mSequence + " " + mStatus);
+            EpLog.d(" !! mConnGatt close " + mSequence + " " + mStatus);
             mReconnect = false;
             if (z) {
                 gattClose();
@@ -900,7 +900,7 @@ public class BleWork {
     }
 
     private void gattClose() {
-        EpLog.m69d(" !! mConnGatt close");
+        EpLog.d(" !! mConnGatt close");
         BluetoothGatt bluetoothGatt = mConnGatt;
         if (bluetoothGatt != null) {
             bluetoothGatt.close();
@@ -916,7 +916,7 @@ public class BleWork {
         EpLog.m77i("再接続");
         mReconnect = true;
         mRetry = 0;
-        EpLog.m71e("init");
+        EpLog.e("init");
         init();
     }
 
@@ -930,13 +930,13 @@ public class BleWork {
 
     private void notifySet(@NonNull BluetoothGattCharacteristic bluetoothGattCharacteristic) {
         if (!mConnGatt.setCharacteristicNotification(bluetoothGattCharacteristic, true)) {
-            EpLog.m71e("Notification set ERROR");
+            EpLog.e("Notification set ERROR");
         }
         BluetoothGattDescriptor descriptor = bluetoothGattCharacteristic.getDescriptor(UUID.fromString(BLEUuid.CLIENT_CHARACTERISTIC_CONFIG));
         descriptor.setValue(BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE);
         EpLog.m77i("notify set");
         if (!mConnGatt.writeDescriptor(descriptor)) {
-            EpLog.m71e(" writeDescriptor ERROR");
+            EpLog.e(" writeDescriptor ERROR");
         }
     }
 
@@ -951,7 +951,7 @@ public class BleWork {
 
         protected void onPreExecute() {
             super.onPreExecute();
-            EpLog.m76i();
+            EpLog.i();
             try {
                 Thread.sleep(500);
             } catch (InterruptedException e) {
@@ -991,11 +991,11 @@ public class BleWork {
                 }
                 if (this.stop) {
                     EpLog.m77i(" set ended ");
-                    EpLog.m76i();
+                    EpLog.i();
                     return Boolean.valueOf(this.success);
                 }
             }
-            EpLog.m71e(" set failed! ");
+            EpLog.e(" set failed! ");
             return false;
         }
 
@@ -1011,7 +1011,7 @@ public class BleWork {
                 BleWork.this.checkPassword();
                 return;
             }
-            EpLog.m71e("setNotify");
+            EpLog.e("setNotify");
             BleWork.this.failedProcessing();
         }
     }
@@ -1038,29 +1038,29 @@ public class BleWork {
                                     int i = iArr[0] + 1;
                                     iArr[0] = i;
                                     if (i < 3) {
-                                        EpLog.m71e("FALSE !! retry " + iArr[0]);
+                                        EpLog.e("FALSE !! retry " + iArr[0]);
                                         BleWork.this.handlerRead.removeCallbacks((Runnable) null);
                                         BleWork.this.handlerRead.postDelayed(this, (long) (iArr[0] * 500));
                                         return;
                                     }
-                                    EpLog.m71e("FALSE !!!");
+                                    EpLog.e("FALSE !!!");
                                     BleWork.this.sequenceError();
                                     return;
                                 }
                                 return;
                             } catch (NullPointerException unused) {
-                                EpLog.m71e("mConnGatt NULL !");
+                                EpLog.e("mConnGatt NULL !");
                                 return;
                             }
                         case 9:
                             if (!BleWork.mConnGatt.readCharacteristic(BLEUuid.GattCharsMap.get(BLEUuid.CHAR_PASSWORD_STRING))) {
-                                EpLog.m71e("FALSE !! ");
+                                EpLog.e("FALSE !! ");
                                 return;
                             }
                             return;
                         case 10:
                             if (!BleWork.mConnGatt.readCharacteristic(BLEUuid.GattCharsMap.get(BLEUuid.CHAR_VERSION_STRING))) {
-                                EpLog.m71e("FALSE !! ");
+                                EpLog.e("FALSE !! ");
                                 return;
                             }
                             return;
@@ -1088,7 +1088,7 @@ public class BleWork {
         if (mDevice == null) {
             mDevice = mSelectItem.getDevice();
             if (mDevice == null) {
-                EpLog.m71e("mDevice is null !!!");
+                EpLog.e("mDevice is null !!!");
                 return false;
             }
         }
@@ -1098,7 +1098,7 @@ public class BleWork {
         } else {
             i = Constants.EDAM_APPLICATIONDATA_ENTRY_LEN_MAX;
         }
-        EpLog.m69d("password = " + i);
+        EpLog.d("password = " + i);
         mDevicePassword = String.valueOf(i);
         if (mConnGatt == null && mStatus == 0) {
             EpLog.m77i("connectGatt");
@@ -1136,12 +1136,12 @@ public class BleWork {
         mReconnect = true;
         mSSID = getSSID(mContext);
         EpLog.m77i(mSSID);
-        EpLog.m71e("init");
+        EpLog.e("init");
         return init();
     }
 
     public void checkPassword() {
-        EpLog.m76i();
+        EpLog.i();
         String str = mDevicePassword;
         if (!str.isEmpty()) {
             BluetoothGattCharacteristic bluetoothGattCharacteristic = BLEUuid.GattCharsMap.get(BLEUuid.CHAR_PASSWORD_STRING);
@@ -1157,10 +1157,10 @@ public class BleWork {
         handlerWrite.postDelayed(new Runnable() {
             public void run() {
                 if (BleWork.mConnGatt == null) {
-                    EpLog.m71e("mConnGatt  NULL !");
+                    EpLog.e("mConnGatt  NULL !");
                 }
                 if (bluetoothGattCharacteristic == null) {
-                    EpLog.m71e("characteristic  NULL !");
+                    EpLog.e("characteristic  NULL !");
                 }
                 try {
                     if (!((BluetoothGatt) Objects.requireNonNull(BleWork.mConnGatt)).writeCharacteristic(bluetoothGattCharacteristic)) {
@@ -1168,16 +1168,16 @@ public class BleWork {
                         int i = iArr[0] + 1;
                         iArr[0] = i;
                         if (i <= 3) {
-                            EpLog.m71e("writeCharacteristic error ! retry " + iArr[0]);
+                            EpLog.e("writeCharacteristic error ! retry " + iArr[0]);
                             BleWork.this.handlerWrite.removeCallbacks((Runnable) null);
                             BleWork.this.handlerWrite.postDelayed(this, (long) (iArr[0] * 500));
                             return;
                         }
-                        EpLog.m71e("writeCharacteristic error !! retry failed !!");
+                        EpLog.e("writeCharacteristic error !! retry failed !!");
                         BleWork.this.failedProcessing();
                     }
                 } catch (NullPointerException unused) {
-                    EpLog.m71e("mConnGatt NULL !");
+                    EpLog.e("mConnGatt NULL !");
                 }
             }
         }, 0);
@@ -1196,7 +1196,7 @@ public class BleWork {
         mIndex = b;
         int mibGetESSIDList = escprLib.mibGetESSIDList(mIBCommand, b);
         if (mibGetESSIDList != 0) {
-            EpLog.m71e("mibGetESSIDList ret = " + mibGetESSIDList);
+            EpLog.e("mibGetESSIDList ret = " + mibGetESSIDList);
             return;
         }
         byte[] bArr = new byte[mMibCommand.commandBlock.bufSize];
@@ -1222,7 +1222,7 @@ public class BleWork {
     public void setSSIDType() {
         mSequence = jobSequence.CHECK_SSID;
         if (mConnGatt == null) {
-            EpLog.m71e("mConnGatt  NULL !");
+            EpLog.e("mConnGatt  NULL !");
         }
         checkSSID();
     }
@@ -1254,7 +1254,7 @@ public class BleWork {
                 str = "epsAdminMibAccessLoginOperation";
                 str2 = "mibSecLogin ";
                 if (mEngineID == null) {
-                    EpLog.m71e("mEngineID");
+                    EpLog.e("mEngineID");
                     failedProcessing();
                 }
                 i = mEscprlib.mibSecLogin(mMibCommand, mEngineID);
@@ -1268,7 +1268,7 @@ public class BleWork {
                     EpLog.m82w("SSIDPassword is empty");
                 }
                 if (mEngineID == null) {
-                    EpLog.m71e("mEngineID");
+                    EpLog.e("mEngineID");
                     failedProcessing();
                 }
                 i = mEscprlib.mibSecSetPassword(mMibCommand, mEngineID, str3);
@@ -1277,7 +1277,7 @@ public class BleWork {
                 str = "epsAdminMibAccessLogOutOperation";
                 str2 = "mibSecLogout ";
                 if (mEngineID == null) {
-                    EpLog.m71e("mEngineID");
+                    EpLog.e("mEngineID");
                     failedProcessing();
                 }
                 i = mEscprlib.mibSecLogout(mMibCommand, mEngineID);
@@ -1306,7 +1306,7 @@ public class BleWork {
                 break;
         }
         if (i != 0) {
-            EpLog.m71e(str2 + " ret = " + i);
+            EpLog.e(str2 + " ret = " + i);
             sequenceError();
             return;
         }
@@ -1325,7 +1325,7 @@ public class BleWork {
     private void failedProcessing() {
         disconnect();
         if (mSequenceCallbackFailed != null) {
-            EpLog.m71e(" " + mSequence);
+            EpLog.e(" " + mSequence);
             mSequenceCallbackFailed.call(mSequence);
         }
     }

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

@@ -79,7 +79,7 @@ public class BleWorkActivity extends ActivityIACommon {
     }
 
     protected void onCreate(Bundle bundle) {
-        EpLog.m76i();
+        EpLog.i();
         super.onCreate(bundle);
         requestWindowFeature(5);
         setContentView(R.layout.activity_scan);
@@ -105,7 +105,7 @@ public class BleWorkActivity extends ActivityIACommon {
 
     protected void onPause() {
         super.onPause();
-        EpLog.m76i();
+        EpLog.i();
     }
 
     protected void onStart() {
@@ -115,7 +115,7 @@ public class BleWorkActivity extends ActivityIACommon {
 
     protected void onStop() {
         super.onStop();
-        EpLog.m76i();
+        EpLog.i();
         isAlive = false;
         getWindow().clearFlags(128);
     }
@@ -129,7 +129,7 @@ public class BleWorkActivity extends ActivityIACommon {
         mCompletion = new CallbackWork() {
             public void call(Object obj) {
                 if (!(obj instanceof Boolean)) {
-                    EpLog.m71e(" type mismatch !");
+                    EpLog.e(" type mismatch !");
                 }
                 StringBuilder sb = new StringBuilder();
                 sb.append("result = ");
@@ -187,7 +187,7 @@ public class BleWorkActivity extends ActivityIACommon {
                                             try {
                                                 BleWorkActivity.mProbePrinter.search();
                                             } catch (IllegalStateException e) {
-                                                EpLog.m71e(e.getMessage());
+                                                EpLog.e(e.getMessage());
                                                 BleWorkActivity.mProbePrinter.interruptSearch();
                                                 if (BleWorkActivity.mAlertDialog != null) {
                                                     BleWorkActivity.mAlertDialog.dismiss();
@@ -214,7 +214,7 @@ public class BleWorkActivity extends ActivityIACommon {
                             }
                         }, new BLEUtility.BleWorkCallback() {
                             public void call(Object obj) {
-                                EpLog.m71e("BleWorkCallback");
+                                EpLog.e("BleWorkCallback");
                                 if (BleWorkActivity.mCompletion != null) {
                                     BleWorkActivity.mCompletion.call(false);
                                 }
@@ -365,7 +365,7 @@ public class BleWorkActivity extends ActivityIACommon {
                         BleWorkActivity.mAlertDialog.dismiss();
                         BleWorkActivity.mAlertDialog = null;
                     }
-                    EpLog.m71e("TIME OUT");
+                    EpLog.e("TIME OUT");
                     BleWorkActivity.mCompletion.call(false);
                     CallbackWork unused = BleWorkActivity.mCompletion = null;
                     return;
@@ -431,7 +431,7 @@ public class BleWorkActivity extends ActivityIACommon {
         BleScanWork.getInstace().stopScan();
         mBleWork.resetSequence();
         mBleWork.setSequenceCallback(mSequenceCallbackSuccess, mSequenceCallbackFailed);
-        EpLog.m69d("              getInfoForConnectDialog");
+        EpLog.d("              getInfoForConnectDialog");
         getInfoForConnectDialog(displayName);
         mBleWork.init(this, scannedDevice);
     }
@@ -452,7 +452,7 @@ public class BleWorkActivity extends ActivityIACommon {
         mTimeoutHandler = new Handler();
         mTimeoutHandler.postDelayed(new Runnable() {
             public void run() {
-                EpLog.m71e(" timeout ------------" + BleWorkActivity.mBleWork.mSequence);
+                EpLog.e(" timeout ------------" + BleWorkActivity.mBleWork.mSequence);
                 if (BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.AFTER_SETTING_PASSWORD || BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.MIB_GET_MACADDRESS || BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.BEFORE_CHECK_SSID || BleWorkActivity.mBleWork.mSequence == BleWork.jobSequence.UNINITIALIZED) {
                     BleWorkActivity.mBleWork.failedProcessing();
                 }
@@ -555,7 +555,7 @@ public class BleWorkActivity extends ActivityIACommon {
             public void run() {
                 BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.MIB_SET_SSID;
                 BleWorkActivity.mBleWork.disconnect(false);
-                EpLog.m69d("sequence = " + BleWorkActivity.mBleWork.mSequence);
+                EpLog.d("sequence = " + BleWorkActivity.mBleWork.mSequence);
                 List<String> ssidLis = BleWorkActivity.mBleWork.getSsidLis();
                 ssidLis.remove(BleWorkActivity.this.getResources().getText(R.string.BLE_select_SSID_manual_button).toString());
                 BleWorkActivity.this.sortSSIDlist(ssidLis);
@@ -574,7 +574,7 @@ public class BleWorkActivity extends ActivityIACommon {
                 cancelable.setItems(strArr, new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         String str = strArr[i];
-                        EpLog.m69d("select = " + str);
+                        EpLog.d("select = " + str);
                         if (i == strArr.length - 1) {
                             BleWorkActivity.this.setSSID();
                             return;
@@ -585,7 +585,7 @@ public class BleWorkActivity extends ActivityIACommon {
                             EpLog.m77i("☆☆ " + BleWorkActivity.mBleWork.mSequence + "::" + BleWorkActivity.mBleWork.mStatus);
                             BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.BEFORE_CHECK_SSID;
                             BleWorkActivity.mBleWork.connect();
-                            EpLog.m69d("              getInfoForConnectDialog");
+                            EpLog.d("              getInfoForConnectDialog");
                             BleWorkActivity.this.getInfoForConnectDialog(BleWorkActivity.mBleWork.getDeviceName());
                             return;
                         }
@@ -595,7 +595,7 @@ public class BleWorkActivity extends ActivityIACommon {
                 });
                 cancelable.setNegativeButton(BleWorkActivity.this.getString(R.string.BLE_setup_abort_button), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        EpLog.m76i();
+                        EpLog.i();
                         BleWorkActivity.mBleWork.disconnect(true);
                     }
                 });
@@ -659,7 +659,7 @@ public class BleWorkActivity extends ActivityIACommon {
                 });
                 cancelable.setNegativeButton(BleWorkActivity.this.getString(R.string.no_button), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        EpLog.m76i();
+                        EpLog.i();
                         ((InputMethodManager) BleWorkActivity.this.getSystemService("input_method")).hideSoftInputFromWindow(editText.getWindowToken(), 2);
                         if (!BleWorkActivity.mBleWork.getSsidLis().isEmpty()) {
                             BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_SSID_LIST;
@@ -680,7 +680,7 @@ public class BleWorkActivity extends ActivityIACommon {
     }
 
     private void setSSIDPassword() {
-        EpLog.m76i();
+        EpLog.i();
         if (!mBleWork.getSSIDPassword().isEmpty() || mBleWork.getSecurityType() == 1 || (mBleWork.getSecurityType() == 255 && mBleWork.mSequence != BleWork.jobSequence.SET_PASSWORD)) {
             runOnUiThread(new Runnable() {
                 public void run() {
@@ -691,7 +691,7 @@ public class BleWorkActivity extends ActivityIACommon {
                             BleWorkActivity.mAlertDialog.dismiss();
                             BleWorkActivity.mAlertDialog = null;
                         }
-                        EpLog.m69d("waitingCommunicationDaialog");
+                        EpLog.d("waitingCommunicationDaialog");
                         BleWorkActivity.this.waitingCommunicationDaialog();
                     }
                 }
@@ -734,14 +734,14 @@ public class BleWorkActivity extends ActivityIACommon {
                             BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_MACADDRESS;
                             BleWorkActivity.mBleWork.connect();
                             BleWorkActivity.this.setConnectTimeOut();
-                            EpLog.m69d("waitingCommunicationDaialog");
+                            EpLog.d("waitingCommunicationDaialog");
                             BleWorkActivity.this.waitingCommunicationDaialog();
                             ((InputMethodManager) BleWorkActivity.this.getSystemService("input_method")).hideSoftInputFromWindow(editText.getWindowToken(), 2);
                         }
                     });
                     cancelable.setNegativeButton(BleWorkActivity.this.getString(R.string.no_button), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
-                            EpLog.m76i();
+                            EpLog.i();
                             ((InputMethodManager) BleWorkActivity.this.getSystemService("input_method")).hideSoftInputFromWindow(editText.getWindowToken(), 2);
                             if (!BleWorkActivity.mBleWork.getSsidLis().isEmpty()) {
                                 BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.MIB_GET_SSID_LIST;
@@ -761,10 +761,10 @@ public class BleWorkActivity extends ActivityIACommon {
                         }
                         button.setEnabled(z);
                     }
-                    EpLog.m69d("sequence = " + BleWorkActivity.mBleWork.mSequence);
+                    EpLog.d("sequence = " + BleWorkActivity.mBleWork.mSequence);
                     BleWorkActivity.mBleWork.mSequence = BleWork.jobSequence.AFTER_SETTING_PASSWORD;
                     BleWorkActivity.mBleWork.disconnect(false);
-                    EpLog.m69d("sequence = " + BleWorkActivity.mBleWork.mSequence);
+                    EpLog.d("sequence = " + BleWorkActivity.mBleWork.mSequence);
                 }
             });
         }
@@ -820,7 +820,7 @@ public class BleWorkActivity extends ActivityIACommon {
             try {
                 charSequence = charSequence2.replace(new String(new byte[]{-62, -91}, CharEncoding.UTF_8), new String("\\".getBytes(), CharEncoding.UTF_8));
             } catch (UnsupportedEncodingException e) {
-                EpLog.m71e(e.getMessage());
+                EpLog.e(e.getMessage());
             }
             if (charSequence.toString().matches("^[a-zA-Z0-9!-/:-@\\[-\\`\\{-\\~]+$")) {
                 return charSequence;

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

@@ -41,11 +41,11 @@ public class ProbePrinter {
     private volatile boolean isPrinterFound;
     private IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
         public void onGetStatusState() throws RemoteException {
-            EpLog.m76i();
+            EpLog.i();
         }
 
         public void onGetInkState() throws RemoteException {
-            EpLog.m76i();
+            EpLog.i();
         }
 
         public void onFindPrinterResult(String str, String str2, String str3, String str4, String str5) throws RemoteException {
@@ -70,24 +70,24 @@ public class ProbePrinter {
         }
 
         public void onNotifyProgress(int i, int i2) throws RemoteException {
-            EpLog.m76i();
+            EpLog.i();
         }
 
         public void onNotifyContinueable(int i) throws RemoteException {
-            EpLog.m76i();
+            EpLog.i();
         }
 
         public void onNotifyError(int i, int i2, boolean z) throws RemoteException {
-            EpLog.m76i();
+            EpLog.i();
         }
 
         public void onNotifyEndJob(int i) throws RemoteException {
-            EpLog.m76i();
+            EpLog.i();
         }
     };
     private ServiceConnection mEpsonConnection = new ServiceConnection() {
         public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
-            EpLog.m76i();
+            EpLog.i();
             IEpsonService unused = ProbePrinter.mEpsonService = IEpsonService.Stub.asInterface(iBinder);
             if (ProbePrinter.mEpsonService != null) {
                 try {
@@ -117,7 +117,7 @@ public class ProbePrinter {
                             ProbePrinter.this.search();
                             break;
                         } catch (IllegalStateException e) {
-                            EpLog.m71e(e.getMessage());
+                            EpLog.e(e.getMessage());
                             break;
                         }
                     case 2:
@@ -148,7 +148,7 @@ public class ProbePrinter {
     }
 
     public ProbePrinter setMacAddress(String str) {
-        EpLog.m69d("★" + str + "★　");
+        EpLog.d("★" + str + "★　");
         macAddress = str;
         return this;
     }
@@ -161,7 +161,7 @@ public class ProbePrinter {
     public void search() throws IllegalStateException {
         String str;
         if (mEpsonService == null || completion == null || (str = macAddress) == null || str.length() != 12 || completion == null) {
-            EpLog.m71e("Required field is not set.");
+            EpLog.e("Required field is not set.");
             throw new IllegalStateException("Required field is not set.");
         }
         Context context2 = context;
@@ -170,7 +170,7 @@ public class ProbePrinter {
             synchronized (lock) {
                 isPrinterFound = false;
             }
-            EpLog.m69d("mEpsonService.searchPrinters");
+            EpLog.d("mEpsonService.searchPrinters");
             mEpsonService.setTimeOut(180);
             mEpsonService.searchPrinters((String) null, (String) null, 1);
         } catch (RemoteException e) {
@@ -198,7 +198,7 @@ public class ProbePrinter {
             context2.bindService(new Intent(context2, EpsonService.class), mEpsonConnection, 1);
         }
         if (mEpsonService == null) {
-            EpLog.m71e("mEpsonService NULL");
+            EpLog.e("mEpsonService NULL");
             mHandler.sendEmptyMessageDelayed(17, 1000);
             return;
         }
@@ -206,7 +206,7 @@ public class ProbePrinter {
     }
 
     private void unbindEpsonService() {
-        EpLog.m76i();
+        EpLog.i();
         if (mEpsonService != null) {
             if (!this.isPrinterFound) {
                 mHandler.sendEmptyMessageDelayed(2, 200);
@@ -219,7 +219,7 @@ public class ProbePrinter {
                 context.unbindService(mEpsonConnection);
                 mEpsonService = null;
             } catch (RemoteException unused) {
-                EpLog.m71e("unregisterCallback   mEpsonService");
+                EpLog.e("unregisterCallback   mEpsonService");
             }
             EpLog.m77i(ExifInterface.GPS_MEASUREMENT_3D);
         }

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

@@ -43,7 +43,7 @@ public class BLEUtility {
             if (thread == null || !thread.getName().equals(str) || !thread.isAlive()) {
                 i++;
             } else {
-                EpLog.m69d("" + thread);
+                EpLog.d("" + thread);
                 return true;
             }
         }

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

@@ -334,7 +334,7 @@ public class EscprLib {
     }
 
     public int epsWrapperProbePrinter2(int i, String str, String str2, int i2) {
-        EpLog.m76i();
+        EpLog.i();
         if (i2 != 1) {
             if (i2 == 3 && str2 != null && str2.length() > 0) {
                 printerIp = str2;
@@ -483,7 +483,7 @@ public class EscprLib {
         }
         String macAddress = ((WifiManager) context.getApplicationContext().getSystemService(Service.WIFI_SERVICE)).getConnectionInfo().getMacAddress();
         if (macAddress != null) {
-            EpLog.m69d("getEngineId macAdress = " + macAddress);
+            EpLog.d("getEngineId macAdress = " + macAddress);
             String[] split = macAddress.split(":", 6);
             if (split.length == 6) {
                 for (int i2 = 0; i2 < 6; i2++) {

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

@@ -21,6 +21,7 @@ import androidx.lifecycle.ViewModelProviders;
 import java.util.Deque;
 
 import epson.print.R;
+import epson.print.Util.EPLog;
 
 public class ActivityConnectSimpleAP extends ActivityConnectBase implements DialogProgressWiFiDirect.DialogButtonClick {
     private static final int DELAY_CONNECTED_WIFI = 1000;

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

@@ -50,33 +50,27 @@ public class BatteryInfoAdapter extends ArrayAdapter<BatteryInfoAdapter.BatteryI
         BatteryInfoList() {
         }
 
-        /* access modifiers changed from: package-private */
-        public String getBatteryName() {
+        private String getBatteryName() {
             return mBatteryName;
         }
 
-        /* access modifiers changed from: package-private */
-        public void setBatteryStatusName(String str) {
+        private void setBatteryStatusName(String str) {
             mBatteryName = str;
         }
 
-        /* access modifiers changed from: package-private */
-        public String getBatteryStatusPercentage() {
+        private String getBatteryStatusPercentage() {
             return mBatteryPercentage;
         }
 
-        /* access modifiers changed from: package-private */
-        public void setBatteryStatusPercentage(String str) {
+        private void setBatteryStatusPercentage(String str) {
             mBatteryPercentage = str;
         }
 
-        /* access modifiers changed from: package-private */
-        public int getBatteryStatusIcon() {
+        private int getBatteryStatusIcon() {
             return mBatteryStatusIcon;
         }
 
-        /* access modifiers changed from: package-private */
-        public void setBatteryStatusIcon(int i) {
+        private void setBatteryStatusIcon(int i) {
             mBatteryStatusIcon = i;
         }
     }

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

@@ -1,7 +1,7 @@
 package epson.maintain;
 
 
-import android.support.annotation.VisibleForTesting;
+
 import android.support.media.ExifInterface;
 
 import androidx.annotation.NonNull;

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

@@ -1,7 +1,7 @@
 package epson.maintain;
 
 
-import android.support.annotation.VisibleForTesting;
+
 
 import androidx.annotation.Nullable;
 

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

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.os.AsyncTask;
 
 
-import android.support.annotation.VisibleForTesting;
+
 import android.util.Log;
 
 import com.epson.iprint.prtlogger.Analytics;
@@ -104,21 +104,18 @@ public class FirmwareManager {
         maintainPrinter = maintainPrinterWrapper;
     }
 
-    /* access modifiers changed from: package-private */
-    public void endConnect() {
+    private void endConnect() {
         mFWUpdateTask.cancel(true);
     }
 
-    /* access modifiers changed from: package-private */
-    public void startProc(FWUpdateStep fWUpdateStep) {
+    private void startProc(FWUpdateStep fWUpdateStep) {
         mProcStep = fWUpdateStep;
         mProcResult = FWUpdateProcResult.None;
         mFWUpdateTask = buildFWUpdateTask();
         mFWUpdateTask.execute(new FWUpdateStep[]{fWUpdateStep});
     }
 
-    /* access modifiers changed from: package-private */
-    public void endWithProcResult(FWUpdateProcResult fWUpdateProcResult) {
+    private void endWithProcResult(FWUpdateProcResult fWUpdateProcResult) {
         endConnect();
         if (fWUpdateProcResult != FWUpdateProcResult.Success) {
             removeSavedFile();
@@ -137,8 +134,7 @@ public class FirmwareManager {
         endWithProcResult(FWUpdateProcResult.Interrupted);
     }
 
-    /* access modifiers changed from: package-private */
-    public String getUpdateInfURL() {
+    private String getUpdateInfURL() {
         return String.format("%s/%s_model_%s/UPDATE.INF", new Object[]{getUpdateInfSchemeAndHost(), mPrinter.getName().replaceAll(" ", CommonDefine.UNDER_BAR), mMarketID});
     }
 
@@ -146,13 +142,11 @@ public class FirmwareManager {
         return DEV_FWUPDATE ? EVAL_UPDATEINF_URL_PREFIX : UPDATEINF_URL_PREFIX;
     }
 
-    /* access modifiers changed from: package-private */
-    public String getStartUpdateURL() {
+    private String getStartUpdateURL() {
         return IPAddressUtils.buildURL(mSendProtocol, mPrinter.getIp(), "/FIRMWAREUPDATE");
     }
 
-    /* access modifiers changed from: package-private */
-    public String getSendFWURL() {
+    private String getSendFWURL() {
         return IPAddressUtils.buildURL(mSendProtocol, mPrinter.getIp(), "/DOWN/FIRMWAREUPDATE/ROM1");
     }
 
@@ -166,8 +160,7 @@ public class FirmwareManager {
         startProc(FWUpdateStep.GetPrinterFWVersion);
     }
 
-    /* access modifiers changed from: package-private */
-    public FWUpdateProcResult getPrinterFWVer() {
+    private FWUpdateProcResult getPrinterFWVer() {
         int firmwareInfo;
         String str;
         EnumMap enumMap = new EnumMap(EscprLib.PrinterFirmInfo.class);
@@ -381,8 +374,7 @@ public class FirmwareManager {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public AsyncTask<FWUpdateStep, Integer, FWUpdateProcResult> buildFWUpdateTask() {
+    private AsyncTask<FWUpdateStep, Integer, FWUpdateProcResult> buildFWUpdateTask() {
         return new LocalAsyncTask();
     }
 
@@ -622,8 +614,7 @@ public class FirmwareManager {
             throw new UnsupportedOperationException("Method not decompiled: epson.maintain.FirmwareManager.LocalAsyncTask.extractFirmDataFromRcx():epson.maintain.FirmwareManager$FWUpdateProcResult");
         }
 
-        /* access modifiers changed from: package-private */
-        public FWUpdateProcResult download(String str, File file, boolean z) {
+        private FWUpdateProcResult download(String str, File file, boolean z) {
             return download(str, file, z, 1, 1);
         }
 
@@ -885,8 +876,7 @@ public class FirmwareManager {
             throw new UnsupportedOperationException("Method not decompiled: epson.maintain.FirmwareManager.LocalAsyncTask.download(java.lang.String, java.io.File, boolean, int, int):epson.maintain.FirmwareManager$FWUpdateProcResult");
         }
 
-        /* access modifiers changed from: package-private */
-        public FWUpdateProcResult downloadNewFW() {
+        private FWUpdateProcResult downloadNewFW() {
             String access$500;
             FWUpdateProcResult fWUpdateProcResult = FWUpdateProcResult.Success;
             try {

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

@@ -103,8 +103,7 @@ public class EccPrintLog extends ActivityIACommon implements DialogProgress.Dial
         showProgressDialog();
     }
 
-    /* access modifiers changed from: package-private */
-    public String[] getErrorTitleAndMessage(int i) {
+    private String[] getErrorTitleAndMessage(int i) {
         String str;
         String str2;
         String[] strArr = new String[2];
@@ -158,13 +157,11 @@ public class EccPrintLog extends ActivityIACommon implements DialogProgress.Dial
         super.onDestroy();
     }
 
-    /* access modifiers changed from: package-private */
-    public void dissmissProgressDialog() {
+    private void dissmissProgressDialog() {
         mModelDialog.doDismiss(DIALOG_PROGRESS);
     }
 
-    /* access modifiers changed from: package-private */
-    public void showProgressDialog() {
+    private void showProgressDialog() {
         mModelDialog.doShow(DIALOG_PROGRESS);
     }
 

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

@@ -29,7 +29,7 @@ public class FirmwareUpdateActivity extends Activity implements FirmwareManager.
     FirmwareManager mFWManager;
     final DialogInterface.OnClickListener mGoBackOnClickListenner = new DialogInterface.OnClickListener() {
         public void onClick(DialogInterface dialogInterface, int i) {
-            FirmwareUpdateActivity.this.goBack();
+            goBack();
         }
     };
     boolean mInterrupted = false;
@@ -60,7 +60,7 @@ public class FirmwareUpdateActivity extends Activity implements FirmwareManager.
         mCancelButton.setText(R.string.str_cancel);
         mCancelButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                FirmwareUpdateActivity.mFWManager.cancelProc();
+                mFWManager.cancelProc();
             }
         });
         setMessage(getResources().getString(R.string.fw_checking_version), (String) null);
@@ -115,163 +115,9 @@ public class FirmwareUpdateActivity extends Activity implements FirmwareManager.
         }
         return super.dispatchKeyEvent(keyEvent);
     }
-
-    /* access modifiers changed from: package-private */
-    /* JADX WARNING: Can't fix incorrect switch cases order */
-    /* Code decompiled incorrectly, please refer to instructions dump. */
+    
     public java.lang.String[] getEndProcTitleAndMessage(epson.maintain.FirmwareManager.FWUpdateProcResult r6, epson.maintain.FirmwareManager.FWUpdateStep r7) {
-        /*
-            r5 = this;
-            int[] r0 = epson.maintain.activity.FirmwareUpdateActivity.C20104.$SwitchMap$epson$maintain$FirmwareManager$FWUpdateProcResult
-            int r6 = r6.ordinal()
-            r6 = r0[r6]
-            r0 = 2131624842(0x7f0e038a, float:1.8876875E38)
-            r1 = 0
-            r2 = 0
-            r3 = 2
-            r4 = 1
-            switch(r6) {
-                case 1: goto L_0x011e;
-                case 2: goto L_0x0101;
-                case 3: goto L_0x00be;
-                case 4: goto L_0x0073;
-                case 5: goto L_0x0055;
-                case 6: goto L_0x003a;
-                case 7: goto L_0x001f;
-                case 8: goto L_0x0014;
-                default: goto L_0x0012;
-            }
-        L_0x0012:
-            goto L_0x0130
-        L_0x0014:
-            java.lang.String r6 = r5.toString()
-            java.lang.String r7 = "MSG_CANCELED"
-            android.util.Log.d(r6, r7)
-            goto L_0x0130
-        L_0x001f:
-            java.lang.String[] r6 = new java.lang.String[r3]
-            android.content.res.Resources r7 = r5.getResources()
-            java.lang.String r7 = r7.getString(r0)
-            r6[r2] = r7
-            android.content.res.Resources r7 = r5.getResources()
-            r0 = 2131624826(0x7f0e037a, float:1.8876843E38)
-            java.lang.String r7 = r7.getString(r0)
-            r6[r4] = r7
-            goto L_0x0131
-        L_0x003a:
-            java.lang.String[] r6 = new java.lang.String[r3]
-            android.content.res.Resources r7 = r5.getResources()
-            java.lang.String r7 = r7.getString(r0)
-            r6[r2] = r7
-            android.content.res.Resources r7 = r5.getResources()
-            r0 = 2131624831(0x7f0e037f, float:1.8876853E38)
-            java.lang.String r7 = r7.getString(r0)
-            r6[r4] = r7
-            goto L_0x0131
-        L_0x0055:
-            java.lang.String[] r6 = new java.lang.String[r3]
-            android.content.res.Resources r7 = r5.getResources()
-            r0 = 2131624832(0x7f0e0380, float:1.8876855E38)
-            java.lang.String r7 = r7.getString(r0)
-            r6[r2] = r7
-            android.content.res.Resources r7 = r5.getResources()
-            r0 = 2131624833(0x7f0e0381, float:1.8876857E38)
-            java.lang.String r7 = r7.getString(r0)
-            r6[r4] = r7
-            goto L_0x0131
-        L_0x0073:
-            int[] r6 = epson.maintain.activity.FirmwareUpdateActivity.C20104.$SwitchMap$epson$maintain$FirmwareManager$FWUpdateStep
-            int r7 = r7.ordinal()
-            r6 = r6[r7]
-            if (r6 == r4) goto L_0x00a0
-            r7 = 5
-            if (r6 == r7) goto L_0x0082
-            goto L_0x0130
-        L_0x0082:
-            java.lang.String[] r6 = new java.lang.String[r3]
-            android.content.res.Resources r7 = r5.getResources()
-            r0 = 2131624839(0x7f0e0387, float:1.887687E38)
-            java.lang.String r7 = r7.getString(r0)
-            r6[r2] = r7
-            android.content.res.Resources r7 = r5.getResources()
-            r0 = 2131624840(0x7f0e0388, float:1.8876871E38)
-            java.lang.String r7 = r7.getString(r0)
-            r6[r4] = r7
-            goto L_0x0131
-        L_0x00a0:
-            java.lang.String[] r6 = new java.lang.String[r3]
-            android.content.res.Resources r7 = r5.getResources()
-            r0 = 2131624835(0x7f0e0383, float:1.887686E38)
-            java.lang.String r7 = r7.getString(r0)
-            r6[r2] = r7
-            android.content.res.Resources r7 = r5.getResources()
-            r0 = 2131624836(0x7f0e0384, float:1.8876863E38)
-            java.lang.String r7 = r7.getString(r0)
-            r6[r4] = r7
-            goto L_0x0131
-        L_0x00be:
-            int[] r6 = epson.maintain.activity.FirmwareUpdateActivity.C20104.$SwitchMap$epson$maintain$FirmwareManager$FWUpdateStep
-            int r7 = r7.ordinal()
-            r6 = r6[r7]
-            switch(r6) {
-                case 1: goto L_0x00e4;
-                case 2: goto L_0x00e4;
-                case 3: goto L_0x00ca;
-                case 4: goto L_0x00ca;
-                case 5: goto L_0x00ca;
-                default: goto L_0x00c9;
-            }
-        L_0x00c9:
-            goto L_0x0130
-        L_0x00ca:
-            java.lang.String[] r6 = new java.lang.String[r3]
-            android.content.res.Resources r7 = r5.getResources()
-            r3 = 2131624827(0x7f0e037b, float:1.8876845E38)
-            java.lang.String r7 = r7.getString(r3)
-            r6[r2] = r7
-            android.content.res.Resources r7 = r5.getResources()
-            java.lang.String r7 = r7.getString(r0)
-            r6[r4] = r7
-            goto L_0x0131
-        L_0x00e4:
-            java.lang.String[] r6 = new java.lang.String[r3]
-            android.content.res.Resources r7 = r5.getResources()
-            r0 = 2131624828(0x7f0e037c, float:1.8876847E38)
-            java.lang.String r7 = r7.getString(r0)
-            r6[r2] = r7
-            android.content.res.Resources r7 = r5.getResources()
-            r0 = 2131624829(0x7f0e037d, float:1.8876849E38)
-            java.lang.String r7 = r7.getString(r0)
-            r6[r4] = r7
-            goto L_0x0131
-        L_0x0101:
-            java.lang.String[] r6 = new java.lang.String[r3]
-            android.content.res.Resources r7 = r5.getResources()
-            r0 = 2131624837(0x7f0e0385, float:1.8876865E38)
-            java.lang.String r7 = r7.getString(r0)
-            r6[r2] = r7
-            android.content.res.Resources r7 = r5.getResources()
-            r0 = 2131624838(0x7f0e0386, float:1.8876867E38)
-            java.lang.String r7 = r7.getString(r0)
-            r6[r4] = r7
-            goto L_0x0131
-        L_0x011e:
-            java.lang.String[] r6 = new java.lang.String[r3]
-            r6[r2] = r1
-            android.content.res.Resources r7 = r5.getResources()
-            r0 = 2131624834(0x7f0e0382, float:1.8876859E38)
-            java.lang.String r7 = r7.getString(r0)
-            r6[r4] = r7
-            goto L_0x0131
-        L_0x0130:
-            r6 = r1
-        L_0x0131:
-            if (r6 != 0) goto L_0x0137
-            java.lang.String[] r6 = new java.lang.String[]{r1, r1}
-        L_0x0137:
-            return r6
-        */
-        throw new UnsupportedOperationException("Method not decompiled: epson.maintain.activity.FirmwareUpdateActivity.getEndProcTitleAndMessage(epson.maintain.FirmwareManager$FWUpdateProcResult, epson.maintain.FirmwareManager$FWUpdateStep):java.lang.String[]");
+        throw new UnsupportedOperationException("Method not decompiled: epson.maintain.activity.getEndProcTitleAndMessage(epson.maintain.FirmwareManager$FWUpdateProcResult, epson.maintain.FirmwareManager$FWUpdateStep):java.lang.String[]");
     }
 
     public void fwManagerProcDoing(int i) {
@@ -289,7 +135,7 @@ public class FirmwareUpdateActivity extends Activity implements FirmwareManager.
                 case 1:
                     showAlertDialog(str, str2, getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
-                            FirmwareUpdateActivity.this.startEulaActivity();
+                            startEulaActivity();
                         }
                     }, getString(R.string.str_no), mGoBackOnClickListenner);
                     return;
@@ -341,18 +187,15 @@ public class FirmwareUpdateActivity extends Activity implements FirmwareManager.
         mFWManager.startFWDownload(this);
     }
 
-    /* access modifiers changed from: package-private */
-    public void setProcCancelable(boolean z) {
+    private void setProcCancelable(boolean z) {
         mCancelButton.setVisibility(z ? 0 : 8);
     }
 
-    /* access modifiers changed from: package-private */
-    public void setProgressVisibility(boolean z) {
+    private void setProgressVisibility(boolean z) {
         mProgress.setVisibility(z ? 0 : 8);
     }
 
-    /* access modifiers changed from: package-private */
-    public void setMessage(String str, String str2) {
+    private void setMessage(String str, String str2) {
         if (str != null) {
             mTitleText.setText(str);
             mTitleText.setVisibility(View.VISIBLE);
@@ -367,8 +210,7 @@ public class FirmwareUpdateActivity extends Activity implements FirmwareManager.
         mMessageText.setVisibility(View.GONE);
     }
 
-    /* access modifiers changed from: package-private */
-    public void showAlertDialog(String str, String str2, DialogInterface.OnClickListener onClickListener, DialogInterface.OnClickListener onClickListener2) {
+    private void showAlertDialog(String str, String str2, DialogInterface.OnClickListener onClickListener, DialogInterface.OnClickListener onClickListener2) {
         String str3 = null;
         String string = onClickListener != null ? getString(R.string.str_ok) : null;
         if (onClickListener2 != null) {
@@ -377,23 +219,20 @@ public class FirmwareUpdateActivity extends Activity implements FirmwareManager.
         showAlertDialog(str, str2, string, onClickListener, str3, onClickListener2);
     }
 
-    /* access modifiers changed from: package-private */
-    public void showAlertDialog(String str, String str2, String str3, DialogInterface.OnClickListener onClickListener, String str4, DialogInterface.OnClickListener onClickListener2) {
+    private void showAlertDialog(String str, String str2, String str3, DialogInterface.OnClickListener onClickListener, String str4, DialogInterface.OnClickListener onClickListener2) {
         dismissAlertDialog();
         mDialog = new AlertDialog.Builder(this).setTitle(str).setMessage(str2).setCancelable(false).setPositiveButton(str3, onClickListener).setNegativeButton(str4, onClickListener2).create();
         mDialog.show();
     }
 
-    /* access modifiers changed from: package-private */
-    public void dismissAlertDialog() {
+    private void dismissAlertDialog() {
         AlertDialog alertDialog = mDialog;
         if (alertDialog != null && alertDialog.isShowing()) {
             mDialog.dismiss();
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void goBack() {
+    private void goBack() {
         FirmwareManager.removeSavedFile();
         dismissAlertDialog();
         finish();
@@ -405,18 +244,18 @@ public class FirmwareUpdateActivity extends Activity implements FirmwareManager.
 
         protected Boolean doInBackground(Void... voidArr) {
             FirmwareUpdateActivity firmwareUpdateActivity = FirmwareUpdateActivity.this;
-            return Boolean.valueOf(MaintainActivity.disableSimpleApAndWait(firmwareUpdateActivity, firmwareUpdateActivity.mPrinterIP));
+            return Boolean.valueOf(MaintainActivity.disableSimpleApAndWait(firmwareUpdateActivity, mPrinterIP));
         }
 
         protected void onPostExecute(Boolean bool) {
             super.onPostExecute(bool);
             if (bool.booleanValue()) {
                 FirmwareUpdateActivity firmwareUpdateActivity = FirmwareUpdateActivity.this;
-                firmwareUpdateActivity.mShouldReconnectSimpleAP = true;
-                firmwareUpdateActivity.mFWManager.startGetUpdateInf(FirmwareUpdateActivity.this);
+                mShouldReconnectSimpleAP = true;
+                mFWManager.startGetUpdateInf(FirmwareUpdateActivity.this);
                 return;
             }
-            FirmwareUpdateActivity.this.fwManagerDidEndProc(FirmwareManager.FWUpdateProcResult.Fail, FirmwareManager.FWUpdateStep.GetUpdateInf);
+            fwManagerDidEndProc(FirmwareManager.FWUpdateProcResult.Fail, FirmwareManager.FWUpdateStep.GetUpdateInf);
         }
     }
 }

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

@@ -583,8 +583,7 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void stopAllThread() {
+    private void stopAllThread() {
         if (!mIsCancelProbe) {
             mIsStop = true;
             mIsCancelProbe = true;

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

@@ -20,7 +20,7 @@ class LogUrl {
 
     public void setContextDependValue(Context context) {
         mClientId = SharedPreferencesProvider.getInstace(context).getString(Constants.PRINTER_CLIENT_ID, "");
-        EpLog.m69d("▲clientId = " + mClientId);
+        EpLog.d("▲clientId = " + mClientId);
         MyPrinter curPrinter = MyPrinter.getCurPrinter(context);
         mAccessKey = EcClientLibUtil.quoteForJsonString(curPrinter.getRemotePrinterAccessKey(context));
         mPrinterName = EcClientLibUtil.quoteForJsonString(curPrinter.getUserDefName(context));

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

@@ -1825,8 +1825,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void startBrowseNozzleCheckGuidance() {
+    private void startBrowseNozzleCheckGuidance() {
         showDialog(DIALOG_PROGRESS);
         BuyInkTask(2, printerIp);
     }

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

@@ -12,7 +12,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-
 import android.view.ContextMenu;
 import android.view.MenuItem;
 import android.view.View;
@@ -25,6 +24,8 @@ import android.widget.RadioButton;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import androidx.fragment.app.DialogFragment;
+
 import com.epson.mobilephone.common.ble.BleAsyncTask;
 import com.epson.mobilephone.common.ble.BleWork;
 import com.epson.mobilephone.common.ble.BleWorkActivity;
@@ -41,14 +42,17 @@ import com.epson.mobilephone.common.wifidirect.WiFiDirectPrinterListUtils;
 import com.epson.mobilephone.common.wifidirect.WiFiNetworkManager;
 import com.epson.mobilephone.common.wifidirect.escprLib;
 
+import java.util.ArrayList;
+import java.util.Locale;
+
 import epson.common.Constants;
 import epson.common.ExternalFileUtils;
 import epson.common.Utils;
 import epson.print.ActivityIACommon;
-import epson.print.R;
 import epson.print.CustomTitleDialogFragment;
 import epson.print.EPPrinterManager;
 import epson.print.MyPrinter;
+import epson.print.R;
 import epson.print.screen.ActivityPrinterSetting;
 import epson.print.screen.WorkingDialog;
 import epson.print.widgets.AbstractListBuilder;
@@ -58,10 +62,8 @@ import epson.print.widgets.PrinterInfoECBuilder;
 import epson.print.widgets.PrinterInfoIpBuilder;
 import epson.scan.lib.escanLib;
 
-import java.util.ArrayList;
-import java.util.Locale;
-
 public class MaintainPrinterSearchActivity extends ActivityIACommon implements CustomTitleDialogFragment.Callback {
+
     private static final int DELAY = 100;
     private static final int DIALOG_ID_PRINTER_NOT_FOUND_WITH_WEB_GUIDANCE = 1;
     private static final String DIALOG_TAG_PRINTER_NOT_FOUND = "printer_not_found_dialog";
@@ -112,398 +114,8 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
     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} */
-        /* JADX DEBUG: Multi-variable search result rejected for TypeSearchVarInfo{r8v55, resolved type: java.lang.Object} */
-        /* JADX DEBUG: Multi-variable search result rejected for TypeSearchVarInfo{r2v26, resolved type: epson.print.MyPrinter} */
-        /* JADX WARNING: Multi-variable type inference failed */
-        /* Code decompiled incorrectly, please refer to instructions dump. */
         public boolean handleMessage(android.os.Message r8) {
-            /*
-                r7 = this;
-                int r0 = r8.what
-                r1 = 8
-                r2 = 0
-                r3 = -1
-                r4 = 1
-                r5 = 0
-                switch(r0) {
-                    case 0: goto L_0x02c1;
-                    case 1: goto L_0x0292;
-                    case 2: goto L_0x028b;
-                    case 3: goto L_0x000b;
-                    case 4: goto L_0x0208;
-                    case 5: goto L_0x01fc;
-                    case 6: goto L_0x0149;
-                    case 7: goto L_0x0104;
-                    case 8: goto L_0x00bc;
-                    case 9: goto L_0x000b;
-                    case 10: goto L_0x0076;
-                    case 11: goto L_0x004d;
-                    case 12: goto L_0x0029;
-                    case 13: goto L_0x000d;
-                    default: goto L_0x000b;
-                }
-            L_0x000b:
-                goto L_0x0338
-            L_0x000d:
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                android.os.Handler r0 = r8.mHandler
-                r2 = 60
-                com.epson.mobilephone.common.wifidirect.SearchWiFiDirectPrinterTask r0 = com.epson.mobilephone.common.wifidirect.WiFiDirectManager.searchWiFiDirectPrinter(r8, r0, r1, r2)
-                com.epson.mobilephone.common.wifidirect.SearchWiFiDirectPrinterTask unused = r8.searchWiFiDirectPrinter = r0
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                com.epson.mobilephone.common.wifidirect.SearchWiFiDirectPrinterTask r8 = r8.searchWiFiDirectPrinter
-                if (r8 != 0) goto L_0x0338
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                boolean unused = r8.isSearchSimpleAp = r5
-                goto L_0x0338
-            L_0x0029:
-                java.lang.Object r8 = r8.obj
-                epson.print.MyPrinter r8 = (epson.print.MyPrinter) r8
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                boolean r0 = r0.isFinishSearchPrinter
-                if (r0 != 0) goto L_0x0041
-                java.lang.String r0 = "MaintainPrinterSearchActivity"
-                java.lang.String r1 = "cancelSearch for PROBE_SCANNER"
-                epson.print.Util.EPLog.m313i(r0, r1)
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                r0.interruptSearch()
-            L_0x0041:
-                epson.maintain.activity.MaintainPrinterSearchActivity$14$1 r0 = new epson.maintain.activity.MaintainPrinterSearchActivity$14$1
-                r0.<init>(r8)
-                java.lang.Void[] r8 = new java.lang.Void[r5]
-                r0.execute(r8)
-                goto L_0x0338
-            L_0x004d:
-                java.lang.Object r8 = r8.obj
-                epson.print.MyPrinter r8 = (epson.print.MyPrinter) r8
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                boolean r0 = r0.isFinishSearchPrinter
-                if (r0 != 0) goto L_0x0065
-                java.lang.String r0 = "MaintainPrinterSearchActivity"
-                java.lang.String r1 = "cancelSearch for PROBE_PRINTER"
-                epson.print.Util.EPLog.m313i(r0, r1)
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                r0.interruptSearch()
-            L_0x0065:
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                epson.maintain.activity.MaintainPrinterSearchActivity$14$2 r1 = new epson.maintain.activity.MaintainPrinterSearchActivity$14$2
-                r1.<init>(r8)
-                java.lang.Void[] r8 = new java.lang.Void[r5]
-                android.os.AsyncTask r8 = r1.execute(r8)
-                r0.probePrinterThread = r8
-                goto L_0x0338
-            L_0x0076:
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                r0.interruptSearch()
-                java.lang.Object r0 = r8.obj
-                if (r0 == 0) goto L_0x0084
-                java.lang.Object r8 = r8.obj
-                r2 = r8
-                epson.print.MyPrinter r2 = (epson.print.MyPrinter) r2
-            L_0x0084:
-                android.content.Intent r8 = new android.content.Intent
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                java.lang.Class<epson.print.screen.ActivityIpPrinterSetting> r1 = epson.print.screen.ActivityIpPrinterSetting.class
-                r8.<init>(r0, r1)
-                android.os.Bundle r0 = new android.os.Bundle
-                r0.<init>()
-                if (r2 == 0) goto L_0x00a4
-                java.lang.String r1 = r2.getPrinterId()
-                if (r1 == 0) goto L_0x00a4
-                java.lang.String r1 = "PRINTER_KEY"
-                java.lang.String r2 = r2.getPrinterId()
-                r0.putString(r1, r2)
-                goto L_0x00ab
-            L_0x00a4:
-                java.lang.String r1 = "PRINTER_KEY"
-                java.lang.String r2 = ""
-                r0.putString(r1, r2)
-            L_0x00ab:
-                epson.maintain.activity.MaintainPrinterSearchActivity r1 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                int unused = r1.mDeletePos = r3
-                r8.putExtras(r0)
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                r1 = 10
-                r0.startActivityForResult(r8, r1)
-                goto L_0x0338
-            L_0x00bc:
-                android.os.Bundle r8 = r8.getData()
-                if (r8 == 0) goto L_0x00ed
-                boolean r0 = r8.isEmpty()
-                if (r0 != 0) goto L_0x00ed
-                java.lang.String r0 = "ssid"
-                java.lang.String r0 = r8.getString(r0)
-                java.lang.String r1 = "name"
-                java.lang.String r1 = r8.getString(r1)
-                java.lang.String r2 = "addr_infra"
-                java.lang.String r8 = r8.getString(r2)
-                if (r1 != 0) goto L_0x00dd
-                r1 = r0
-            L_0x00dd:
-                epson.print.MyPrinter r2 = new epson.print.MyPrinter
-                java.lang.String r3 = ""
-                r2.<init>(r1, r0, r8, r3)
-                epson.maintain.activity.MaintainPrinterSearchActivity r1 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                com.epson.mobilephone.common.wifidirect.WiFiDirectPrinterListUtils r1 = r1.wiFiDirectPrinterListUtils
-                r1.addPrinter(r2, r5, r0, r8)
-                goto L_0x0338
-            L_0x00ed:
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                boolean unused = r8.isSearchSimpleAp = r5
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                boolean r8 = r8.isFinishSearchPrinter
-                if (r8 == 0) goto L_0x0338
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                android.os.Handler r8 = r8.mHandler
-                r0 = 5
-                r8.sendEmptyMessage(r0)
-                goto L_0x0338
-            L_0x0104:
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                r0.interruptSearch()
-                java.lang.Object r0 = r8.obj
-                if (r0 == 0) goto L_0x0112
-                java.lang.Object r8 = r8.obj
-                r2 = r8
-                epson.print.MyPrinter r2 = (epson.print.MyPrinter) r2
-            L_0x0112:
-                android.content.Intent r8 = new android.content.Intent
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                java.lang.Class<epson.print.screen.ActivityPrinterSetting> r1 = epson.print.screen.ActivityPrinterSetting.class
-                r8.<init>(r0, r1)
-                android.os.Bundle r0 = new android.os.Bundle
-                r0.<init>()
-                if (r2 == 0) goto L_0x0132
-                java.lang.String r1 = r2.getEmailAddress()
-                if (r1 == 0) goto L_0x0132
-                java.lang.String r1 = "PRINTER_EMAIL_ADDRESS"
-                java.lang.String r2 = r2.getEmailAddress()
-                r0.putString(r1, r2)
-                goto L_0x0139
-            L_0x0132:
-                java.lang.String r1 = "PRINTER_EMAIL_ADDRESS"
-                java.lang.String r2 = ""
-                r0.putString(r1, r2)
-            L_0x0139:
-                epson.maintain.activity.MaintainPrinterSearchActivity r1 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                int unused = r1.mDeletePos = r3
-                r8.putExtras(r0)
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                r1 = 7
-                r0.startActivityForResult(r8, r1)
-                goto L_0x0338
-            L_0x0149:
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                int r8 = r8.mDeletePos
-                if (r8 < 0) goto L_0x0338
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                int r8 = r8.printer_location
-                switch(r8) {
-                    case 2: goto L_0x019f;
-                    case 3: goto L_0x015c;
-                    default: goto L_0x015a;
-                }
-            L_0x015a:
-                goto L_0x01e1
-            L_0x015c:
-                epson.print.EPPrinterManager r8 = new epson.print.EPPrinterManager
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                android.content.Context r0 = r0.mContext
-                r8.<init>(r0)
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                epson.print.widgets.AbstractListBuilder r0 = r0.mBuilder
-                java.util.Vector r0 = r0.getData()
-                epson.maintain.activity.MaintainPrinterSearchActivity r2 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                int r2 = r2.mDeletePos
-                java.lang.Object r0 = r0.elementAt(r2)
-                epson.print.MyPrinter r0 = (epson.print.MyPrinter) r0
-                java.lang.String r0 = r0.getPrinterId()
-                r8.deleteIpPrinterInfo(r0)
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                epson.print.widgets.AbstractListBuilder r8 = r8.mBuilder
-                android.widget.BaseAdapter r8 = r8.getAdapter()
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                epson.print.widgets.AbstractListBuilder r0 = r0.mBuilder
-                java.util.Vector r0 = r0.getData()
-                epson.maintain.activity.MaintainPrinterSearchActivity r2 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                int r2 = r2.mDeletePos
-                r0.remove(r2)
-                r8.notifyDataSetChanged()
-                goto L_0x01e1
-            L_0x019f:
-                epson.print.EPPrinterManager r8 = new epson.print.EPPrinterManager
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                android.content.Context r0 = r0.mContext
-                r8.<init>(r0)
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                epson.print.widgets.AbstractListBuilder r0 = r0.mBuilder
-                java.util.Vector r0 = r0.getData()
-                epson.maintain.activity.MaintainPrinterSearchActivity r2 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                int r2 = r2.mDeletePos
-                java.lang.Object r0 = r0.elementAt(r2)
-                epson.print.MyPrinter r0 = (epson.print.MyPrinter) r0
-                java.lang.String r0 = r0.getEmailAddress()
-                r8.deleteRemotePrinterInfo(r0)
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                epson.print.widgets.AbstractListBuilder r8 = r8.mBuilder
-                android.widget.BaseAdapter r8 = r8.getAdapter()
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                epson.print.widgets.AbstractListBuilder r0 = r0.mBuilder
-                java.util.Vector r0 = r0.getData()
-                epson.maintain.activity.MaintainPrinterSearchActivity r2 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                int r2 = r2.mDeletePos
-                r0.remove(r2)
-                r8.notifyDataSetChanged()
-            L_0x01e1:
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                r8.displaySearchResult()
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                int r8 = r8.printer_location
-                if (r8 == r4) goto L_0x01f5
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                android.widget.Button r8 = r8.mSearchButton
-                r8.setVisibility(r1)
-            L_0x01f5:
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                int unused = r8.mDeletePos = r3
-                goto L_0x0338
-            L_0x01fc:
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                r8.interruptSearch()
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                r8.displaySearchResult()
-                goto L_0x0338
-            L_0x0208:
-                com.epson.mobilephone.common.ble.BleAsyncTask.blePrinterCheckStop()
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                boolean r0 = r0.isFinishSearchPrinter
-                if (r0 == 0) goto L_0x021b
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                boolean r0 = r0.isSearchSimpleAp
-                if (r0 == 0) goto L_0x0227
-            L_0x021b:
-                java.lang.String r0 = "MaintainPrinterSearchActivity"
-                java.lang.String r1 = "cancelSearch for SELECT_PRINTER"
-                epson.print.Util.EPLog.m313i(r0, r1)
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                r0.interruptSearch()
-            L_0x0227:
-                java.lang.Object r8 = r8.obj
-                epson.print.MyPrinter r8 = (epson.print.MyPrinter) r8
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                r8.setCurPrinter(r0)
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                android.content.Context r0 = r0.getApplicationContext()
-                java.lang.String r1 = "PrintSetting"
-                java.lang.String r2 = "RE_SEARCH"
-                epson.common.Utils.savePref((android.content.Context) r0, (java.lang.String) r1, (java.lang.String) r2, (boolean) r4)
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                int r0 = r0.printer_location
-                if (r0 != r4) goto L_0x0268
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                java.lang.String r1 = r8.getPrinterId()
-                java.lang.String r1 = com.epson.mobilephone.common.wifidirect.MacAddrUtils.getMacAddressFromPrinterId(r1)
-                java.lang.String r0 = com.epson.mobilephone.common.wifidirect.WiFiDirectManager.getCurConnectInfo(r0, r1)
-                if (r0 == 0) goto L_0x0261
-                epson.maintain.activity.MaintainPrinterSearchActivity r1 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                java.lang.String r2 = "printer"
-                java.lang.String r8 = r8.getName()
-                com.epson.mobilephone.common.wifidirect.WiFiDirectManager.setConnectInfo(r1, r0, r2, r8)
-                goto L_0x0268
-            L_0x0261:
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                java.lang.String r0 = "printer"
-                com.epson.mobilephone.common.wifidirect.WiFiDirectManager.resetConnectInfo(r8, r0)
-            L_0x0268:
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                int r8 = r8.printer_location
-                r0 = 2
-                if (r8 != r0) goto L_0x027a
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                epson.common.ExternalFileUtils r8 = epson.common.ExternalFileUtils.getInstance(r8)
-                r8.removeAreaInfo()
-            L_0x027a:
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                r8.commitEPPrinterInfo()
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                r8.setResult(r4)
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                r8.finish()
-                goto L_0x0338
-            L_0x028b:
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                r8.interruptSearch()
-                goto L_0x0338
-            L_0x0292:
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                int r8 = r8.printer_location
-                if (r8 == r4) goto L_0x029c
-                goto L_0x0338
-            L_0x029c:
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                android.os.AsyncTask<java.lang.Void, java.lang.Void, java.lang.Integer> r8 = r8.probePrinterThread
-                if (r8 == 0) goto L_0x02bb
-                android.os.AsyncTask$Status r8 = android.os.AsyncTask.Status.RUNNING
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                android.os.AsyncTask<java.lang.Void, java.lang.Void, java.lang.Integer> r0 = r0.probePrinterThread
-                android.os.AsyncTask$Status r0 = r0.getStatus()
-                boolean r8 = r8.equals(r0)
-                if (r8 == 0) goto L_0x02bb
-                java.lang.String r8 = "MaintainPrinterSearchActivity"
-                java.lang.String r0 = "Cancel serch. probePrinterThread is running."
-                epson.print.Util.EPLog.m305d(r8, r0)
-                goto L_0x0338
-            L_0x02bb:
-                epson.maintain.activity.MaintainPrinterSearchActivity r8 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                r8.search()
-                goto L_0x0338
-            L_0x02c1:
-                android.os.Bundle r8 = r8.getData()
-                java.lang.String r0 = "name"
-                java.lang.String r0 = r8.getString(r0)
-                if (r0 == 0) goto L_0x0338
-                java.lang.String r0 = "ip"
-                java.lang.String r0 = r8.getString(r0)
-                if (r0 == 0) goto L_0x0338
-                java.lang.String r0 = "id"
-                java.lang.String r0 = r8.getString(r0)
-                if (r0 == 0) goto L_0x0338
-                java.lang.String r0 = "common_devicename"
-                java.lang.String r0 = r8.getString(r0)
-                java.lang.StringBuilder r1 = new java.lang.StringBuilder
-                r1.<init>()
-                java.lang.String r2 = "commonDeviceName = "
-                r1.append(r2)
-                r1.append(r0)
-                java.lang.String r1 = r1.toString()
-                com.epson.mobilephone.common.EpLog.m69d(r1)
-                epson.print.MyPrinter r1 = new epson.print.MyPrinter
-                java.lang.String r2 = "name"
-                java.lang.String r2 = r8.getString(r2)
-                java.lang.String r3 = "ip"
-                java.lang.String r3 = r8.getString(r3)
-                java.lang.String r4 = "id"
-                java.lang.String r4 = r8.getString(r4)
-                java.lang.String r6 = "serial_no"
-                java.lang.String r6 = r8.getString(r6)
-                r1.<init>(r2, r3, r4, r6)
-                r1.setCommonDeviceName(r0)
-                epson.maintain.activity.MaintainPrinterSearchActivity r0 = epson.maintain.activity.MaintainPrinterSearchActivity.this
-                com.epson.mobilephone.common.wifidirect.WiFiDirectPrinterListUtils r0 = r0.wiFiDirectPrinterListUtils
-                java.lang.String r2 = "index"
-                java.lang.String r8 = r8.getString(r2)
-                java.lang.Integer r8 = java.lang.Integer.valueOf(r8)
-                int r8 = r8.intValue()
-                java.lang.String r2 = r1.getIp()
-                java.lang.String r3 = r1.getPrinterId()
-                java.lang.String r3 = com.epson.mobilephone.common.wifidirect.MacAddrUtils.getMacAddressFromPrinterId(r3)
-                r0.addPrinter(r1, r8, r2, r3)
-            L_0x0338:
-                return r5
-            */
-            throw new UnsupportedOperationException("Method not decompiled: epson.maintain.activity.MaintainPrinterSearchActivity.C203814.handleMessage(android.os.Message):boolean");
+            throw new UnsupportedOperationException("Method not decompiled: epson.maintain.activity.C203814.handleMessage(android.os.Message):boolean");
         }
     });
     RadioButton mIpButton;
@@ -593,11 +205,11 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         mBleButton.setVisibility(View.GONE);
         mBleButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                MaintainPrinterSearchActivity.this.interruptSearch();
+                interruptSearch();
                 BleAsyncTask.blePrinterCheckStop();
-                Intent intent = new Intent(MaintainPrinterSearchActivity.this.getApplicationContext(), BleWorkActivity.class);
-                intent.putParcelableArrayListExtra(ScannedDevice.TYPE, (ArrayList) MaintainPrinterSearchActivity.mBleButton.getTag());
-                MaintainPrinterSearchActivity.this.startActivityForResult(intent, 15);
+                Intent intent = new Intent(getApplicationContext(), BleWorkActivity.class);
+                intent.putParcelableArrayListExtra(ScannedDevice.TYPE, (ArrayList) mBleButton.getTag());
+                startActivityForResult(intent, 15);
             }
         });
     }
@@ -606,13 +218,12 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         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()));
+                startActivity(PrinterNotFoundDialogCreator.getStartIntent(getApplicationContext()));
             }
         });
     }
 
-    /* access modifiers changed from: package-private */
-    public void addWiFiSetupButton() {
+    private void addWiFiSetupButton() {
         mWiFiSettingButton = mLayout.findViewById(R.id.rlWifiSettings);
         if (this.isJapaneseLocale) {
             ((TextView) mWiFiSettingButton).setText(R.string.str_goto_wifidirect_settings);
@@ -621,7 +232,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         }
         mWiFiSettingButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                MaintainPrinterSearchActivity.this.startWifiPrinterSelect();
+                startWifiPrinterSelect();
             }
         });
     }
@@ -630,12 +241,11 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         startActivityForResult(new Intent(this, ActivityWiFiDirectStart.class), 9);
     }
 
-    /* access modifiers changed from: package-private */
-    public void addAboutRemoteButton() {
+    private void addAboutRemoteButton() {
         mAboutRemoteButton = mLayout.findViewById(R.id.AboutRemoteFrame);
         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/")));
+                startActivity(new Intent("android.intent.action.VIEW", Uri.parse("https://www.epsonconnect.com/iguide/")));
             }
         });
     }
@@ -720,17 +330,17 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         }
         mListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
-                if (MaintainPrinterSearchActivity.this.isFocused.booleanValue()) {
-                    Boolean unused = MaintainPrinterSearchActivity.this.isFocused = false;
+                if (isFocused.booleanValue()) {
+                    Boolean unused = isFocused = false;
                     MaintainPrinterSearchActivity maintainPrinterSearchActivity = MaintainPrinterSearchActivity.this;
-                    maintainPrinterSearchActivity.mIsClickSelect = true;
-                    Message obtainMessage = maintainPrinterSearchActivity.mHandler.obtainMessage();
-                    obtainMessage.obj = MaintainPrinterSearchActivity.mBuilder.getData().elementAt(i);
-                    int access$400 = MaintainPrinterSearchActivity.this.printer_location;
+                    mIsClickSelect = true;
+                    Message obtainMessage = mHandler.obtainMessage();
+                    obtainMessage.obj = mBuilder.getData().elementAt(i);
+                    int access$400 = printer_location;
                     if (access$400 == 1) {
                         String ip = ((MyPrinter) obtainMessage.obj).getIp();
-                        if (!WiFiControl.ConnectType.NONE.equals(WiFiDirectManager.getConnectType(MaintainPrinterSearchActivity.this, ip))) {
-                            MaintainPrinterSearchActivity.this.interruptSearch();
+                        if (!WiFiControl.ConnectType.NONE.equals(WiFiDirectManager.getConnectType(this, ip))) {
+                            interruptSearch();
                             WiFiDirectManager.connect(MaintainPrinterSearchActivity.this, ip, 9);
                         } else {
                             obtainMessage.what = 11;
@@ -741,41 +351,41 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
                         obtainMessage.what = 11;
                     }
                     BleAsyncTask.blePrinterCheckStop();
-                    MaintainPrinterSearchActivity.mHandler.sendMessageDelayed(obtainMessage, 100);
+                    mHandler.sendMessageDelayed(obtainMessage, 100);
                 }
             }
         });
         mListView.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
             public boolean onItemLongClick(AdapterView<?> adapterView, View view, int i, long j) {
-                if (MaintainPrinterSearchActivity.this.printer_location == 1) {
+                if (printer_location == 1) {
                     return true;
                 }
-                int unused = MaintainPrinterSearchActivity.mDeletePos = i;
+                int unused = mDeletePos = i;
                 MaintainPrinterSearchActivity maintainPrinterSearchActivity = MaintainPrinterSearchActivity.this;
-                maintainPrinterSearchActivity.registerForContextMenu(maintainPrinterSearchActivity.mListView);
+                registerForContextMenu(mListView);
                 return false;
             }
         });
         mAddButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                switch (MaintainPrinterSearchActivity.this.printer_location) {
+                switch (printer_location) {
                     case 2:
-                        if (MaintainPrinterSearchActivity.mBuilder.getData().size() >= 32) {
-                            new AlertDialog.Builder(MaintainPrinterSearchActivity.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() {
+                        if (mBuilder.getData().size() >= 32) {
+                            new AlertDialog.Builder(mContext).setCancelable(false).setTitle(getString(R.string.epsonconnect_err_regist_remote_printer_max_size_title)).setMessage(getString(R.string.epsonconnect_err_regist_remote_printer_max_size)).setPositiveButton(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.mContext).setCancelable(false);
-                            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() {
+                        } else if (getSharedPreferences(Constants.PREFS_EPSON_CONNECT, 0).getBoolean(Constants.ENABLE_SHOW_WARNING, true)) {
+                            AlertDialog.Builder cancelable = new AlertDialog.Builder(mContext).setCancelable(false);
+                            cancelable.setMessage(getString(R.string.epsonconnect_str_remote_print_warning) + "\n\n" + getString(R.string.epsonconnect_str_remote_print_warning2)).setPositiveButton(getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialogInterface, int i) {
                                     Message message = new Message();
                                     message.what = 7;
                                     message.obj = null;
-                                    MaintainPrinterSearchActivity.mHandler.sendMessage(message);
+                                    mHandler.sendMessage(message);
                                 }
-                            }).setNegativeButton(MaintainPrinterSearchActivity.this.getString(R.string.str_no), new DialogInterface.OnClickListener() {
+                            }).setNegativeButton(getString(R.string.str_no), new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialogInterface, int i) {
                                 }
                             }).show();
@@ -784,12 +394,12 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
                             Message message = new Message();
                             message.what = 7;
                             message.obj = null;
-                            MaintainPrinterSearchActivity.mHandler.sendMessage(message);
+                            mHandler.sendMessage(message);
                             return;
                         }
                     case 3:
-                        if (MaintainPrinterSearchActivity.mBuilder.getData().size() >= 32) {
-                            new AlertDialog.Builder(MaintainPrinterSearchActivity.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() {
+                        if (mBuilder.getData().size() >= 32) {
+                            new AlertDialog.Builder(mContext).setCancelable(false).setTitle(getString(R.string.epsonconnect_err_regist_remote_printer_max_size_title)).setMessage(getString(R.string.epsonconnect_err_regist_remote_printer_max_size)).setPositiveButton(getString(R.string.str_yes), new DialogInterface.OnClickListener() {
                                 public void onClick(DialogInterface dialogInterface, int i) {
                                 }
                             }).show();
@@ -798,7 +408,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
                         Message message2 = new Message();
                         message2.what = 10;
                         message2.obj = null;
-                        MaintainPrinterSearchActivity.mHandler.sendMessage(message2);
+                        mHandler.sendMessage(message2);
                         return;
                     default:
                         return;
@@ -807,46 +417,46 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         });
         mSearchButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                if (MaintainPrinterSearchActivity.this.printer_location == 1) {
-                    MaintainPrinterSearchActivity.mHandler.sendEmptyMessageDelayed(1, 100);
+                if (printer_location == 1) {
+                    mHandler.sendEmptyMessageDelayed(1, 100);
                 }
             }
         });
         mLocalButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                if (MaintainPrinterSearchActivity.this.printer_location != 1) {
-                    MaintainPrinterSearchActivity.mAddButton.setVisibility(View.GONE);
-                    ((TextView) MaintainPrinterSearchActivity.mLayout.findViewById(R.id.empty)).setVisibility(View.VISIBLE);
-                    MaintainPrinterSearchActivity.this.interruptSearch();
-                    int unused = MaintainPrinterSearchActivity.this.printer_location = 1;
-                    MaintainPrinterSearchActivity.this.buildElements();
-                    MaintainPrinterSearchActivity.mHandler.sendEmptyMessageDelayed(1, 100);
+                if (printer_location != 1) {
+                    mAddButton.setVisibility(View.GONE);
+                    ((TextView) mLayout.findViewById(R.id.empty)).setVisibility(View.VISIBLE);
+                    interruptSearch();
+                    int unused = printer_location = 1;
+                    buildElements();
+                    mHandler.sendEmptyMessageDelayed(1, 100);
                 }
             }
         });
         mRemoteButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                if (MaintainPrinterSearchActivity.this.printer_location != 2) {
-                    int unused = MaintainPrinterSearchActivity.this.printer_location = 2;
-                    MaintainPrinterSearchActivity.this.interruptSearch();
-                    ((TextView) MaintainPrinterSearchActivity.mLayout.findViewById(R.id.empty)).setVisibility(View.GONE);
-                    MaintainPrinterSearchActivity.mBuilder.refresh();
-                    MaintainPrinterSearchActivity.this.buildElements();
-                    MaintainPrinterSearchActivity.this.displaySearchResult();
-                    MaintainPrinterSearchActivity.mSearchButton.setVisibility(View.GONE);
+                if (printer_location != 2) {
+                    int unused = printer_location = 2;
+                    interruptSearch();
+                    ((TextView) mLayout.findViewById(R.id.empty)).setVisibility(View.GONE);
+                    mBuilder.refresh();
+                    buildElements();
+                    displaySearchResult();
+                    mSearchButton.setVisibility(View.GONE);
                 }
             }
         });
         mIpButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                if (MaintainPrinterSearchActivity.this.printer_location != 3) {
-                    int unused = MaintainPrinterSearchActivity.this.printer_location = 3;
-                    MaintainPrinterSearchActivity.this.interruptSearch();
-                    ((TextView) MaintainPrinterSearchActivity.mLayout.findViewById(R.id.empty)).setVisibility(View.GONE);
-                    MaintainPrinterSearchActivity.mBuilder.refresh();
-                    MaintainPrinterSearchActivity.this.buildElements();
-                    MaintainPrinterSearchActivity.this.displaySearchResult();
-                    MaintainPrinterSearchActivity.mSearchButton.setVisibility(View.GONE);
+                if (printer_location != 3) {
+                    int unused = printer_location = 3;
+                    interruptSearch();
+                    ((TextView) mLayout.findViewById(R.id.empty)).setVisibility(View.GONE);
+                    mBuilder.refresh();
+                    buildElements();
+                    displaySearchResult();
+                    mSearchButton.setVisibility(View.GONE);
                 }
             }
         });
@@ -868,9 +478,9 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
             case 1:
                 new AlertDialog.Builder(mContext).setCancelable(false).setTitle(getString(R.string.delete_file)).setIcon(getResources().getDrawable(R.drawable.delete_file)).setNegativeButton(getString(R.string.str_ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        Message obtainMessage = MaintainPrinterSearchActivity.mHandler.obtainMessage();
+                        Message obtainMessage = mHandler.obtainMessage();
                         obtainMessage.what = 6;
-                        MaintainPrinterSearchActivity.mHandler.sendMessageDelayed(obtainMessage, 100);
+                        mHandler.sendMessageDelayed(obtainMessage, 100);
                     }
                 }).setPositiveButton(getString(R.string.str_cancel), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialogInterface, int i) {
@@ -917,14 +527,14 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
             EpLog.d(TAG, "Send CHECK_PRINTER Message.");
         }
         if (this.printer_location == 1 && mBleButton.getTag() == null && BleWork.isStartBleProcess(this, false)) {
-            EpLog.m71e("blePrinterCheck");
+            EpLog.e("blePrinterCheck");
             callBackFuncs();
             BleAsyncTask.blePrinterCheck(this, mBleFind);
         }
     }
 
     protected void onPause() {
-        EpLog.m76i();
+        EpLog.i();
         super.onPause();
         mActivityForegroundLifetime = false;
         interruptSearch();
@@ -937,7 +547,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
     }
 
     protected void onStop() {
-        EpLog.m76i();
+        EpLog.i();
         super.onStop();
     }
 
@@ -986,7 +596,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
                 }
                 return;
             case 15:
-                EpLog.m76i();
+                EpLog.i();
                 finish();
                 return;
             default:
@@ -1024,15 +634,15 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         mPrinter.getMEscpLib().setHanlder(mHandler);
         mSearchThread = new Thread() {
             public void run() {
-                synchronized (MaintainPrinterSearchActivity.mLock) {
-                    boolean unused = MaintainPrinterSearchActivity.this.isFinishSearchPrinter = false;
+                synchronized (mLock) {
+                    boolean unused = isFinishSearchPrinter = false;
                 }
-                MaintainPrinterSearchActivity.mPrinter.doFindPrinter(MaintainPrinterSearchActivity.EPS_PROTOCOL_ALL, 60);
-                if (!MaintainPrinterSearchActivity.this.isFinishSearchPrinter) {
-                    synchronized (MaintainPrinterSearchActivity.mLock) {
-                        boolean unused2 = MaintainPrinterSearchActivity.this.isFinishSearchPrinter = true;
-                        if (!MaintainPrinterSearchActivity.this.isSearchSimpleAp) {
-                            MaintainPrinterSearchActivity.mHandler.sendEmptyMessage(5);
+                mPrinter.doFindPrinter(EPS_PROTOCOL_ALL, 60);
+                if (!isFinishSearchPrinter) {
+                    synchronized (mLock) {
+                        boolean unused2 = isFinishSearchPrinter = true;
+                        if (!isSearchSimpleAp) {
+                            mHandler.sendEmptyMessage(5);
                         }
                     }
                 }
@@ -1041,142 +651,8 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         mSearchThread.start();
     }
 
-    /* access modifiers changed from: private */
-    /* JADX WARNING: Code restructure failed: missing block: B:12:0x003b, code lost:
-        r6.mPrinter.doCancelFindPrinter();
-        r0 = r6.mSearchThread;
-     */
-    /* JADX WARNING: Code restructure failed: missing block: B:13:0x0042, code lost:
-        if (r0 == null) goto L_0x0098;
-     */
-    /* JADX WARNING: Code restructure failed: missing block: B:15:0x0048, code lost:
-        if (r0.isAlive() == false) goto L_0x0098;
-     */
-    /* JADX WARNING: Code restructure failed: missing block: B:16:0x004a, code lost:
-        r6.mSearchThread.interrupt();
-     */
-    /* JADX WARNING: Code restructure failed: missing block: B:18:?, code lost:
-        epson.print.Util.EPLog.m305d(TAG, "mSearchThread.join() enter");
-        r6.mSearchThread.join(1000);
-     */
-    /* JADX WARNING: Code restructure failed: missing block: B:20:0x0069, code lost:
-        if (java.lang.Thread.State.RUNNABLE.equals(r6.mSearchThread.getState()) == false) goto L_0x008c;
-     */
-    /* JADX WARNING: Code restructure failed: missing block: B:21:0x006b, code lost:
-        r0 = r2 + 1;
-     */
-    /* JADX WARNING: Code restructure failed: missing block: B:22:0x006f, code lost:
-        if (r2 <= 60) goto L_0x0079;
-     */
-    /* JADX WARNING: Code restructure failed: missing block: B:23:0x0071, code lost:
-        epson.print.Util.EPLog.m318w(TAG, "mSearchThread.join() timeout");
-     */
-    /* JADX WARNING: Code restructure failed: missing block: B:24:0x0079, code lost:
-        epson.print.Util.EPLog.m305d(TAG, "retry doCancelFindPrinter()");
-        r6.mPrinter.doCancelFindPrinter();
-        r6.mSearchThread.join(1000);
-        r2 = r0;
-     */
-    /* JADX WARNING: Code restructure failed: missing block: B:25:0x008c, code lost:
-        epson.print.Util.EPLog.m305d(TAG, "mSearchThread.join() leave");
-     */
-    /* JADX WARNING: Code restructure failed: missing block: B:26:0x0094, code lost:
-        r0 = move-exception;
-     */
-    /* JADX WARNING: Code restructure failed: missing block: B:27:0x0095, code lost:
-        r0.printStackTrace();
-     */
-    /* Code decompiled incorrectly, please refer to instructions dump. */
     public void interruptSearch() {
-        /*
-            r6 = this;
-            java.lang.String r0 = "MaintainPrinterSearchActivity"
-            java.lang.String r1 = "interruptSearch()"
-            epson.print.Util.EPLog.m305d(r0, r1)
-            android.os.Handler r0 = r6.mHandler
-            r1 = 1
-            r0.removeMessages(r1)
-            android.os.Handler r0 = r6.mHandler
-            r2 = 13
-            r0.removeMessages(r2)
-            android.os.Handler r0 = r6.mHandler
-            r2 = 0
-            r0.removeMessages(r2)
-            android.os.Handler r0 = r6.mHandler
-            r3 = 8
-            r0.removeMessages(r3)
-            java.lang.Object r0 = mLock
-            monitor-enter(r0)
-            com.epson.mobilephone.common.wifidirect.SearchWiFiDirectPrinterTask r4 = r6.searchWiFiDirectPrinter     // Catch:{ all -> 0x009e }
-            if (r4 == 0) goto L_0x0030
-            com.epson.mobilephone.common.wifidirect.SearchWiFiDirectPrinterTask r4 = r6.searchWiFiDirectPrinter     // Catch:{ all -> 0x009e }
-            r4.interrupt()     // Catch:{ all -> 0x009e }
-            r4 = 0
-            r6.searchWiFiDirectPrinter = r4     // Catch:{ all -> 0x009e }
-        L_0x0030:
-            r6.isSearchSimpleAp = r2     // Catch:{ all -> 0x009e }
-            boolean r4 = r6.isFinishSearchPrinter     // Catch:{ all -> 0x009e }
-            if (r4 != r1) goto L_0x0038
-            monitor-exit(r0)     // Catch:{ all -> 0x009e }
-            return
-        L_0x0038:
-            r6.isFinishSearchPrinter = r1     // Catch:{ all -> 0x009e }
-            monitor-exit(r0)     // Catch:{ all -> 0x009e }
-            com.epson.mobilephone.common.maintain2.MaintainPrinter2 r0 = r6.mPrinter
-            r0.doCancelFindPrinter()
-            java.lang.Thread r0 = r6.mSearchThread
-            if (r0 == 0) goto L_0x0098
-            boolean r0 = r0.isAlive()
-            if (r0 == 0) goto L_0x0098
-            java.lang.Thread r0 = r6.mSearchThread
-            r0.interrupt()
-            java.lang.String r0 = "MaintainPrinterSearchActivity"
-            java.lang.String r1 = "mSearchThread.join() enter"
-            epson.print.Util.EPLog.m305d(r0, r1)     // Catch:{ InterruptedException -> 0x0094 }
-            java.lang.Thread r0 = r6.mSearchThread     // Catch:{ InterruptedException -> 0x0094 }
-            r4 = 1000(0x3e8, double:4.94E-321)
-            r0.join(r4)     // Catch:{ InterruptedException -> 0x0094 }
-        L_0x005d:
-            java.lang.Thread$State r0 = java.lang.Thread.State.RUNNABLE     // Catch:{ InterruptedException -> 0x0094 }
-            java.lang.Thread r1 = r6.mSearchThread     // Catch:{ InterruptedException -> 0x0094 }
-            java.lang.Thread$State r1 = r1.getState()     // Catch:{ InterruptedException -> 0x0094 }
-            boolean r0 = r0.equals(r1)     // Catch:{ InterruptedException -> 0x0094 }
-            if (r0 == 0) goto L_0x008c
-            int r0 = r2 + 1
-            r1 = 60
-            if (r2 <= r1) goto L_0x0079
-            java.lang.String r0 = "MaintainPrinterSearchActivity"
-            java.lang.String r1 = "mSearchThread.join() timeout"
-            epson.print.Util.EPLog.m318w((java.lang.String) r0, (java.lang.String) r1)     // Catch:{ InterruptedException -> 0x0094 }
-            goto L_0x008c
-        L_0x0079:
-            java.lang.String r1 = "MaintainPrinterSearchActivity"
-            java.lang.String r2 = "retry doCancelFindPrinter()"
-            epson.print.Util.EPLog.m305d(r1, r2)     // Catch:{ InterruptedException -> 0x0094 }
-            com.epson.mobilephone.common.maintain2.MaintainPrinter2 r1 = r6.mPrinter     // Catch:{ InterruptedException -> 0x0094 }
-            r1.doCancelFindPrinter()     // Catch:{ InterruptedException -> 0x0094 }
-            java.lang.Thread r1 = r6.mSearchThread     // Catch:{ InterruptedException -> 0x0094 }
-            r1.join(r4)     // Catch:{ InterruptedException -> 0x0094 }
-            r2 = r0
-            goto L_0x005d
-        L_0x008c:
-            java.lang.String r0 = "MaintainPrinterSearchActivity"
-            java.lang.String r1 = "mSearchThread.join() leave"
-            epson.print.Util.EPLog.m305d(r0, r1)     // Catch:{ InterruptedException -> 0x0094 }
-            goto L_0x0098
-        L_0x0094:
-            r0 = move-exception
-            r0.printStackTrace()
-        L_0x0098:
-            android.widget.ProgressBar r0 = r6.mProgressBar
-            r0.setVisibility(r3)
-            return
-        L_0x009e:
-            r1 = move-exception
-            monitor-exit(r0)     // Catch:{ all -> 0x009e }
-            throw r1
-        */
-        throw new UnsupportedOperationException("Method not decompiled: epson.maintain.activity.MaintainPrinterSearchActivity.interruptSearch():void");
+        throw new UnsupportedOperationException("Method not decompiled: epson.maintain.activity.interruptSearch():void");
     }
 
     public void displaySearchResult() {
@@ -1231,27 +707,8 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         }
     }
 
-    /* access modifiers changed from: package-private */
-    /* JADX WARNING: Failed to process nested try/catch */
-    /* JADX WARNING: Missing exception handler attribute for start block: B:11:0x0012 */
-    /* Code decompiled incorrectly, please refer to instructions dump. */
     public void removeAllDialog() {
-        /*
-            r1 = this;
-            r0 = 2131624360(0x7f0e01a8, float:1.8875898E38)
-            r1.removeDialog(r0)     // Catch:{ IllegalArgumentException -> 0x0006 }
-        L_0x0006:
-            r0 = 2131624125(0x7f0e00bd, float:1.887542E38)
-            r1.removeDialog(r0)     // Catch:{ IllegalArgumentException -> 0x000c }
-        L_0x000c:
-            r0 = 2131624361(0x7f0e01a9, float:1.88759E38)
-            r1.removeDialog(r0)     // Catch:{ IllegalArgumentException -> 0x0012 }
-        L_0x0012:
-            r1.dismissPrinterNotFoundDialog()     // Catch:{ Exception -> 0x0015 }
-        L_0x0015:
-            return
-        */
-        throw new UnsupportedOperationException("Method not decompiled: epson.maintain.activity.MaintainPrinterSearchActivity.removeAllDialog():void");
+        throw new UnsupportedOperationException("Method not decompiled: epson.maintain.activity.removeAllDialog():void");
     }
 
     public void searchButtonSetEnabled(boolean z) {
@@ -1263,8 +720,7 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void commitEPPrinterInfo() {
+    private void commitEPPrinterInfo() {
         EPPrinterManager ePPrinterManager = new EPPrinterManager(mContext);
         ePPrinterManager.commitIPPrinterInfo();
         ePPrinterManager.commitRemotePrinterInfo();
@@ -1280,11 +736,11 @@ public class MaintainPrinterSearchActivity extends ActivityIACommon implements C
         mBleFind = new BLEUtility.BleWorkCallback() {
             public void call(Object obj) {
                 ArrayList arrayList = (ArrayList) obj;
-                EpLog.m69d(" ★★　mDevicelist " + arrayList.size());
-                if (MaintainPrinterSearchActivity.this.printer_location == 1) {
-                    MaintainPrinterSearchActivity.mBleButton.setVisibility(View.VISIBLE);
+                EpLog.d(" ★★　mDevicelist " + arrayList.size());
+                if (printer_location == 1) {
+                    mBleButton.setVisibility(View.VISIBLE);
                 }
-                MaintainPrinterSearchActivity.mBleButton.setTag(arrayList);
+                mBleButton.setTag(arrayList);
             }
         };
     }

app/src/main/java/epson/print/IprintHome.java

@@ -110,9 +110,9 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
                 case 1:
                     EPLog.m313i(TAG, "UPDATE_PRINTER_STATUS");
                     int[] unused = mPrinterStatus = mPrinter.getMPrinterInfor().getMStatus();
-                    EpLog.m69d("status " + mPrinterStatus);
-                    EpLog.m69d("printerLocation " + printerLocation);
-                    EpLog.m69d("finishProbe" + finishProbe);
+                    EpLog.d("status " + mPrinterStatus);
+                    EpLog.d("printerLocation " + printerLocation);
+                    EpLog.d("finishProbe" + finishProbe);
                     String str = "";
                     if (printerLocation == 1 && WiFiDirectManager.getConnectInfo(getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_PRINTER) != null) {
                         str = getString(R.string.wifi_direct_status);
@@ -289,7 +289,7 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
 
     protected void onResume() {
         EPLog.m313i(TAG, "onResume()");
-        EpLog.m76i();
+        EpLog.i();
         super.onResume();
         ExternalFileUtils.getInstance(this).initTempViewDir();
         ExternalFileUtils.getInstance(this).initTempCRDir();

app/src/main/java/epson/print/WebviewActivity.java

@@ -18,7 +18,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.VisibleForTesting;
+
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;

app/src/main/java/epson/print/copy/ActivityBase.java

@@ -68,8 +68,7 @@ class ActivityBase extends ActivityIACommon {
         void onOptionItemChanged(ECopyOptionItem eCopyOptionItem);
     }
 
-    /* access modifiers changed from: package-private */
-    public void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
+    private void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
     }
 
     ActivityBase() {
@@ -81,8 +80,7 @@ class ActivityBase extends ActivityIACommon {
         Dialog cancelDialog;
         TextView messageText = ((TextView) findViewById(R.id.messageText));
 
-        /* access modifiers changed from: package-private */
-        public Dialog createCancelDialog() {
+        private Dialog createCancelDialog() {
             AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
             builder.setMessage(ActivityBase.this.getString(R.string.str_msg_scan_cancel));
             builder.setCancelable(false);
@@ -108,8 +106,7 @@ class ActivityBase extends ActivityIACommon {
             setCancelable(false);
         }
 
-        /* access modifiers changed from: package-private */
-        public void show(String str, CancelRequestCallback cancelRequestCallback) {
+        private void show(String str, CancelRequestCallback cancelRequestCallback) {
             this.cancelCallback = cancelRequestCallback;
             this.messageText.setText(str);
             this.messageText.setVisibility(0);
@@ -125,18 +122,15 @@ class ActivityBase extends ActivityIACommon {
             show();
         }
 
-        /* access modifiers changed from: package-private */
-        public void setText(String str) {
+        private void setText(String str) {
             this.messageText.setText(str);
         }
 
-        /* access modifiers changed from: package-private */
-        public void hideCancelButton() {
+        private void hideCancelButton() {
             this.cancelButton.setVisibility(4);
         }
 
-        /* access modifiers changed from: package-private */
-        public void dissmiss() {
+        private void dissmiss() {
             super.dismiss();
             Dialog dialog = this.cancelDialog;
             if (dialog != null) {
@@ -161,18 +155,15 @@ class ActivityBase extends ActivityIACommon {
             this.context = context2;
         }
 
-        /* access modifiers changed from: package-private */
-        public void showErrorDialog(String str, String str2) {
+        private void showErrorDialog(String str, String str2) {
             showErrorDialog(str, str2, DialogButtons.Ok, (IClose) null);
         }
 
-        /* access modifiers changed from: package-private */
-        public void showErrorDialog(int i) {
+        private void showErrorDialog(int i) {
             showErrorDialog((String) null, ActivityBase.this.getString(i));
         }
 
-        /* access modifiers changed from: package-private */
-        public void showErrorDialog(String str, String str2, final DialogButtons dialogButtons, final IClose iClose) {
+        private void showErrorDialog(String str, String str2, final DialogButtons dialogButtons, final IClose iClose) {
             String str3;
             CustomTitleAlertDialogBuilder customTitleAlertDialogBuilder = new CustomTitleAlertDialogBuilder(this.context);
             String str4 = null;
@@ -223,8 +214,7 @@ class ActivityBase extends ActivityIACommon {
             this.dialog.show();
         }
 
-        /* access modifiers changed from: package-private */
-        public void Cancel() {
+        private void Cancel() {
             Dialog dialog2 = this.dialog;
             if (dialog2 != null) {
                 dialog2.cancel();
@@ -330,8 +320,7 @@ class ActivityBase extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void showNextPageDialog(final INextPageClose iNextPageClose) {
+    private void showNextPageDialog(final INextPageClose iNextPageClose) {
         C21591 r0 = new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 ECopyComponent.ICopyResumeRequest.ResumeState resumeState;
@@ -362,13 +351,11 @@ class ActivityBase extends ActivityIACommon {
         OptionValue() {
         }
 
-        /* access modifiers changed from: package-private */
-        public void setOptionValueChangedListener(OptionItemChangedListener optionItemChangedListener) {
+        private void setOptionValueChangedListener(OptionItemChangedListener optionItemChangedListener) {
             this.changedListener = optionItemChangedListener;
         }
 
-        /* access modifiers changed from: package-private */
-        public String getChoiceString(ECopyOptionItem.ECopyOptionItemChoice eCopyOptionItemChoice) {
+        private String getChoiceString(ECopyOptionItem.ECopyOptionItemChoice eCopyOptionItemChoice) {
             return ActivityBase.this.string(eCopyOptionItemChoice.name());
         }
     }
@@ -381,15 +368,13 @@ class ActivityBase extends ActivityIACommon {
             super();
         }
 
-        /* access modifiers changed from: package-private */
-        public void bindOption(ECopyOptionItem eCopyOptionItem) {
+        private void bindOption(ECopyOptionItem eCopyOptionItem) {
             this.optionItem = eCopyOptionItem;
             this.choices = eCopyOptionItem.getSelectableChoices();
             this.selected = eCopyOptionItem.getSelectedChoice();
         }
 
-        /* access modifiers changed from: package-private */
-        public String[] getKeyArray() {
+        private String[] getKeyArray() {
             String[] strArr = new String[this.choices.size()];
             for (int i = 0; i < this.choices.size(); i++) {
                 strArr[i] = ActivityBase.this.string(this.choices.get(i).name());
@@ -408,8 +393,7 @@ class ActivityBase extends ActivityIACommon {
             super();
         }
 
-        /* access modifiers changed from: package-private */
-        public void updateWithAddition(int i) {
+        private void updateWithAddition(int i) {
             try {
                 this.value = Integer.valueOf(this.editText.getText().toString()).intValue();
                 this.value = Math.min(Math.max(this.optionItem.getMinimumValue(), this.value + i), this.optionItem.getMaximumValue());
@@ -433,14 +417,12 @@ class ActivityBase extends ActivityIACommon {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public void bindOption(ECopyOptionItem eCopyOptionItem) {
+        private void bindOption(ECopyOptionItem eCopyOptionItem) {
             this.optionItem = eCopyOptionItem;
             this.value = eCopyOptionItem.getSelectedValue();
         }
 
-        /* access modifiers changed from: package-private */
-        public void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
+        private void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
             this.optionItem = eCopyOptionItem;
             this.editText = (TextView) ActivityBase.this.findViewById(i);
             this.value = eCopyOptionItem.getSelectedValue();
@@ -448,8 +430,7 @@ class ActivityBase extends ActivityIACommon {
             this.editText.setEnabled(eCopyOptionItem.isEnabled());
         }
 
-        /* access modifiers changed from: package-private */
-        public void bindCountUp(int i) {
+        private void bindCountUp(int i) {
             this.countUp = (Button) ActivityBase.this.findViewById(i);
             this.countUp.setOnClickListener(new Counter(1));
             if (this.value == this.optionItem.getMaximumValue()) {
@@ -459,8 +440,7 @@ class ActivityBase extends ActivityIACommon {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public void bindCountDown(int i) {
+        private void bindCountDown(int i) {
             this.countDown = (Button) ActivityBase.this.findViewById(i);
             this.countDown.setOnClickListener(new Counter(-1));
             if (this.value == this.optionItem.getMinimumValue()) {
@@ -478,8 +458,7 @@ class ActivityBase extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public String string(String str) {
+    private String string(String str) {
         return (String) (strings.containsKey(str) ? strings.get(str) : strings.get("Unknown"));
     }
 
@@ -490,22 +469,19 @@ class ActivityBase extends ActivityIACommon {
         settingPreference() {
         }
 
-        /* access modifiers changed from: package-private */
-        public String loadPrePrinter() {
+        private String loadPrePrinter() {
             this.presettings = ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
             return this.presettings.getString(Constants.PRINTER_ID, (String) null);
         }
 
-        /* access modifiers changed from: package-private */
-        public void savePrePrinter() {
+        private void savePrePrinter() {
             this.presettings = ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
             this.editer = this.presettings.edit();
             this.editer.putString(Constants.PRINTER_ID, ActivityBase.printerId);
             this.editer.commit();
         }
 
-        /* access modifiers changed from: package-private */
-        public void setCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
+        private void setCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
             ECopyOptionContext bindedCopyOptionContext = ActivityBase.this.copyComponent.getBindedCopyOptionContext();
             Iterator<ECopyOptionItem> it = arrayList.iterator();
             while (it.hasNext()) {
@@ -522,8 +498,7 @@ class ActivityBase extends ActivityIACommon {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public void setOption(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey, ECopyOptionItem eCopyOptionItem) {
+        private void setOption(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey, ECopyOptionItem eCopyOptionItem) {
             this.presettings = ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
             if (eCopyOptionItem.getChoiceType() == ECopyOptionItem.ECopyOptionItemChoiceType.ChoiceArray) {
                 eCopyOptionItem.selectChoice(ECopyOptionItem.ECopyOptionItemChoice.valueOf(eCopyOptionItemKey, ERemoteOperation.ERemoteParam.stringOf(this.presettings.getString(eCopyOptionItemKey.name(), eCopyOptionItem.getDefaultChoice().getParam().toString()))));
@@ -535,8 +510,7 @@ class ActivityBase extends ActivityIACommon {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public void saveCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
+        private void saveCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
             savePrePrinter();
             Iterator<ECopyOptionItem> it = arrayList.iterator();
             while (it.hasNext()) {
@@ -548,8 +522,7 @@ class ActivityBase extends ActivityIACommon {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public void saveOption(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey, ECopyOptionItem eCopyOptionItem) {
+        private void saveOption(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey, ECopyOptionItem eCopyOptionItem) {
             this.presettings = ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
             if (eCopyOptionItem.getChoiceType() == ECopyOptionItem.ECopyOptionItemChoiceType.ChoiceArray) {
                 String access$000 = ActivityBase.this.TAG;

app/src/main/java/epson/print/copy/Component/ecopycomponent/CopyPhotoSettingHandler.java

@@ -62,8 +62,7 @@ class CopyPhotoSettingHandler extends DefaultHandler {
         return this.scanCopies.size() > 0;
     }
 
-    /* access modifiers changed from: package-private */
-    public String xFormat(String str, String str2) {
+    private String xFormat(String str, String str2) {
         StringBuffer stringBuffer = new StringBuffer();
         String[] split = str.split(PreferencesConstants.COOKIE_DELIMITER);
         int length = split.length;

app/src/main/java/epson/print/copy/Component/ecopycomponent/ECopyOptionContext.java

@@ -55,8 +55,7 @@ public class ECopyOptionContext implements Parcelable {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public boolean isNull() {
+    private boolean isNull() {
         return this.copyType == null;
     }
 
@@ -83,18 +82,15 @@ public class ECopyOptionContext implements Parcelable {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public ECopyComponent.ECopyType getCopyType() {
+    private ECopyComponent.ECopyType getCopyType() {
         return this.copyType;
     }
 
-    /* access modifiers changed from: package-private */
-    public ArrayList<ECopyOptionItem> getCopyOptionItems() {
+    private ArrayList<ECopyOptionItem> getCopyOptionItems() {
         return this.optionItems;
     }
 
-    /* access modifiers changed from: package-private */
-    public ECopyOptionItem getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey) {
+    private ECopyOptionItem getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey) {
         Iterator<ECopyOptionItem> it = this.optionItems.iterator();
         while (it.hasNext()) {
             ECopyOptionItem next = it.next();
@@ -105,8 +101,7 @@ public class ECopyOptionContext implements Parcelable {
         return null;
     }
 
-    /* access modifiers changed from: package-private */
-    public void add(ECopyOptionItem eCopyOptionItem) {
+    private void add(ECopyOptionItem eCopyOptionItem) {
         this.optionItems.add(eCopyOptionItem);
     }
 
@@ -122,8 +117,7 @@ public class ECopyOptionContext implements Parcelable {
         return null;
     }
 
-    /* access modifiers changed from: package-private */
-    public boolean isChanged(ECopyOptionItem eCopyOptionItem) {
+    private boolean isChanged(ECopyOptionItem eCopyOptionItem) {
         Iterator<ECopyOptionItem> it = this.optionItems.iterator();
         while (true) {
             if (!it.hasNext()) {
@@ -139,13 +133,11 @@ public class ECopyOptionContext implements Parcelable {
         return false;
     }
 
-    /* access modifiers changed from: package-private */
-    public void setCopyOptionsResult(ERemoteCopy.ERemoteCopyOptionsResult eRemoteCopyOptionsResult) {
+    private void setCopyOptionsResult(ERemoteCopy.ERemoteCopyOptionsResult eRemoteCopyOptionsResult) {
         this.copyOptionsResult = eRemoteCopyOptionsResult;
     }
 
-    /* access modifiers changed from: package-private */
-    public ERemoteCopy.ERemoteCopyOptionsResult getCopyOptionsResult() {
+    private ERemoteCopy.ERemoteCopyOptionsResult getCopyOptionsResult() {
         return this.copyOptionsResult;
     }
 }

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

@@ -146,8 +146,7 @@ public class ECopyPreview extends View {
         resize();
     }
 
-    /* access modifiers changed from: package-private */
-    public void requestInvalidateView() {
+    private void requestInvalidateView() {
         ((Activity) getContext()).runOnUiThread(new Runnable() {
             public void run() {
                 ECopyPreview.this.listener.needInvalidateView();
@@ -192,8 +191,7 @@ public class ECopyPreview extends View {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void compose(ECopyOptionContext eCopyOptionContext, ICopyPreviewCommitEditedOptionContext iCopyPreviewCommitEditedOptionContext) {
+    private void compose(ECopyOptionContext eCopyOptionContext, ICopyPreviewCommitEditedOptionContext iCopyPreviewCommitEditedOptionContext) {
         this.optionContext = eCopyOptionContext;
         this.optionCommitter = iCopyPreviewCommitEditedOptionContext;
         this.copiesOpiton = this.optionContext.getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey.Copies);
@@ -202,8 +200,7 @@ public class ECopyPreview extends View {
         resize();
     }
 
-    /* access modifiers changed from: package-private */
-    public void resize() {
+    private void resize() {
         int i = (this.drawSize.width - this.paperPadding.left) - this.paperPadding.right;
         int i2 = (this.drawSize.height - this.paperPadding.top) - this.paperPadding.bottom;
         ECopyComponent.ECopyType copyType = this.optionContext.getCopyType();
@@ -290,8 +287,7 @@ public class ECopyPreview extends View {
             this.height = size.height;
         }
 
-        /* access modifiers changed from: package-private */
-        public void scale(float f) {
+        private void scale(float f) {
             this.width = (int) (((float) this.width) * f);
             this.height = (int) (((float) this.height) * f);
         }
@@ -304,42 +300,32 @@ public class ECopyPreview extends View {
             Min
         }
 
-        /* access modifiers changed from: package-private */
-        public abstract Bitmap getBitmap();
+        private abstract Bitmap getBitmap();
 
-        /* access modifiers changed from: package-private */
-        public abstract RectF getCopyFrame();
+        private abstract RectF getCopyFrame();
 
-        /* access modifiers changed from: package-private */
-        public abstract Point getOffset();
+        private abstract Point getOffset();
 
-        /* access modifiers changed from: package-private */
-        public abstract RectF getPaperRect();
+        private abstract RectF getPaperRect();
 
-        /* access modifiers changed from: package-private */
-        public abstract float getScanImageScale(int i, int i2);
+        private abstract float getScanImageScale(int i, int i2);
 
-        /* access modifiers changed from: package-private */
-        public abstract void setCopyScale(float f);
+        private abstract void setCopyScale(float f);
 
-        /* access modifiers changed from: package-private */
-        public abstract void setPaperFrame(RectF rectF);
+        private abstract void setPaperFrame(RectF rectF);
 
-        /* access modifiers changed from: package-private */
-        public abstract void setScanImage(Bitmap bitmap);
+        private abstract void setScanImage(Bitmap bitmap);
 
         Layout() {
         }
 
-        /* access modifiers changed from: package-private */
-        public void scaleRect(float f, RectF rectF) {
+        private void scaleRect(float f, RectF rectF) {
             Matrix matrix = new Matrix();
             matrix.postScale(f, f);
             matrix.mapRect(rectF);
         }
 
-        /* access modifiers changed from: package-private */
-        public float getAspectFitScale(float f, float f2, float f3, float f4, AspectFit aspectFit) {
+        private float getAspectFitScale(float f, float f2, float f3, float f4, AspectFit aspectFit) {
             PointF pointF = new PointF();
             pointF.x = f / f3;
             pointF.y = f2 / f4;
@@ -418,8 +404,7 @@ public class ECopyPreview extends View {
             invalidatePaperSize();
         }
 
-        /* access modifiers changed from: package-private */
-        public Bitmap getBitmap() {
+        private Bitmap getBitmap() {
             boolean showPaper = showPaper();
             Bitmap bitmap = showPaper ? this.paperImage : this.maxPaperImage;
             this.canvas = new Canvas(bitmap);
@@ -445,24 +430,20 @@ public class ECopyPreview extends View {
             return bitmap;
         }
 
-        /* access modifiers changed from: package-private */
-        public float getScanImageScale(int i, int i2) {
+        private float getScanImageScale(int i, int i2) {
             this.imageScale = getAspectFitScale((float) ((ECopyPreview.this.drawSize.width - ECopyPreview.this.paperPadding.left) - ECopyPreview.this.paperPadding.right), (float) ((ECopyPreview.this.drawSize.height - ECopyPreview.this.paperPadding.top) - ECopyPreview.this.paperPadding.bottom), (float) i, (float) i2, Layout.AspectFit.Min);
             return this.imageScale;
         }
 
-        /* access modifiers changed from: package-private */
-        public void setScanImage(Bitmap bitmap) {
+        private void setScanImage(Bitmap bitmap) {
             this.scanImage = bitmap;
         }
 
-        /* access modifiers changed from: package-private */
-        public Point getOffset() {
+        private Point getOffset() {
             return new Point(this.offset);
         }
 
-        /* access modifiers changed from: package-private */
-        public void setPaperFrame(RectF rectF) {
+        private void setPaperFrame(RectF rectF) {
             this.scanFrame = new RectF(rectF);
             scaleRect(this.imageScale, this.scanFrame);
             this.copyFrame = new RectF(rectF);
@@ -475,8 +456,7 @@ public class ECopyPreview extends View {
             invalidatePaperSize();
         }
 
-        /* access modifiers changed from: package-private */
-        public RectF getCopyFrame() {
+        private RectF getCopyFrame() {
             RectF rectF;
             if (showPaper() || this.scanImage == null || (rectF = this.copyFrame) == null) {
                 return null;
@@ -488,14 +468,12 @@ public class ECopyPreview extends View {
             return rectF2;
         }
 
-        /* access modifiers changed from: package-private */
-        public void setCopyScale(float f) {
+        private void setCopyScale(float f) {
             this.copyScale = f;
             invalidatePaperSize();
         }
 
-        /* access modifiers changed from: package-private */
-        public boolean showPaper() {
+        private boolean showPaper() {
             boolean z = this.copyScale < this.limitCopyScaleDown;
             if (this.autofitEnabled) {
                 return true;
@@ -503,8 +481,7 @@ public class ECopyPreview extends View {
             return z;
         }
 
-        /* access modifiers changed from: package-private */
-        public void invalidatePaperSize() {
+        private void invalidatePaperSize() {
             Size size = showPaper() ? this.paperSize : ECopyPreview.this.Max;
             float aspectFitScale = getAspectFitScale((float) this.layoutWidth, (float) this.layoutHeight, (float) size.width, (float) size.height, Layout.AspectFit.Min);
             this.paper = new RectF(0.0f, 0.0f, (float) size.width, (float) size.height);
@@ -513,13 +490,11 @@ public class ECopyPreview extends View {
             this.offset.y = ((int) (((float) this.layoutHeight) - this.paper.bottom)) / 2;
         }
 
-        /* access modifiers changed from: package-private */
-        public void calcLimitCopyScaleDown() {
+        private void calcLimitCopyScaleDown() {
             this.limitCopyScaleDown = getAspectFitScale(this.copyFrame.right, this.copyFrame.bottom, this.paper.width(), this.paper.height(), Layout.AspectFit.Max);
         }
 
-        /* access modifiers changed from: package-private */
-        public RectF getPaperRect() {
+        private RectF getPaperRect() {
             return new RectF(0.0f, 0.0f, this.paper.width(), this.paper.height());
         }
     }
@@ -529,8 +504,7 @@ public class ECopyPreview extends View {
             super(i, i2);
         }
 
-        /* access modifiers changed from: package-private */
-        public Bitmap getBitmap() {
+        private Bitmap getBitmap() {
             boolean showPaper = showPaper();
             Bitmap bitmap = showPaper ? this.paperImage : this.maxPaperImage;
             this.canvas = new Canvas(bitmap);
@@ -587,8 +561,7 @@ public class ECopyPreview extends View {
             this.f367BO = 15;
         }
 
-        /* access modifiers changed from: package-private */
-        public Bitmap getBitmap() {
+        private Bitmap getBitmap() {
             boolean showPaper = showPaper();
             Bitmap bitmap = showPaper ? this.paperImage : this.maxPaperImage;
             this.canvas = new Canvas(bitmap);
@@ -613,8 +586,7 @@ public class ECopyPreview extends View {
             return bitmap;
         }
 
-        /* access modifiers changed from: package-private */
-        public void setPaperFrame(RectF rectF) {
+        private void setPaperFrame(RectF rectF) {
             this.scanFrame = new RectF(rectF);
             scaleRect(this.imageScale, this.scanFrame);
             this.copyFrame = new RectF(rectF);
@@ -637,13 +609,11 @@ public class ECopyPreview extends View {
         RectF page2;
         RectF paper;
 
-        /* access modifiers changed from: package-private */
-        public RectF getCopyFrame() {
+        private RectF getCopyFrame() {
             return null;
         }
 
-        /* access modifiers changed from: package-private */
-        public void setCopyScale(float f) {
+        private void setCopyScale(float f) {
         }
 
         Layout2Up(int i, int i2) {
@@ -678,33 +648,28 @@ public class ECopyPreview extends View {
             return createBitmap;
         }
 
-        /* access modifiers changed from: package-private */
-        public float getScanImageScale(int i, int i2) {
+        private float getScanImageScale(int i, int i2) {
             this.imageScale = getAspectFitScale(this.page1.width(), this.page1.height(), (float) i, (float) i2, Layout.AspectFit.Min);
             return this.imageScale;
         }
 
-        /* access modifiers changed from: package-private */
-        public void setScanImage(Bitmap bitmap) {
+        private void setScanImage(Bitmap bitmap) {
             Rect rect = new Rect((int) this.copyFrame.left, (int) this.copyFrame.top, (int) this.copyFrame.right, (int) this.copyFrame.bottom);
             this.page1Bitmap = Bitmap.createBitmap((int) this.page1.width(), (int) this.page1.height(), Bitmap.Config.ARGB_8888);
             Canvas canvas = new Canvas(this.page1Bitmap);
             canvas.drawBitmap(bitmap, rect, new RectF(0.0f, 0.0f, (float) canvas.getWidth(), (float) canvas.getHeight()), (Paint) null);
         }
 
-        /* access modifiers changed from: package-private */
-        public Point getOffset() {
+        private Point getOffset() {
             return new Point(this.offset);
         }
 
-        /* access modifiers changed from: package-private */
-        public void setPaperFrame(RectF rectF) {
+        private void setPaperFrame(RectF rectF) {
             this.copyFrame = new RectF(rectF);
             scaleRect(this.imageScale, this.copyFrame);
         }
 
-        /* access modifiers changed from: package-private */
-        public RectF getPaperRect() {
+        private RectF getPaperRect() {
             return new RectF(0.0f, 0.0f, this.paper.width(), this.paper.height());
         }
     }

app/src/main/java/epson/print/copy/Component/ecopycomponent/PreviewScanTask.java

@@ -36,8 +36,7 @@ class PreviewScanTask extends AsyncTask<Void, Void, Void> implements IScanContro
         this.statusListener = iCopyStatusListener;
     }
 
-    /* access modifiers changed from: package-private */
-    public void setPropertyValue(int i, Object obj) {
+    private void setPropertyValue(int i, Object obj) {
         this.properties.put(Integer.valueOf(i), obj);
     }
 

app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteCopyGetOptionTask.java

@@ -50,8 +50,7 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
         this.clientID = str;
     }
 
-    /* access modifiers changed from: package-private */
-    public Result getErrorResult(ERemoteOperation.ERemoteOperationResult eRemoteOperationResult) {
+    private Result getErrorResult(ERemoteOperation.ERemoteOperationResult eRemoteOperationResult) {
         Result result = new Result();
         if (eRemoteOperationResult.isNull(ERemoteOperation.ERemoteParam.success)) {
             result.error = ECopyComponent.ICopyOptionContextListener.ContextCreationError.ErrorCommunication;
@@ -61,8 +60,7 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
         return result;
     }
 
-    /* access modifiers changed from: package-private */
-    public Result checkDeviceError() {
+    private Result checkDeviceError() {
         Result result = new Result();
         result.copyType = this.copyType;
         ERemoteDevice eRemoteDevice = new ERemoteDevice();

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

@@ -36,8 +36,7 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
     class Result {
         ECopyComponent.ICopyStatusListener.CopyTaskResult taskResult;
 
-        /* access modifiers changed from: package-private */
-        public void setResult(ERemoteOperation.ERemoteParam eRemoteParam) {
+        private void setResult(ERemoteOperation.ERemoteParam eRemoteParam) {
             switch (eRemoteParam) {
                 case none:
                     this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Succeed;
@@ -158,16 +157,14 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
         this.statusListener.onProcessed(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy, progress2.totalPages, progress2.currentPages, progress2.taskProgress, progress2.resumeRequest);
     }
 
-    /* access modifiers changed from: package-private */
-    public void resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
+    private void resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
         synchronized (this.progress) {
             this.progress.resumeState = resumeState;
             this.progress.notify();
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public int resumeExecute() {
+    private int resumeExecute() {
         int i = 1000;
         if (this.progress.resumeRequest == null) {
             return 1000;
@@ -203,8 +200,7 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
         return i;
     }
 
-    /* access modifiers changed from: package-private */
-    public ERemoteOperation.ERemoteReasonResult startCopy() {
+    private ERemoteOperation.ERemoteReasonResult startCopy() {
         ERemoteCopy.ERemoteCopyResult copy = this.operation.copy(new ERemoteCopyPhoto.IRemoteCopyPhotoParameter() {
             public String client_id() {
                 return RemoteCopyPhotoTask.this.clientID;

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

@@ -48,8 +48,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
     class Result {
         ECopyComponent.ICopyStatusListener.CopyTaskResult taskResult;
 
-        /* access modifiers changed from: package-private */
-        public void setResult(ERemoteOperation.ERemoteParam eRemoteParam) {
+        private void setResult(ERemoteOperation.ERemoteParam eRemoteParam) {
             switch (eRemoteParam) {
                 case none:
                     this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Succeed;
@@ -254,16 +253,14 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
         this.statusListener.onProcessed(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy, progress2.totalPages, progress2.currentPages, progress2.taskProgress, progress2.resumeRequest);
     }
 
-    /* access modifiers changed from: package-private */
-    public void resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
+    private void resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
         synchronized (this.progress) {
             this.progress.resumeState = resumeState;
             this.progress.notify();
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void resumeExecute() {
+    private void resumeExecute() {
         ERemoteCopy.ERemoteCopyStatusResult status;
         if (this.progress.resumeRequest != null) {
             synchronized (this.progress) {

app/src/main/java/epson/print/copy/Component/ecopycomponent/RemoteDeviceTask.java

@@ -52,8 +52,7 @@ class RemoteDeviceTask extends AsyncTask<Void, Void, Result> implements ECopyCom
         this.optionContext = eCopyOptionContext;
     }
 
-    /* access modifiers changed from: package-private */
-    public ECopyComponent.ICopyDeviceStatusListener.DeviceState getDeviceState(ERemoteOperation.ERemoteParam eRemoteParam) {
+    private ECopyComponent.ICopyDeviceStatusListener.DeviceState getDeviceState(ERemoteOperation.ERemoteParam eRemoteParam) {
         ECopyComponent.ICopyDeviceStatusListener.DeviceState deviceState = ECopyComponent.ICopyDeviceStatusListener.DeviceState.Stopped;
         switch (eRemoteParam) {
             case idle:
@@ -67,8 +66,7 @@ class RemoteDeviceTask extends AsyncTask<Void, Void, Result> implements ECopyCom
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public ArrayList<ECopyComponent.ICopyDeviceStatusListener.PrinterStateReason> getPrinterErrorReasons() {
+    private ArrayList<ECopyComponent.ICopyDeviceStatusListener.PrinterStateReason> getPrinterErrorReasons() {
         ArrayList<ECopyComponent.ICopyDeviceStatusListener.PrinterStateReason> arrayList = new ArrayList<>();
         ECopyComponent.ICopyDeviceStatusListener.PrinterStateReason printerStateReason = ECopyComponent.ICopyDeviceStatusListener.PrinterStateReason.OtherError;
         printerStateReason.string = ERemoteOperation.ERemoteParam.other_error.string;
@@ -76,8 +74,7 @@ class RemoteDeviceTask extends AsyncTask<Void, Void, Result> implements ECopyCom
         return arrayList;
     }
 
-    /* access modifiers changed from: package-private */
-    public ArrayList<ECopyComponent.ICopyDeviceStatusListener.PrinterStateReason> getPrinterReasons(ArrayList<ERemoteOperation.ERemoteParam> arrayList) {
+    private ArrayList<ECopyComponent.ICopyDeviceStatusListener.PrinterStateReason> getPrinterReasons(ArrayList<ERemoteOperation.ERemoteParam> arrayList) {
         ECopyComponent.ICopyDeviceStatusListener.PrinterStateReason printerStateReason;
         ArrayList<ECopyComponent.ICopyDeviceStatusListener.PrinterStateReason> arrayList2 = new ArrayList<>();
         Iterator<ERemoteOperation.ERemoteParam> it = arrayList.iterator();
@@ -128,8 +125,7 @@ class RemoteDeviceTask extends AsyncTask<Void, Void, Result> implements ECopyCom
         return arrayList2;
     }
 
-    /* access modifiers changed from: package-private */
-    public ArrayList<ECopyComponent.ICopyDeviceStatusListener.ScannerStateReason> getScannerErrorReasons() {
+    private ArrayList<ECopyComponent.ICopyDeviceStatusListener.ScannerStateReason> getScannerErrorReasons() {
         ArrayList<ECopyComponent.ICopyDeviceStatusListener.ScannerStateReason> arrayList = new ArrayList<>();
         ECopyComponent.ICopyDeviceStatusListener.ScannerStateReason scannerStateReason = ECopyComponent.ICopyDeviceStatusListener.ScannerStateReason.OtherError;
         scannerStateReason.string = ERemoteOperation.ERemoteParam.other_error.string;
@@ -137,8 +133,7 @@ class RemoteDeviceTask extends AsyncTask<Void, Void, Result> implements ECopyCom
         return arrayList;
     }
 
-    /* access modifiers changed from: package-private */
-    public ArrayList<ECopyComponent.ICopyDeviceStatusListener.ScannerStateReason> getScannerReasons(ArrayList<ERemoteOperation.ERemoteParam> arrayList) {
+    private ArrayList<ECopyComponent.ICopyDeviceStatusListener.ScannerStateReason> getScannerReasons(ArrayList<ERemoteOperation.ERemoteParam> arrayList) {
         ECopyComponent.ICopyDeviceStatusListener.ScannerStateReason scannerStateReason;
         ArrayList<ECopyComponent.ICopyDeviceStatusListener.ScannerStateReason> arrayList2 = new ArrayList<>();
         Iterator<ERemoteOperation.ERemoteParam> it = arrayList.iterator();
@@ -171,8 +166,7 @@ class RemoteDeviceTask extends AsyncTask<Void, Void, Result> implements ECopyCom
         return arrayList2;
     }
 
-    /* access modifiers changed from: package-private */
-    public ArrayList<String> getJobTokens() {
+    private ArrayList<String> getJobTokens() {
         ERemoteCopy eRemoteCopy = new ERemoteCopy();
         eRemoteCopy.setHostIP(this.operation.getHostIP());
         eRemoteCopy.setRequestConnectionTimeout(this.operation.getRequestConnectionTimeout());

app/src/main/java/epson/print/copy/Component/eremoteoperation/ERemoteOperation.java

@@ -376,8 +376,7 @@ public class ERemoteOperation {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public boolean getBooleanValueOf(ERemoteParam eRemoteParam) {
+        private boolean getBooleanValueOf(ERemoteParam eRemoteParam) {
             try {
                 return this.json.getBoolean(eRemoteParam.string);
             } catch (Exception e) {
@@ -386,8 +385,7 @@ public class ERemoteOperation {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public int getIntValueOf(ERemoteParam eRemoteParam) {
+        private int getIntValueOf(ERemoteParam eRemoteParam) {
             try {
                 return this.json.getInt(eRemoteParam.string);
             } catch (Exception e) {
@@ -396,8 +394,7 @@ public class ERemoteOperation {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public String getStringValueOf(ERemoteParam eRemoteParam) {
+        private String getStringValueOf(ERemoteParam eRemoteParam) {
             try {
                 return this.json.getString(eRemoteParam.string);
             } catch (Exception e) {
@@ -406,8 +403,7 @@ public class ERemoteOperation {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public ArrayList<String> getStringsValueOf(ERemoteParam eRemoteParam) {
+        private ArrayList<String> getStringsValueOf(ERemoteParam eRemoteParam) {
             ArrayList<String> arrayList = new ArrayList<>();
             try {
                 for (String trim : this.json.getString(eRemoteParam.string).split(PreferencesConstants.COOKIE_DELIMITER)) {
@@ -419,8 +415,7 @@ public class ERemoteOperation {
             return arrayList;
         }
 
-        /* access modifiers changed from: package-private */
-        public ERemoteParam getParamValueOf(ERemoteParam eRemoteParam) {
+        private ERemoteParam getParamValueOf(ERemoteParam eRemoteParam) {
             ERemoteParam eRemoteParam2 = ERemoteParam.x_null;
             try {
                 return ERemoteParam.stringOf(this.json.getString(eRemoteParam.string));
@@ -430,8 +425,7 @@ public class ERemoteOperation {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public ERemoteParam getDefaultValueOf(ERemoteParam eRemoteParam) {
+        private ERemoteParam getDefaultValueOf(ERemoteParam eRemoteParam) {
             ERemoteParam eRemoteParam2 = ERemoteParam.x_null;
             try {
                 JSONObject jSONObject = this.json;
@@ -442,8 +436,7 @@ public class ERemoteOperation {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public ArrayList<ERemoteParam> getOptionsValueOf(ERemoteParam eRemoteParam) {
+        private ArrayList<ERemoteParam> getOptionsValueOf(ERemoteParam eRemoteParam) {
             ArrayList<ERemoteParam> arrayList = new ArrayList<>();
             try {
                 for (String trim : this.json.getString(eRemoteParam.string + "-options").split(PreferencesConstants.COOKIE_DELIMITER)) {
@@ -458,8 +451,7 @@ public class ERemoteOperation {
             return arrayList;
         }
 
-        /* access modifiers changed from: package-private */
-        public ArrayList<ERemoteParam> getParamsValueOf(ERemoteParam eRemoteParam) {
+        private ArrayList<ERemoteParam> getParamsValueOf(ERemoteParam eRemoteParam) {
             ArrayList<ERemoteParam> arrayList = new ArrayList<>();
             try {
                 for (String trim : getStringValueOf(eRemoteParam).split(PreferencesConstants.COOKIE_DELIMITER)) {
@@ -546,8 +538,7 @@ public class ERemoteOperation {
             this.remoteParam = new HashMap<>();
         }
 
-        /* access modifiers changed from: package-private */
-        public void deleteLastCharIf(StringBuffer stringBuffer, char c) {
+        private void deleteLastCharIf(StringBuffer stringBuffer, char c) {
             if (stringBuffer.length() > 0) {
                 int length = stringBuffer.length() - 1;
                 if (stringBuffer.charAt(length) == c) {

app/src/main/java/epson/print/copy/CopyActivity.java

@@ -309,14 +309,12 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void startActivityAndKeepSimpleAp(Intent intent) {
+    private void startActivityAndKeepSimpleAp(Intent intent) {
         this.isKeepSimpleAPConnection = true;
         startActivity(intent);
     }
 
-    /* access modifiers changed from: package-private */
-    public void allClear() {
+    private void allClear() {
         this.doClear = true;
         this.loading.show();
         ArrayList<ECopyOptionItem> copyOptionItems = this.copyComponent.getCopyOptionItems();
@@ -360,8 +358,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         this.copyComponent.setCopyOptionItem(eCopyOptionItem);
     }
 
-    /* access modifiers changed from: package-private */
-    public void fetchCopyOptionContext() {
+    private void fetchCopyOptionContext() {
         this.copyComponent.createCopyOptionContext(this.copyType, new ECopyComponent.ICopyOptionContextListener() {
             public void onCopyOptionContextCreated(ECopyComponent.ECopyType eCopyType, ECopyOptionContext eCopyOptionContext, ECopyComponent.ICopyOptionContextListener.ContextCreationError contextCreationError) {
                 CopyActivity copyActivity = CopyActivity.this;
@@ -387,8 +384,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         });
     }
 
-    /* access modifiers changed from: package-private */
-    public void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
+    private void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
         Iterator<ECopyOptionItem> it = arrayList.iterator();
         while (it.hasNext()) {
             ECopyOptionItem next = it.next();
@@ -443,8 +439,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void updateSetting(int i, ECopyOptionItem eCopyOptionItem) {
+    private void updateSetting(int i, ECopyOptionItem eCopyOptionItem) {
         TextView textView = (TextView) this.mLayout.findViewById(i);
         if (eCopyOptionItem.getSelectedChoice() == ECopyOptionItem.ECopyOptionItemChoice.XScale_Custom) {
             textView.setText(getString(R.string.XScale_CustomSetting) + String.valueOf(((ActivityBase.NumberOptionValue) this.optionValueMap.get(ECopyOptionItem.ECopyOptionItemKey.CopyMagnification)).value) + " %");
@@ -475,8 +470,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             setOptionValueChangedListener(CopyActivity.this.optionValueChangedListener);
         }
 
-        /* access modifiers changed from: package-private */
-        public void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
+        private void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
             this.optionItem = eCopyOptionItem;
             this.value = eCopyOptionItem.getSelectedValue();
             this.image = (ImageView) CopyActivity.this.findViewById(i);
@@ -484,8 +478,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             this.image.setEnabled(eCopyOptionItem.isEnabled());
         }
 
-        /* access modifiers changed from: package-private */
-        public void bindCountUp(int i) {
+        private void bindCountUp(int i) {
             this.countUp = (Button) CopyActivity.this.findViewById(i);
             this.countUp.setOnClickListener(new CounterImage(1));
             if (this.value == this.optionItem.getMaximumValue()) {
@@ -495,8 +488,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public void bindCountDown(int i) {
+        private void bindCountDown(int i) {
             this.countDown = (Button) CopyActivity.this.findViewById(i);
             this.countDown.setOnClickListener(new CounterImage(-1));
             if (this.value == this.optionItem.getMinimumValue()) {
@@ -511,8 +503,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                 super(i);
             }
 
-            /* access modifiers changed from: package-private */
-            public void updateImage(int i) {
+            private void updateImage(int i) {
                 XDensityValue.this.value += i;
                 XDensityValue.this.optionItem.selectValue(XDensityValue.this.value);
                 if (XDensityValue.this.changedListener != null) {

app/src/main/java/epson/print/copy/CopyScaleActivity.java

@@ -54,8 +54,7 @@ public class CopyScaleActivity extends ActivityBase {
         buildCopyOptions(this.copyComponent.getCopyOptionItems());
     }
 
-    /* access modifiers changed from: package-private */
-    public void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
+    private void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
         EPLog.m313i(this.TAG, "buildCopyOptions");
         Iterator<ECopyOptionItem> it = arrayList.iterator();
         while (it.hasNext()) {
@@ -84,16 +83,14 @@ public class CopyScaleActivity extends ActivityBase {
             setOptionValueChangedListener(CopyScaleActivity.this.optionValueChangedListener);
         }
 
-        /* access modifiers changed from: package-private */
-        public ScaleAdapter getArrayAdapter(XScaleValue xScaleValue, Context context) {
+        private ScaleAdapter getArrayAdapter(XScaleValue xScaleValue, Context context) {
             for (int i = 3; i < xScaleValue.getKeyArray().length; i++) {
                 this.presetArray.add(new ScaleInfo(CopyScaleActivity.this.copyType, (ECopyOptionItem.ECopyOptionItemChoice) xScaleValue.choices.get(i)));
             }
             return new ScaleAdapter(context, R.layout.setting_item, this.presetArray);
         }
 
-        /* access modifiers changed from: package-private */
-        public void capabilitySetting(ECopyOptionItem eCopyOptionItem, Context context) {
+        private void capabilitySetting(ECopyOptionItem eCopyOptionItem, Context context) {
             int i = 0;
             while (true) {
                 if (i >= this.choices.size()) {
@@ -207,8 +204,7 @@ public class CopyScaleActivity extends ActivityBase {
             setOptionValueChangedListener(CopyScaleActivity.this.optionValueChangedListener);
         }
 
-        /* access modifiers changed from: package-private */
-        public void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
+        private void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
             this.optionItem = eCopyOptionItem;
             this.editText = (TextView) CopyScaleActivity.this.findViewById(i);
             this.value = eCopyOptionItem.getSelectedValue();
@@ -220,8 +216,7 @@ public class CopyScaleActivity extends ActivityBase {
             this.editText.setEnabled(eCopyOptionItem.isEnabled());
         }
 
-        /* access modifiers changed from: package-private */
-        public void clickCustomScale() {
+        private void clickCustomScale() {
             ((LinearLayout) CopyScaleActivity.this.findViewById(R.id.copy_scale_custom)).setOnClickListener(new View.OnClickListener() {
                 public void onClick(View view) {
                     View inflate = LayoutInflater.from(CopyScaleActivity.this).inflate(R.layout.copy_custom_scale, (ViewGroup) null);
@@ -279,8 +274,7 @@ public class CopyScaleActivity extends ActivityBase {
             });
         }
 
-        /* access modifiers changed from: package-private */
-        public void onDismissDialog() {
+        private void onDismissDialog() {
             MotionEvent obtain = MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis() + 10, 1, 0.0f, 0.0f, 0);
             this.countDown.dispatchTouchEvent(obtain);
             this.countUp.dispatchTouchEvent(obtain);

app/src/main/java/epson/print/copy/CopySettingActivity.java

@@ -58,8 +58,7 @@ public class CopySettingActivity extends ActivityBase {
         buildCopyOptions(this.copyComponent.getCopyOptionItems());
     }
 
-    /* access modifiers changed from: package-private */
-    public void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
+    private void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
         EPLog.m313i(this.TAG, "buildCopyOptions");
         Iterator<ECopyOptionItem> it = arrayList.iterator();
         while (it.hasNext()) {
@@ -81,13 +80,11 @@ public class CopySettingActivity extends ActivityBase {
             setOptionValueChangedListener(CopySettingActivity.this.optionValueChangedListener);
         }
 
-        /* access modifiers changed from: package-private */
-        public SettingAdapter getArrayAdapter(OthersettingValue othersettingValue, Context context) {
+        private SettingAdapter getArrayAdapter(OthersettingValue othersettingValue, Context context) {
             return new SettingAdapter(context, R.layout.setting_item, othersettingValue.getKeyArray());
         }
 
-        /* access modifiers changed from: package-private */
-        public void capabilitySetting(ECopyOptionItem eCopyOptionItem, Context context) {
+        private void capabilitySetting(ECopyOptionItem eCopyOptionItem, Context context) {
             ListView listView = (ListView) CopySettingActivity.this.findViewById(R.id.copy_setting_list);
             listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                 public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {

app/src/main/java/epson/print/copy/DisplayUtil.java

@@ -151,8 +151,7 @@ public class DisplayUtil {
             this.f384id = i;
         }
 
-        /* access modifiers changed from: package-private */
-        public void addHashMap(@NonNull Context context, @NonNull HashMap<String, String> hashMap) {
+        private void addHashMap(@NonNull Context context, @NonNull HashMap<String, String> hashMap) {
             hashMap.put(this.copyParamEnum.name(), context.getString(this.f384id));
         }
     }

app/src/main/java/epson/print/ecclient/EcClientLib.java

@@ -84,8 +84,7 @@ public class EcClientLib {
         return NativeInitialize();
     }
 
-    /* access modifiers changed from: package-private */
-    public void SetHttpAccess(HttpAccess httpAccess) {
+    private void SetHttpAccess(HttpAccess httpAccess) {
         this.mHttpAcess = httpAccess;
     }
 

app/src/main/java/epson/print/ecclient/EpsonConnectAccess.java

@@ -26,8 +26,7 @@ public class EpsonConnectAccess {
         this.mEcClientLib.Terminate();
     }
 
-    /* access modifiers changed from: package-private */
-    public int internalLogin(String str, String str2, String str3) {
+    private int internalLogin(String str, String str2, String str3) {
         return this.mEcClientLib.Login(str, str2, str3);
     }
 
@@ -46,8 +45,7 @@ public class EpsonConnectAccess {
         return this.mEcClientLib.Logout();
     }
 
-    /* access modifiers changed from: package-private */
-    public int RegPrinter(String str, String str2, String str3) {
+    private int RegPrinter(String str, String str2, String str3) {
         return this.mEcClientLib.RegPrinter(str, str2, str3);
     }
 
@@ -169,7 +167,7 @@ public class EpsonConnectAccess {
 
     static String loadClientId(Context context) {
         String string = SharedPreferencesProvider.getInstace(context).getString(Constants.PRINTER_CLIENT_ID, (String) null);
-        EpLog.m69d("▲clientId = " + string);
+        EpLog.d("▲clientId = " + string);
         if (string == null || string.length() <= 0) {
             return null;
         }
@@ -177,7 +175,7 @@ public class EpsonConnectAccess {
     }
 
     static void saveClientId(Context context, String str) {
-        EpLog.m69d("▲ save  clientId = " + str);
+        EpLog.d("▲ save  clientId = " + str);
         SharedPreferencesProvider.getInstace(context).edit().putString(Constants.PRINTER_CLIENT_ID, str).apply();
     }
 

app/src/main/java/epson/print/ecclient/HttpApache.java

@@ -133,8 +133,7 @@ public class HttpApache extends HttpAccess {
         this.mCanceled = false;
     }
 
-    /* access modifiers changed from: package-private */
-    public void shutdown() {
+    private void shutdown() {
         IAHttpClient iAHttpClient = this.mHttpClient;
         if (iAHttpClient != null) {
             iAHttpClient.disconnect();

app/src/main/java/epson/print/imgsel/ImageThumbnailTask.java

@@ -74,8 +74,7 @@ public class ImageThumbnailTask extends AsyncTask<Void, ImageItem, Void> impleme
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public synchronized ImageItem getFirst() {
+    private synchronized ImageItem getFirst() {
         if (this.imageItems != null) {
             if (this.imageItems.size() > 0) {
                 return this.imageItems.remove(0);
@@ -128,8 +127,7 @@ public class ImageThumbnailTask extends AsyncTask<Void, ImageItem, Void> impleme
         throw new UnsupportedOperationException("Method not decompiled: epson.print.imgsel.ImageThumbnailTask.moveToFirst(epson.print.ImageItem):void");
     }
 
-    /* access modifiers changed from: package-private */
-    public synchronized void addLast(ImageItem imageItem) {
+    private synchronized void addLast(ImageItem imageItem) {
         if (this.imageItems != null) {
             this.imageItems.addLast(imageItem);
         }

app/src/main/java/epson/print/inkrpln/GoEpsonClient.java

@@ -2,7 +2,7 @@ package epson.print.inkrpln;
 
 import android.net.Uri;
 import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
+
 import com.epson.iprint.prtlogger.Analytics;
 import epson.print.CommonDefine;
 import epson.print.IprintApplication;

app/src/main/java/epson/print/inkrpln/InkReplenishSystem.java

@@ -5,7 +5,7 @@ import android.net.Uri;
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+
 import android.util.Base64;
 import com.epson.mobilephone.common.escpr.EPS_REDYINKINFO;
 import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;

app/src/main/java/epson/print/inkrpln/InkRplnInfoClient.java

@@ -3,7 +3,7 @@ package epson.print.inkrpln;
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;

app/src/main/java/epson/print/inkrpln/InkRplnProgressFragment.java

@@ -7,7 +7,7 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
+
 import android.support.p000v4.app.Fragment;
 
 import android.support.p000v4.app.FragmentManager;
@@ -91,8 +91,7 @@ public class InkRplnProgressFragment extends Fragment {
         localFinishActivity();
     }
 
-    /* access modifiers changed from: package-private */
-    public void setInkDsServerCheckDisable(@NonNull Context context) {
+    private void setInkDsServerCheckDisable(@NonNull Context context) {
         this.mInkReplenishSystem.setServerCheckDisabled(context);
     }
 

app/src/main/java/epson/print/pdf/AreaPdfRenderer.java

@@ -2,7 +2,7 @@ package epson.print.pdf;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
+
 import epson.common.ExternalFileUtils;
 import epson.print.CommonDefine;
 import epson.print.pdf.AdobePdfContainer;

app/src/main/java/epson/print/phlayout/AltRect.java

@@ -23,23 +23,19 @@ public class AltRect {
         this.left = altRect.left;
     }
 
-    /* access modifiers changed from: package-private */
-    public int width() {
+    private int width() {
         return this.right - this.left;
     }
 
-    /* access modifiers changed from: package-private */
-    public int height() {
+    private int height() {
         return this.bottom - this.top;
     }
 
-    /* access modifiers changed from: package-private */
-    public int centerX() {
+    private int centerX() {
         return (this.left + this.right) >> 1;
     }
 
-    /* access modifiers changed from: package-private */
-    public int centerY() {
+    private int centerY() {
         return (this.top + this.bottom) >> 1;
     }
 

app/src/main/java/epson/print/phlayout/AltRectF.java

@@ -2,7 +2,7 @@ package epson.print.phlayout;
 
 import android.graphics.RectF;
 import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
+
 
 public class AltRectF {
     float bottom;
@@ -27,8 +27,7 @@ public class AltRectF {
         this.bottom = f4;
     }
 
-    /* access modifiers changed from: package-private */
-    public RectF getRectF() {
+    private RectF getRectF() {
         return new RectF(this.left, this.top, this.right, this.bottom);
     }
 

app/src/main/java/epson/print/phlayout/BorderedLayoutPosition.java

@@ -5,7 +5,7 @@ import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
+
 import epson.common.Info_paper;
 import epson.print.EPImage;
 

app/src/main/java/epson/print/phlayout/BorderlessLayoutPosition.java

@@ -4,7 +4,7 @@ import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
+
 import epson.common.Info_paper;
 import epson.print.EPImage;
 
@@ -53,8 +53,7 @@ class BorderlessLayoutPosition implements ILayoutPosition {
         return this.mPreviewPaperRect.right - this.mPreviewPaperRect.left > 0 && this.mPreviewPaperRect.bottom - this.mPreviewPaperRect.top > 0;
     }
 
-    /* access modifiers changed from: package-private */
-    public AltRectF getPreviewImageAltRect() {
+    private AltRectF getPreviewImageAltRect() {
         return this.mPreviewPrintAreaRect;
     }
 

app/src/main/java/epson/print/phlayout/CdLayoutPosition.java

@@ -4,7 +4,7 @@ import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
+
 import epson.common.Info_paper;
 import epson.print.EPImage;
 

app/src/main/java/epson/print/phlayout/PhotoPreview.java

@@ -16,7 +16,7 @@ import android.os.Message;
 import android.support.annotation.AnyThread;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+
 import android.support.p000v4.view.GestureDetectorCompat;
 import android.util.AttributeSet;
 import android.util.Log;

app/src/main/java/epson/print/phlayout/PhotoPreviewImageList.java

@@ -2,7 +2,7 @@ package epson.print.phlayout;
 
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+
 import epson.print.EPImage;
 import java.util.ArrayList;
 import java.util.Iterator;

app/src/main/java/epson/print/rpcopy/ActivityBase.java

@@ -71,8 +71,7 @@ class ActivityBase extends ActivityIACommon {
         void onOptionItemChanged(ECopyOptionItem eCopyOptionItem);
     }
 
-    /* access modifiers changed from: package-private */
-    public void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
+    private void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
     }
 
     ActivityBase() {
@@ -84,8 +83,7 @@ class ActivityBase extends ActivityIACommon {
         Dialog cancelDialog;
         TextView messageText = ((TextView) findViewById(R.id.messageText));
 
-        /* access modifiers changed from: package-private */
-        public Dialog createCancelDialog() {
+        private Dialog createCancelDialog() {
             AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
             builder.setMessage(ActivityBase.this.getString(R.string.str_msg_scan_cancel));
             builder.setCancelable(false);
@@ -111,8 +109,7 @@ class ActivityBase extends ActivityIACommon {
             setCancelable(false);
         }
 
-        /* access modifiers changed from: package-private */
-        public void show(String str, CancelRequestCallback cancelRequestCallback) {
+        private void show(String str, CancelRequestCallback cancelRequestCallback) {
             this.cancelCallback = cancelRequestCallback;
             this.messageText.setText(str);
             this.messageText.setVisibility(0);
@@ -128,18 +125,15 @@ class ActivityBase extends ActivityIACommon {
             show();
         }
 
-        /* access modifiers changed from: package-private */
-        public void setText(String str) {
+        private void setText(String str) {
             this.messageText.setText(str);
         }
 
-        /* access modifiers changed from: package-private */
-        public void hideCancelButton() {
+        private void hideCancelButton() {
             this.cancelButton.setVisibility(4);
         }
 
-        /* access modifiers changed from: package-private */
-        public void dissmiss() {
+        private void dissmiss() {
             super.dismiss();
             Dialog dialog = this.cancelDialog;
             if (dialog != null) {
@@ -164,18 +158,15 @@ class ActivityBase extends ActivityIACommon {
             this.context = context2;
         }
 
-        /* access modifiers changed from: package-private */
-        public void showErrorDialog(String str, String str2) {
+        private void showErrorDialog(String str, String str2) {
             showErrorDialog(str, str2, DialogButtons.Ok, (IClose) null);
         }
 
-        /* access modifiers changed from: package-private */
-        public void showErrorDialog(int i) {
+        private void showErrorDialog(int i) {
             showErrorDialog((String) null, ActivityBase.this.getString(i));
         }
 
-        /* access modifiers changed from: package-private */
-        public void showErrorDialog(String str, String str2, final DialogButtons dialogButtons, final IClose iClose) {
+        private void showErrorDialog(String str, String str2, final DialogButtons dialogButtons, final IClose iClose) {
             String str3;
             CustomTitleAlertDialogBuilder customTitleAlertDialogBuilder = new CustomTitleAlertDialogBuilder(this.context);
             String str4 = null;
@@ -226,8 +217,7 @@ class ActivityBase extends ActivityIACommon {
             this.dialog.show();
         }
 
-        /* access modifiers changed from: package-private */
-        public void Cancel() {
+        private void Cancel() {
             Dialog dialog2 = this.dialog;
             if (dialog2 != null) {
                 dialog2.cancel();
@@ -333,8 +323,7 @@ class ActivityBase extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void showNextPageDialog(final INextPageClose iNextPageClose) {
+    private void showNextPageDialog(final INextPageClose iNextPageClose) {
         C22541 r0 = new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialogInterface, int i) {
                 ECopyComponent.ICopyResumeRequest.ResumeState resumeState;
@@ -365,8 +354,7 @@ class ActivityBase extends ActivityIACommon {
         OptionValue() {
         }
 
-        /* access modifiers changed from: package-private */
-        public void setOptionValueChangedListener(OptionItemChangedListener optionItemChangedListener) {
+        private void setOptionValueChangedListener(OptionItemChangedListener optionItemChangedListener) {
             this.changedListener = optionItemChangedListener;
         }
     }
@@ -379,8 +367,7 @@ class ActivityBase extends ActivityIACommon {
             super();
         }
 
-        /* access modifiers changed from: package-private */
-        public void bindOption(ECopyOptionItem eCopyOptionItem) {
+        private void bindOption(ECopyOptionItem eCopyOptionItem) {
             if (ECopyOptionItem.ECopyOptionItemKey.XCutLineStyle.equals(eCopyOptionItem.getKey()) || ECopyOptionItem.ECopyOptionItemKey.XCutLineWeight.equals(eCopyOptionItem.getKey())) {
                 eCopyOptionItem.updateChoicesXCutLine();
             }
@@ -389,8 +376,7 @@ class ActivityBase extends ActivityIACommon {
             this.selected = eCopyOptionItem.getSelectedChoice();
         }
 
-        /* access modifiers changed from: package-private */
-        public String[] getKeyArray() {
+        private String[] getKeyArray() {
             String[] strArr = new String[this.choices.size()];
             for (int i = 0; i < this.choices.size(); i++) {
                 strArr[i] = ActivityBase.this.getDisplayString(this.choices.get(i).name());
@@ -409,8 +395,7 @@ class ActivityBase extends ActivityIACommon {
             super();
         }
 
-        /* access modifiers changed from: package-private */
-        public void updateWithAddition(int i) {
+        private void updateWithAddition(int i) {
             try {
                 this.value = Integer.valueOf(this.editText.getText().toString()).intValue();
                 this.value = Math.min(Math.max(this.optionItem.getMinimumValue(), this.value + i), this.optionItem.getMaximumValue());
@@ -434,14 +419,12 @@ class ActivityBase extends ActivityIACommon {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public void bindOption(ECopyOptionItem eCopyOptionItem) {
+        private void bindOption(ECopyOptionItem eCopyOptionItem) {
             this.optionItem = eCopyOptionItem;
             this.value = eCopyOptionItem.getSelectedValue();
         }
 
-        /* access modifiers changed from: package-private */
-        public void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
+        private void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
             this.optionItem = eCopyOptionItem;
             this.editText = (TextView) ActivityBase.this.findViewById(i);
             this.value = eCopyOptionItem.getSelectedValue();
@@ -449,8 +432,7 @@ class ActivityBase extends ActivityIACommon {
             this.editText.setEnabled(eCopyOptionItem.isEnabled());
         }
 
-        /* access modifiers changed from: package-private */
-        public void bindCountUp(int i) {
+        private void bindCountUp(int i) {
             this.countUp = (Button) ActivityBase.this.findViewById(i);
             this.countUp.setOnClickListener(new Counter(1));
             if (this.value == this.optionItem.getMaximumValue()) {
@@ -460,8 +442,7 @@ class ActivityBase extends ActivityIACommon {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public void bindCountDown(int i) {
+        private void bindCountDown(int i) {
             this.countDown = (Button) ActivityBase.this.findViewById(i);
             this.countDown.setOnClickListener(new Counter(-1));
             if (this.value == this.optionItem.getMinimumValue()) {
@@ -479,8 +460,7 @@ class ActivityBase extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public String getDisplayString(String str) {
+    private String getDisplayString(String str) {
         return (String) (mParamStringToDisplayStringHash.containsKey(str) ? mParamStringToDisplayStringHash.get(str) : mParamStringToDisplayStringHash.get("Unknown"));
     }
 
@@ -495,8 +475,7 @@ class ActivityBase extends ActivityIACommon {
             return ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_REPEAT_COPY, 0);
         }
 
-        /* access modifiers changed from: package-private */
-        public String loadPrePrinter() {
+        private String loadPrePrinter() {
             this.presettings = getPreferences();
             return this.presettings.getString(Constants.PRINTER_ID, (String) null);
         }
@@ -508,8 +487,7 @@ class ActivityBase extends ActivityIACommon {
             this.editer.commit();
         }
 
-        /* access modifiers changed from: package-private */
-        public void setCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
+        private void setCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
             ECopyOptionContext bindedCopyOptionContext = ActivityBase.this.copyComponent.getBindedCopyOptionContext();
             Iterator<ECopyOptionItem> it = arrayList.iterator();
             while (it.hasNext()) {
@@ -537,8 +515,7 @@ class ActivityBase extends ActivityIACommon {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public void saveCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
+        private void saveCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
             savePrePrinter();
             Iterator<ECopyOptionItem> it = arrayList.iterator();
             while (it.hasNext()) {

app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/ECopyOptionContext.java

@@ -56,8 +56,7 @@ public class ECopyOptionContext implements Parcelable {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public boolean isNull() {
+    private boolean isNull() {
         return this.copyType == null;
     }
 
@@ -84,18 +83,15 @@ public class ECopyOptionContext implements Parcelable {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public ECopyComponent.ECopyType getCopyType() {
+    private ECopyComponent.ECopyType getCopyType() {
         return this.copyType;
     }
 
-    /* access modifiers changed from: package-private */
-    public ArrayList<ECopyOptionItem> getCopyOptionItems() {
+    private ArrayList<ECopyOptionItem> getCopyOptionItems() {
         return this.optionItems;
     }
 
-    /* access modifiers changed from: package-private */
-    public ECopyOptionItem getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey) {
+    private ECopyOptionItem getCopyOptionItemOf(ECopyOptionItem.ECopyOptionItemKey eCopyOptionItemKey) {
         Iterator<ECopyOptionItem> it = this.optionItems.iterator();
         while (it.hasNext()) {
             ECopyOptionItem next = it.next();
@@ -106,8 +102,7 @@ public class ECopyOptionContext implements Parcelable {
         return null;
     }
 
-    /* access modifiers changed from: package-private */
-    public void add(ECopyOptionItem eCopyOptionItem) {
+    private void add(ECopyOptionItem eCopyOptionItem) {
         this.optionItems.add(eCopyOptionItem);
     }
 
@@ -135,8 +130,7 @@ public class ECopyOptionContext implements Parcelable {
         return false;
     }
 
-    /* access modifiers changed from: package-private */
-    public boolean isChanged(ECopyOptionItem eCopyOptionItem) {
+    private boolean isChanged(ECopyOptionItem eCopyOptionItem) {
         Iterator<ECopyOptionItem> it = this.optionItems.iterator();
         while (true) {
             if (!it.hasNext()) {
@@ -152,13 +146,11 @@ public class ECopyOptionContext implements Parcelable {
         return false;
     }
 
-    /* access modifiers changed from: package-private */
-    public void setCopyOptionsResult(ERemoteCopy.ERemoteCopyOptionsResult eRemoteCopyOptionsResult) {
+    private void setCopyOptionsResult(ERemoteCopy.ERemoteCopyOptionsResult eRemoteCopyOptionsResult) {
         this.copyOptionsResult = eRemoteCopyOptionsResult;
     }
 
-    /* access modifiers changed from: package-private */
-    public ERemoteCopy.ERemoteCopyOptionsResult getCopyOptionsResult() {
+    private ERemoteCopy.ERemoteCopyOptionsResult getCopyOptionsResult() {
         return this.copyOptionsResult;
     }
 }

app/src/main/java/epson/print/rpcopy/Component/ecopycomponent/RemoteCopyGetOptionTask.java

@@ -50,8 +50,7 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
         this.clientID = str;
     }
 
-    /* access modifiers changed from: package-private */
-    public Result getErrorResult(ERemoteOperation.ERemoteOperationResult eRemoteOperationResult) {
+    private Result getErrorResult(ERemoteOperation.ERemoteOperationResult eRemoteOperationResult) {
         Result result = new Result();
         if (eRemoteOperationResult.isNull(ERemoteOperation.ERemoteParam.success)) {
             result.error = ECopyComponent.ICopyOptionContextListener.ContextCreationError.ErrorCommunication;
@@ -61,8 +60,7 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
         return result;
     }
 
-    /* access modifiers changed from: package-private */
-    public Result checkDeviceError() {
+    private Result checkDeviceError() {
         Result result = new Result();
         result.copyType = this.copyType;
         ERemoteDevice eRemoteDevice = new ERemoteDevice();

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

@@ -49,8 +49,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
     class Result {
         ECopyComponent.ICopyStatusListener.CopyTaskResult taskResult;
 
-        /* access modifiers changed from: package-private */
-        public void setResult(ERemoteOperation.ERemoteParam eRemoteParam) {
+        private void setResult(ERemoteOperation.ERemoteParam eRemoteParam) {
             switch (eRemoteParam) {
                 case none:
                     this.taskResult = ECopyComponent.ICopyStatusListener.CopyTaskResult.Succeed;
@@ -255,16 +254,14 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
         this.statusListener.onProcessed(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy, progress2.totalPages, progress2.currentPages, progress2.taskProgress, progress2.resumeRequest);
     }
 
-    /* access modifiers changed from: package-private */
-    public void resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
+    private void resumeNotify(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
         synchronized (this.progress) {
             this.progress.resumeState = resumeState;
             this.progress.notify();
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void resumeExecute() {
+    private void resumeExecute() {
         ERemoteCopy.ERemoteCopyStatusResult status;
         if (this.progress.resumeRequest != null) {
             synchronized (this.progress) {

app/src/main/java/epson/print/rpcopy/Component/eremoteoperation/ERemoteOperation.java

@@ -391,8 +391,7 @@ public class ERemoteOperation {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public boolean getBooleanValueOf(ERemoteParam eRemoteParam) {
+        private boolean getBooleanValueOf(ERemoteParam eRemoteParam) {
             try {
                 return this.json.getBoolean(eRemoteParam.string);
             } catch (Exception e) {
@@ -401,8 +400,7 @@ public class ERemoteOperation {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public int getIntValueOf(ERemoteParam eRemoteParam) {
+        private int getIntValueOf(ERemoteParam eRemoteParam) {
             try {
                 return this.json.getInt(eRemoteParam.string);
             } catch (Exception unused) {
@@ -410,8 +408,7 @@ public class ERemoteOperation {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public String getStringValueOf(ERemoteParam eRemoteParam) {
+        private String getStringValueOf(ERemoteParam eRemoteParam) {
             try {
                 return this.json.getString(eRemoteParam.string);
             } catch (Exception e) {
@@ -420,8 +417,7 @@ public class ERemoteOperation {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public ArrayList<String> getStringsValueOf(ERemoteParam eRemoteParam) {
+        private ArrayList<String> getStringsValueOf(ERemoteParam eRemoteParam) {
             ArrayList<String> arrayList = new ArrayList<>();
             try {
                 for (String trim : this.json.getString(eRemoteParam.string).split(PreferencesConstants.COOKIE_DELIMITER)) {
@@ -433,8 +429,7 @@ public class ERemoteOperation {
             return arrayList;
         }
 
-        /* access modifiers changed from: package-private */
-        public ERemoteParam getParamValueOf(ERemoteParam eRemoteParam) {
+        private ERemoteParam getParamValueOf(ERemoteParam eRemoteParam) {
             ERemoteParam eRemoteParam2 = ERemoteParam.x_null;
             try {
                 return ERemoteParam.stringOf(this.json.getString(eRemoteParam.string));
@@ -453,8 +448,7 @@ public class ERemoteOperation {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public ERemoteParam getDefaultValueOf(ERemoteParam eRemoteParam) {
+        private ERemoteParam getDefaultValueOf(ERemoteParam eRemoteParam) {
             ERemoteParam eRemoteParam2 = ERemoteParam.x_null;
             try {
                 JSONObject jSONObject = this.json;
@@ -465,8 +459,7 @@ public class ERemoteOperation {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public ArrayList<ERemoteParam> getOptionsValueOf(ERemoteParam eRemoteParam) {
+        private ArrayList<ERemoteParam> getOptionsValueOf(ERemoteParam eRemoteParam) {
             ArrayList<ERemoteParam> arrayList = new ArrayList<>();
             try {
                 for (String trim : this.json.getString(eRemoteParam.string + "-options").split(PreferencesConstants.COOKIE_DELIMITER)) {
@@ -482,8 +475,7 @@ public class ERemoteOperation {
             return arrayList;
         }
 
-        /* access modifiers changed from: package-private */
-        public ArrayList<ERemoteParam> getParamsValueOf(ERemoteParam eRemoteParam) {
+        private ArrayList<ERemoteParam> getParamsValueOf(ERemoteParam eRemoteParam) {
             ArrayList<ERemoteParam> arrayList = new ArrayList<>();
             try {
                 for (String trim : getStringValueOf(eRemoteParam).split(PreferencesConstants.COOKIE_DELIMITER)) {
@@ -570,8 +562,7 @@ public class ERemoteOperation {
             this.remoteParam = new HashMap<>();
         }
 
-        /* access modifiers changed from: package-private */
-        public void deleteLastCharIf(StringBuffer stringBuffer, char c) {
+        private void deleteLastCharIf(StringBuffer stringBuffer, char c) {
             if (stringBuffer.length() > 0) {
                 int length = stringBuffer.length() - 1;
                 if (stringBuffer.charAt(length) == c) {

app/src/main/java/epson/print/rpcopy/CopyActivity.java

@@ -339,14 +339,12 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void startActivityAndKeepSimpleAp(Intent intent) {
+    private void startActivityAndKeepSimpleAp(Intent intent) {
         this.isKeepSimpleAPConnection = true;
         startActivity(intent);
     }
 
-    /* access modifiers changed from: package-private */
-    public void allClear() {
+    private void allClear() {
         this.doClear = true;
         this.loading.show();
         ArrayList<ECopyOptionItem> copyOptionItems = this.copyComponent.getCopyOptionItems();
@@ -397,8 +395,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         this.copyComponent.setCopyOptionItem(eCopyOptionItem);
     }
 
-    /* access modifiers changed from: package-private */
-    public void fetchCopyOptionContext() {
+    private void fetchCopyOptionContext() {
         ECopyComponent.createCopyOptionContext(this.copyComponent, this.copyType, new ECopyComponent.ICopyOptionContextListener() {
             public void onCopyOptionContextCreated(ECopyComponent.ECopyType eCopyType, ECopyOptionContext eCopyOptionContext, ECopyComponent.ICopyOptionContextListener.ContextCreationError contextCreationError) {
                 CopyActivity copyActivity = CopyActivity.this;
@@ -429,8 +426,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         });
     }
 
-    /* access modifiers changed from: package-private */
-    public void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
+    private void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
         Iterator<ECopyOptionItem> it = arrayList.iterator();
         while (it.hasNext()) {
             ECopyOptionItem next = it.next();
@@ -487,8 +483,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void updateSetting(int i, ECopyOptionItem eCopyOptionItem) {
+    private void updateSetting(int i, ECopyOptionItem eCopyOptionItem) {
         TextView textView = (TextView) this.mLayout.findViewById(i);
         if (eCopyOptionItem.getSelectedChoice() == null) {
             EPLog.m318w("CopyActivity", "updateSetting() choice == null");
@@ -519,8 +514,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             setOptionValueChangedListener(CopyActivity.this.optionValueChangedListener);
         }
 
-        /* access modifiers changed from: package-private */
-        public void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
+        private void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
             this.optionItem = eCopyOptionItem;
             this.value = eCopyOptionItem.getSelectedValue();
             this.image = (ImageView) CopyActivity.this.findViewById(i);
@@ -528,8 +522,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             this.image.setEnabled(eCopyOptionItem.isEnabled());
         }
 
-        /* access modifiers changed from: package-private */
-        public void bindCountUp(int i) {
+        private void bindCountUp(int i) {
             this.countUp = (Button) CopyActivity.this.findViewById(i);
             this.countUp.setOnClickListener(new CounterImage(1));
             if (this.value == this.optionItem.getMaximumValue()) {
@@ -539,8 +532,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public void bindCountDown(int i) {
+        private void bindCountDown(int i) {
             this.countDown = (Button) CopyActivity.this.findViewById(i);
             this.countDown.setOnClickListener(new CounterImage(-1));
             if (this.value == this.optionItem.getMinimumValue()) {
@@ -555,8 +547,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                 super(i);
             }
 
-            /* access modifiers changed from: package-private */
-            public void updateImage(int i) {
+            private void updateImage(int i) {
                 XDensityValue.this.value += i;
                 XDensityValue.this.optionItem.selectValue(XDensityValue.this.value);
                 if (XDensityValue.this.changedListener != null) {

app/src/main/java/epson/print/rpcopy/CopySettingActivity.java

@@ -58,8 +58,7 @@ public class CopySettingActivity extends ActivityBase {
         buildCopyOptions(this.copyComponent.getCopyOptionItems());
     }
 
-    /* access modifiers changed from: package-private */
-    public void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
+    private void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
         EPLog.m313i(this.TAG, "buildCopyOptions");
         Iterator<ECopyOptionItem> it = arrayList.iterator();
         while (it.hasNext()) {
@@ -81,13 +80,11 @@ public class CopySettingActivity extends ActivityBase {
             setOptionValueChangedListener(CopySettingActivity.this.optionValueChangedListener);
         }
 
-        /* access modifiers changed from: package-private */
-        public SettingAdapter getArrayAdapter(OthersettingValue othersettingValue, Context context) {
+        private SettingAdapter getArrayAdapter(OthersettingValue othersettingValue, Context context) {
             return new SettingAdapter(context, R.layout.setting_item, othersettingValue.getKeyArray());
         }
 
-        /* access modifiers changed from: package-private */
-        public void capabilitySetting(ECopyOptionItem eCopyOptionItem, Context context) {
+        private void capabilitySetting(ECopyOptionItem eCopyOptionItem, Context context) {
             ListView listView = (ListView) CopySettingActivity.this.findViewById(R.id.copy_setting_list);
             listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
                 public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {

app/src/main/java/epson/print/screen/ActivityPrinterSetting.java

@@ -9,7 +9,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
+
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.Menu;
@@ -273,8 +273,7 @@ public class ActivityPrinterSetting extends ActivityIACommon implements View.OnC
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void onDone() {
+    private void onDone() {
         if (this.printerNameLayout.getVisibility() == 0) {
             this.printerName = this.printerNameEdit.getText().toString();
             if (this.printerName.length() <= 0) {
@@ -399,8 +398,7 @@ public class ActivityPrinterSetting extends ActivityIACommon implements View.OnC
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public boolean isEnableRegistPrinter(String str) {
+    private boolean isEnableRegistPrinter(String str) {
         return new EPPrinterManager(this).loadRemotePrinterInfo(str) == null;
     }
 
@@ -563,8 +561,7 @@ public class ActivityPrinterSetting extends ActivityIACommon implements View.OnC
             this.inputStatus = 0;
         }
 
-        /* access modifiers changed from: package-private */
-        public void skipNextInputConversion() {
+        private void skipNextInputConversion() {
             this.inputStatus = 1;
         }
 

app/src/main/java/epson/print/screen/PaperSourceInfo.java

@@ -20,7 +20,7 @@ public class PaperSourceInfo {
     private PaparInfoTask paparInfoTask = null;
 
     private PaperSourceInfo(Context context) {
-        EpLog.m76i();
+        EpLog.i();
         this.mPrinter.doInitDriver(context, 2);
     }
 

app/src/main/java/epson/print/screen/PaperSourceSettingScr.java

@@ -187,8 +187,7 @@ public class PaperSourceSettingScr extends ActivityIACommon {
         this.paperSourceInfo.stop();
     }
 
-    /* access modifiers changed from: package-private */
-    public void addPaparSettings() {
+    private void addPaparSettings() {
         int i;
         int i2;
         if (this.mEpsonService != null && this.aPaperSourceSetting != null) {

app/src/main/java/epson/print/screen/PrintProgress.java

@@ -847,8 +847,7 @@ public class PrintProgress extends Activity implements CommonDefine {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public int countSheet(int i, int i2) {
+    private int countSheet(int i, int i2) {
         if (i == 65536) {
             int i3 = i2 / 2;
             return i2 % 2 > 0 ? i3 + 1 : i3;

app/src/main/java/epson/print/screen/PrintSetting.java

@@ -137,7 +137,7 @@ public class PrintSetting {
             Cursor query = IprintApplication.getInstance().getContentResolver().query(Uri.parse("content://epson.print.provider.SharedPreferences/"), (String[]) null, (String) null, (String[]) null, (String) null);
             query.moveToFirst();
             this.allValueFromContentProvider.clear();
-            EpLog.m76i();
+            EpLog.i();
             String str = null;
             Object obj = null;
             do {
@@ -471,8 +471,7 @@ public class PrintSetting {
         return getSetting(epson.common.Constants.LANG, (String) null, 1);
     }
 
-    /* access modifiers changed from: package-private */
-    public int getSetting(String str, String str2, int i) {
+    private int getSetting(String str, String str2, int i) {
         SharedPreferences sharedPreferences = this.settings;
         if (sharedPreferences == null) {
             if (this.allValueFromContentProvider.containsKey(str)) {
@@ -490,8 +489,7 @@ public class PrintSetting {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public String getSettingString(String str, String str2) {
+    private String getSettingString(String str, String str2) {
         SharedPreferences sharedPreferences = this.settings;
         if (sharedPreferences != null) {
             return sharedPreferences.getAll().containsKey(str) ? this.settings.getString(str, str2) : str2;
@@ -502,8 +500,7 @@ public class PrintSetting {
         return (String) this.allValueFromContentProvider.get(str);
     }
 
-    /* access modifiers changed from: package-private */
-    public boolean getSettingBoolean(String str, boolean z) {
+    private boolean getSettingBoolean(String str, boolean z) {
         if (this.settings != null || !this.allValueFromContentProvider.containsKey(str)) {
             return z;
         }

app/src/main/java/epson/print/screen/SearchPrinterScr.java

@@ -723,8 +723,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         });
     }
 
-    /* access modifiers changed from: package-private */
-    public void addWiFiSetupButton() {
+    private void addWiFiSetupButton() {
         this.mWiFiSettingButton = this.mLayout.findViewById(R.id.rlWifiSettings);
         if (this.isJapaneseLocale) {
             ((TextView) this.mWiFiSettingButton).setText(R.string.str_goto_wifidirect_settings);
@@ -743,8 +742,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         startActivityForResult(new Intent(this, ActivityWiFiDirectStart.class), 10);
     }
 
-    /* access modifiers changed from: package-private */
-    public void addAboutRemoteButton() {
+    private void addAboutRemoteButton() {
         this.mAboutRemoteButton = this.mLayout.findViewById(R.id.AboutRemoteFrame);
         this.mAboutRemoteButton.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
@@ -1253,8 +1251,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void unbindEpsonService() {
+    private void unbindEpsonService() {
         if (this.mEpsonService != null) {
             if (!this.isFinishSearchPrinter) {
                 this.mHandler.sendEmptyMessageDelayed(2, 200);

app/src/main/java/epson/print/screen/SettingScr.java

@@ -2499,8 +2499,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void launchDetailScreen(int i, int i2) {
+    private void launchDetailScreen(int i, int i2) {
         Intent intent = new Intent(this, PrinterInfoDetail.class);
         Bundle bundle = new Bundle();
         bundle.putInt("ID", i2);
@@ -2795,8 +2794,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
         this.mHandler.sendEmptyMessageDelayed(17, 100);
     }
 
-    /* access modifiers changed from: package-private */
-    public void updateSettingView() {
+    private void updateSettingView() {
         int i = 8;
         if (this.isDocumentSetting) {
             if (this.printerLocation != 2) {
@@ -2862,8 +2860,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
         findViewById(R.id.sharpness_setting_layout).setVisibility(i);
     }
 
-    /* access modifiers changed from: package-private */
-    public int getPrinterLang() {
+    private int getPrinterLang() {
         int i;
         IEpsonService iEpsonService;
         if (!(this.printerLocation == 2 || (iEpsonService = this.mEpsonService) == null)) {
@@ -2880,8 +2877,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
         return i;
     }
 
-    /* access modifiers changed from: package-private */
-    public void setVisibilityPageRange(boolean z) {
+    private void setVisibilityPageRange(boolean z) {
         int i = 0;
         findViewById(R.id.page_range_setting).setVisibility(z ? 0 : 8);
         View findViewById = findViewById(R.id.page_range_separator);
@@ -2891,8 +2887,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
         findViewById.setVisibility(i);
     }
 
-    /* access modifiers changed from: package-private */
-    public void setClickablePageRange(boolean z) {
+    private void setClickablePageRange(boolean z) {
         findViewById(R.id.page_range_setting).setClickable(z);
         int i = 0;
         findViewById(R.id.page_range_next_screen_imv).setVisibility(z ? 0 : 8);
@@ -2903,8 +2898,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
         findViewById.setVisibility(i);
     }
 
-    /* access modifiers changed from: package-private */
-    public void resetSettings() {
+    private void resetSettings() {
         this.printerDeviceId = null;
         this.printerId = null;
         this.printerEmailAddress = null;

app/src/main/java/epson/print/service/EpsonService.java

@@ -210,7 +210,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         }
 
         public int print(EPImageList ePImageList, String str, boolean z) throws RemoteException {
-            EpLog.m76i();
+            EpLog.i();
             boolean z2 = SharedPreferencesProvider.getInstace(EpsonService.this).getInt(Constants.PRINTER_LOCATION, 0) == 2;
             EpLog.m77i("☆☆　　　　 isRemotePrinter  " + z2);
             PrintSetting.Kind valueOf = PrintSetting.Kind.valueOf(str);
@@ -1125,7 +1125,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
 
     public void epsNotifyDataChange(String str) {
         String str2;
-        EpLog.m69d(" *****************  epsNotifyDataChange() call: " + str);
+        EpLog.d(" *****************  epsNotifyDataChange() call: " + str);
         String str3 = "";
         String str4 = "";
         String[] split = str.split("\\|\\|");
@@ -1178,7 +1178,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
     public void updateLoginInfo() {
         clearRemotePrinterInfo();
         this.clientId = SharedPreferencesProvider.getInstace(this).getString(epson.common.Constants.PRINTER_CLIENT_ID, (String) null);
-        EpLog.m69d("▲clientId = " + this.clientId);
+        EpLog.d("▲clientId = " + this.clientId);
         MyPrinter curPrinter = MyPrinter.getCurPrinter(this);
         this.mailAddress = curPrinter.getEmailAddress();
         this.accessKey = curPrinter.getRemotePrinterAccessKey(this);
@@ -1287,7 +1287,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                 r2.append(r3)
                 r2.append(r4)
                 java.lang.String r2 = r2.toString()
-                com.epson.mobilephone.common.EpLog.m69d(r2)
+                com.epson.mobilephone.common.EpLog.d(r2)
                 epson.print.service.EpsonService r2 = epson.print.service.EpsonService.this
                 com.epson.mobilephone.common.escpr.EscprLib r2 = r2.mEscprLib
                 epson.print.service.EpsonService r3 = epson.print.service.EpsonService.this
@@ -2405,7 +2405,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         L_0x01e1:
             if (r24 == 0) goto L_0x020a
             java.lang.String r2 = "割り付け画像を生成"
-            com.epson.mobilephone.common.EpLog.m69d(r2)     // Catch:{ Exception -> 0x022f }
+            com.epson.mobilephone.common.EpLog.d(r2)     // Catch:{ Exception -> 0x022f }
             android.content.Context r4 = r17.getApplicationContext()     // Catch:{ Exception -> 0x022f }
             r9 = r8[r7]     // Catch:{ Exception -> 0x022f }
             r10 = r8[r5]     // Catch:{ Exception -> 0x022f }
@@ -2475,33 +2475,27 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         return this.mEscprLib.get_start_job_resolution2();
     }
 
-    /* access modifiers changed from: package-private */
-    public int epsonConnectCreateJob(int i, String str, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14) throws RemoteException {
+    private int epsonConnectCreateJob(int i, String str, int i2, int i3, int i4, int i5, int i6, int i7, int i8, int i9, int i10, int i11, int i12, int i13, int i14) throws RemoteException {
         return this.mBinder.EpsonConnectCreateJob(i, str, i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13, i14);
     }
 
-    /* access modifiers changed from: package-private */
-    public int epsonConnectEndJob() throws RemoteException {
+    private int epsonConnectEndJob() throws RemoteException {
         return this.mBinder.EpsonConnectEndJob();
     }
 
-    /* access modifiers changed from: package-private */
-    public int epsonConnectUploadFile(String str, int i) throws RemoteException {
+    private int epsonConnectUploadFile(String str, int i) throws RemoteException {
         return this.mBinder.EpsonConnectUploadFile(str, i);
     }
 
-    /* access modifiers changed from: package-private */
-    public int epsonConnectChangePrintSetting() throws RemoteException {
+    private int epsonConnectChangePrintSetting() throws RemoteException {
         return this.mBinder.EpsonConnectChangePrintSetting();
     }
 
-    /* access modifiers changed from: package-private */
-    public int epsonConnectStartPrint(int i, int i2) throws RemoteException {
+    private int epsonConnectStartPrint(int i, int i2) throws RemoteException {
         return this.mBinder.EpsonConnectStartPrint(i, i2);
     }
 
-    /* access modifiers changed from: package-private */
-    public void setEpsonConnectCopies(int i) {
+    private void setEpsonConnectCopies(int i) {
         this.epsJobattrib.mCopies = i;
     }
 
@@ -2618,12 +2612,12 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
     }
 
     public void onCreate() {
-        EpLog.m76i();
+        EpLog.i();
         super.onCreate();
     }
 
     public IBinder onBind(Intent intent) {
-        EpLog.m76i();
+        EpLog.i();
         try {
             if (!isInitDriver) {
                 this.mEscprLib.init_driver(getApplicationContext(), ExternalFileUtils.getInstance(getApplicationContext()).getSupportedMediaDir());
@@ -2637,13 +2631,13 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
     }
 
     public void onRebind(Intent intent) {
-        EpLog.m76i();
+        EpLog.i();
         this.mEscprLib.release_driver();
         isInitDriver = false;
         this.mEscprLib.init_driver(getApplicationContext(), ExternalFileUtils.getInstance(getApplicationContext()).getSupportedMediaDir());
         isInitDriver = true;
         this.clientId = SharedPreferencesProvider.getInstace(this).getString(epson.common.Constants.PRINTER_CLIENT_ID, (String) null);
-        EpLog.m69d("▲clientId = " + this.clientId);
+        EpLog.d("▲clientId = " + this.clientId);
         MyPrinter curPrinter = MyPrinter.getCurPrinter(this);
         this.mailAddress = curPrinter.getEmailAddress();
         this.accessKey = curPrinter.getRemotePrinterAccessKey(this);
@@ -2651,7 +2645,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
     }
 
     public boolean onUnbind(Intent intent) {
-        EpLog.m76i();
+        EpLog.i();
         this.mEscprLib.setHanlder((Handler) null);
         this.mEscprLib.release_driver();
         isInitDriver = false;
@@ -2659,7 +2653,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
     }
 
     public void onDestroy() {
-        EpLog.m76i();
+        EpLog.i();
         super.onDestroy();
     }
 

app/src/main/java/epson/print/service/LocalPrintThread.java

@@ -312,7 +312,7 @@ public class LocalPrintThread extends Thread {
             boolean r11 = r1.mIsBkRetry     // Catch:{ LocalInterrupt | InterruptedException -> 0x0480, LocalEscprException -> 0x03ca, Exception -> 0x0369, all -> 0x035b }
             r4.append(r11)     // Catch:{ LocalInterrupt | InterruptedException -> 0x0480, LocalEscprException -> 0x03ca, Exception -> 0x0369, all -> 0x035b }
             java.lang.String r4 = r4.toString()     // Catch:{ LocalInterrupt | InterruptedException -> 0x0480, LocalEscprException -> 0x03ca, Exception -> 0x0369, all -> 0x035b }
-            com.epson.mobilephone.common.EpLog.m69d(r4)     // Catch:{ LocalInterrupt | InterruptedException -> 0x0480, LocalEscprException -> 0x03ca, Exception -> 0x0369, all -> 0x035b }
+            com.epson.mobilephone.common.EpLog.d(r4)     // Catch:{ LocalInterrupt | InterruptedException -> 0x0480, LocalEscprException -> 0x03ca, Exception -> 0x0369, all -> 0x035b }
             epson.print.service.PrintService r4 = r1.mEpsonService     // Catch:{ LocalInterrupt | InterruptedException -> 0x0480, LocalEscprException -> 0x03ca, Exception -> 0x0369, all -> 0x035b }
             boolean r12 = r1.mIsBkRetry     // Catch:{ LocalInterrupt | InterruptedException -> 0x0480, LocalEscprException -> 0x03ca, Exception -> 0x0369, all -> 0x035b }
             r11 = 40

app/src/main/java/epson/print/service/PdfRenderThread.java

@@ -2,7 +2,7 @@ package epson.print.service;
 
 import android.graphics.BitmapFactory;
 import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
+
 import com.epson.mobilephone.common.PrintingLib.define.Constants;
 import epson.common.ImageUtil;
 import epson.common.Info_paper;

app/src/main/java/epson/print/service/PdfRenderingController.java

@@ -1,6 +1,6 @@
 package epson.print.service;
 
-import android.support.annotation.VisibleForTesting;
+
 import epson.print.EPImageList;
 import epson.print.pdf.AreaPdfRenderer;
 import epson.print.screen.PrintSetting;

app/src/main/java/epson/print/storage/gdrivev3/DownloadTask.java

@@ -3,7 +3,7 @@ package epson.print.storage.gdrivev3;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.AsyncTask;
-import android.support.annotation.VisibleForTesting;
+
 
 import java.io.File;
 import java.io.IOException;

app/src/main/java/epson/print/storage/gdrivev3/FileListAdapter.java

@@ -1,7 +1,7 @@
 package epson.print.storage.gdrivev3;
 
 import android.content.Context;
-import android.support.annotation.UiThread;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/epson/print/widgets/CustomTitleAlertDialogBuilder.java

@@ -53,8 +53,7 @@ public class CustomTitleAlertDialogBuilder extends AlertDialog.Builder {
         return icon;
     }
 
-    /* access modifiers changed from: package-private */
-    public void setUpCustomTitle() {
+    private void setUpCustomTitle() {
         this.titleView = (ViewGroup) ((LayoutInflater) getContext().getSystemService("layout_inflater")).inflate(R.layout.alert_dialog_title, (ViewGroup) null);
         ViewGroup viewGroup = this.titleView;
         if (viewGroup != null) {

app/src/main/java/epson/provider/SharedPreferencesProvider.java

@@ -392,7 +392,7 @@ public class SharedPreferencesProvider extends ContentProvider {
             init(context);
         }
         Uri build = BASE_URI.buildUpon().appendPath(str).appendPath(str2).build();
-        EpLog.m69d("URI = " + build.toString());
+        EpLog.d("URI = " + build.toString());
         return build;
     }
 
@@ -401,7 +401,7 @@ public class SharedPreferencesProvider extends ContentProvider {
             init(context);
         }
         Uri build = BASE_URI.buildUpon().appendPath(str).appendPath(str).appendPath(str).build();
-        EpLog.m69d("URI = " + build.toString());
+        EpLog.d("URI = " + build.toString());
         return build;
     }
 }

app/src/main/java/epson/scan/activity/I2ScanActivity.java

@@ -7,7 +7,7 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.VisibleForTesting;
+
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -779,8 +779,7 @@ public class I2ScanActivity extends ActivityIACommon implements I2ScanAreaView.F
             }
         }
 
-        /* access modifiers changed from: package-private */
-        public void sendUpdateScanProgressPreviewMessage(int i, int i2) {
+        private void sendUpdateScanProgressPreviewMessage(int i, int i2) {
             removeMessages(1);
             sendMessage(obtainMessage(1, i, i2));
         }

app/src/main/java/epson/scan/activity/ModeListAdapter.java

@@ -3,7 +3,7 @@ package epson.scan.activity;
 import android.content.Context;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.StringRes;
-import android.support.annotation.UiThread;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/epson/scan/activity/ScanBaseView.java

@@ -829,8 +829,7 @@ public class ScanBaseView extends ActivityIACommon {
             mScanActivity.onScanAreaSizeChange();
         }
 
-        /* access modifiers changed from: package-private */
-        public void drawTextInCanvas(Canvas canvas) {
+        private void drawTextInCanvas(Canvas canvas) {
             String str = new String();
             float f = ((float) (ScanBaseView.this.getmBaseBot().x - ScanBaseView.this.getmBaseTop().x)) * 0.9f;
             float f2 = (float) (ScanBaseView.this.getmBaseBot().y - ScanBaseView.this.getmBaseTop().y);

app/src/main/java/epson/scan/activity/ScanSearchActivity.java

@@ -9,7 +9,7 @@ import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-import android.support.annotation.UiThread;
+
 
 import android.view.ContextMenu;
 import android.view.MenuItem;
@@ -177,8 +177,7 @@ public class ScanSearchActivity extends ActivityIACommon implements CustomTitleD
         });
     }
 
-    /* access modifiers changed from: package-private */
-    public void addWiFiSetupButton() {
+    private void addWiFiSetupButton() {
         mWiFiSettingButton = mLayout.findViewById(R.id.rlWifiSettings);
         if (this.isJapaneseLocale) {
             ((TextView) mWiFiSettingButton).setText(R.string.str_goto_wifidirect_settings);
@@ -835,8 +834,7 @@ public class ScanSearchActivity extends ActivityIACommon implements CustomTitleD
             ScanSearchActivity.this.showProgress();
         }
 
-        /* access modifiers changed from: package-private */
-        public void cancelTask() {
+        private void cancelTask() {
             mCancelRequested = true;
             synchronized (this) {
                 if (mCancelablePropertyTaker != null) {

app/src/main/java/epson/scan/i2lib/I2ScanParamArbiter.java

@@ -1,7 +1,7 @@
 package epson.scan.i2lib;
 
 import android.content.Context;
-import android.support.annotation.VisibleForTesting;
+
 
 import com.epson.lib.escani2.EscanI2Lib;
 import com.epson.lib.escani2.I2LibScannerInfoAndCapability;
@@ -350,8 +350,7 @@ public class I2ScanParamArbiter {
         }
     }
 
-    /* access modifiers changed from: package-private */
-    public void adjustResolution(I2LibScannerInfoAndCapability i2LibScannerInfoAndCapability) {
+    private void adjustResolution(I2LibScannerInfoAndCapability i2LibScannerInfoAndCapability) {
         if (i2LibScannerInfoAndCapability == null) {
             setDefaultResolutionCandidate();
             return;

app/src/main/java/epson/scan/i2lib/I2ScanParamManager.java

@@ -1,7 +1,7 @@
 package epson.scan.i2lib;
 
 import android.content.Context;
-import android.support.annotation.VisibleForTesting;
+
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;