a

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

@@ -169,8 +169,7 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
         this.mHandler.sendEmptyMessage(1);
     }
 
-    /* access modifiers changed from: private */
-    public void setWait() {
+    private void setWait() {
         this.mModelDialog.doShow(DIALOG_WAIT);
         this.thread = new Thread(new Runnable() {
             public void run() {
@@ -192,8 +191,7 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
         this.thread.start();
     }
 
-    /* access modifiers changed from: private */
-    public void backgroundJob() {
+    private void backgroundJob() {
         int i;
         EPLog.i(LOG_TAG, "backgroundJob");
         Intent intent = getIntent();
@@ -424,8 +422,7 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
         }
     }
 
-    /* access modifiers changed from: private */
-    public void CleanUp() {
+    private void CleanUp() {
         Thread thread2 = this.thread;
         if (thread2 != null && thread2.isAlive()) {
             this.thread.interrupt();

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

@@ -38,8 +38,7 @@ public class ConfirmCancelDialog extends DialogFragment {
         }).create();
     }
 
-    /* access modifiers changed from: private */
-    public void doCancel() {
+    private void doCancel() {
         FragmentActivity activity = getActivity();
         if (activity != null) {
             ((DialogCancelListener) activity).cancel();

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

@@ -81,8 +81,7 @@ public class LocalProgressDialog extends DialogFragment {
         return onCreateDialog;
     }
 
-    /* access modifiers changed from: private */
-    public void showCancelConfirmDialog() {
+    private void showCancelConfirmDialog() {
         if (this.mCancelConfirmDialogTag != null) {
             FragmentManager fragmentManager = getFragmentManager();
             if (fragmentManager != null) {

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

@@ -13,8 +13,7 @@ import epson.print.R;
 public class OneButtonDialogFragment extends DialogFragment {
     private static final String PARAM_DIALOG_ID = "dialog_id";
     private static final String PARAM_MESSAGE_RESOURCE_ID = "message_id";
-    /* access modifiers changed from: private */
-    public String mDialogId;
+    private String mDialogId;
     private int mMessageId;
 
     public interface DialogCallback {

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

@@ -41,18 +41,12 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
     private final String ITEMNAME_PARENT = "..";
     private final int REQUEST_CODE_DELETE_DOWNLOADED_FILE = 0;
     private StorageServiceClient.Enumerator mEnumerator;
-    /* access modifiers changed from: private */
-    public Stack<StorageItem> mFolderStack;
-    /* access modifiers changed from: private */
-    public boolean mIsDownloadInterruption = false;
-    /* access modifiers changed from: private */
-    public boolean mIsDownloading = false;
-    /* access modifiers changed from: private */
-    public ListView mListView;
-    /* access modifiers changed from: private */
-    public int mPosition = 0;
-    /* access modifiers changed from: private */
-    public PrintLog mPrintLog;
+    private Stack<StorageItem> mFolderStack;
+    private boolean mIsDownloadInterruption = false;
+    private boolean mIsDownloading = false;
+    private ListView mListView;
+    private int mPosition = 0;
+    private PrintLog mPrintLog;
     AsyncTaskExecutor<Void, Void, Void> task = null;
 
     protected void onCreate(Bundle bundle) {
@@ -326,8 +320,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void itemClick(int i) {
+    private void itemClick(int i) {
         this.mIsDownloading = true;
         if (isConnected()) {
             this.task = null;
@@ -445,8 +438,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void taskInvoked(boolean z) {
+    private void taskInvoked(boolean z) {
         StorageItemAdapter storageItemAdapter = (StorageItemAdapter) this.mListView.getAdapter();
         if (storageItemAdapter != null) {
             storageItemAdapter.setTaskingStatus(z);
@@ -458,8 +450,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         setSignInButtonEnabled(z2);
     }
 
-    /* access modifiers changed from: private */
-    public void saveDownloadedFilePath(String str) {
+    private void saveDownloadedFilePath(String str) {
         getSharedPreferences("StorageProcessDownloadActivity.Preference", 0).edit().putString("Downloaded.File.Path", str).apply();
     }
 
@@ -467,8 +458,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         return getSharedPreferences("StorageProcessDownloadActivity.Preference", 0).getString("Downloaded.File.Path", (String) null);
     }
 
-    /* access modifiers changed from: private */
-    public StorageServiceClient.Enumerator getEnumerator() {
+    private StorageServiceClient.Enumerator getEnumerator() {
         if (this.mEnumerator == null) {
             this.mEnumerator = getStorageClient().getEnumerator(this);
         }

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

@@ -96,8 +96,7 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
         boolean canceled;
         StorageServiceClient.UploadFileType fileType;
         List<String> localPaths;
-        /* access modifiers changed from: private */
-        public volatile StorageServiceClient.ProcessError taskError;
+        private volatile StorageServiceClient.ProcessError taskError;
         String uploadFilename;
         boolean uploaded;
         StorageServiceClient.Uploader uploader;

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

@@ -18,8 +18,7 @@ import epson.print.R;
 public abstract class StorageSignInActivity extends StorageActivity {
     private static final String EXTRA_SERVER_NAME = "StorageSignInActivity.ServerName";
     private final int DEFAULT_INPUT_MAX_LENGTH = 256;
-    /* access modifiers changed from: private */
-    public BasicSignIn mBasicSignIn;
+    private BasicSignIn mBasicSignIn;
     private StorageActivity.OverlayProgress mProgressUntilOnDestroy;
 
     public interface BasicSignIn {

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

@@ -290,8 +290,7 @@ public class BoxNetClient extends StorageServiceClient {
         throw new UnsupportedOperationException("Method not decompiled: com.epson.iprint.storage.box.BoxNetClient.uploadNewVersion(java.io.File, com.box.androidsdk.content.models.BoxFile):void");
     }
 
-    /* access modifiers changed from: private */
-    public void uploadFileToFolder(@NonNull File file, @NonNull String str, @NonNull String str2) throws BoxException, IOException {
+    private void uploadFileToFolder(@NonNull File file, @NonNull String str, @NonNull String str2) throws BoxException, IOException {
         if (this.mBoxSession != null) {
             String findOrCreateFolder = findOrCreateFolder(str);
             if (findOrCreateFolder != null) {
@@ -392,8 +391,7 @@ public class BoxNetClient extends StorageServiceClient {
         return (boxItem instanceof BoxFolder) || StorageServiceClient.isPrintableFilename(boxItem.getName());
     }
 
-    /* access modifiers changed from: private */
-    public void downloadFile(@NonNull String str, @NonNull String str2) throws IOException, BoxException {
+    private void downloadFile(@NonNull String str, @NonNull String str2) throws IOException, BoxException {
         if (this.mBoxApiFile != null) {
             File file = new File(str2);
             file.createNewFile();

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

@@ -39,8 +39,7 @@ public class EvernoteRequest {
     private static final String TAG = "EvernoteRequest";
     private static final String URI_FILE_DEMI = "/";
     private static final String URI_FILE_FEED = "root";
-    /* access modifiers changed from: private */
-    public Context mContext = null;
+    private Context mContext = null;
 
     public EvernoteRequest(Context context) {
         this.mContext = context;
@@ -221,8 +220,7 @@ public class EvernoteRequest {
         return new DownloadHandler();
     }
 
-    /* access modifiers changed from: private */
-    public static Data readFileAsData(String str) throws FileNotFoundException, NoSuchAlgorithmException {
+    private static Data readFileAsData(String str) throws FileNotFoundException, NoSuchAlgorithmException {
         FileInputStream fileInputStream = new FileInputStream(str);
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
         byte[] bArr = new byte[10240];
@@ -255,8 +253,7 @@ public class EvernoteRequest {
         return data;
     }
 
-    /* access modifiers changed from: private */
-    public static String bytesToHex(byte[] bArr) {
+    private static String bytesToHex(byte[] bArr) {
         StringBuilder sb = new StringBuilder();
         for (byte b : bArr) {
             byte b2 = b & UnsignedBytes.MAX_VALUE;

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

@@ -233,8 +233,7 @@ public class GoogleDownloader {
         FolderManager() {
         }
 
-        /* access modifiers changed from: private */
-        public void changeCurrentFolder(@Nullable OnlineFile onlineFile) {
+        private void changeCurrentFolder(@Nullable OnlineFile onlineFile) {
             if (onlineFile == null || !onlineFile.isFolder()) {
                 return;
             }
@@ -277,8 +276,7 @@ public class GoogleDownloader {
             return onlineFile.getId();
         }
 
-        /* access modifiers changed from: private */
-        public boolean isRootFolder() {
+        private boolean isRootFolder() {
             return this.mCurrentFolder == null;
         }
     }

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

@@ -77,8 +77,7 @@ public class GoogleV3UploadSignInActivity extends AppCompatActivity implements A
         this.mCheckServiceOnly = intent.getBooleanExtra(PARAM_KEY_CHECK_SERVICE_ONLY, false);
     }
 
-    /* access modifiers changed from: private */
-    public void showErrorDialog(final int i, final String str) {
+    private void showErrorDialog(final int i, final String str) {
         if (!this.mActivityForeground) {
             this.mForegroundRunnableList.addLast(new Runnable() {
                 public void run() {

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

@@ -32,8 +32,7 @@ public class IprintGoogleSignIn {
         void onActivityResult(int i, Intent intent);
     }
 
-    /* access modifiers changed from: private */
-    public static void handleLogin(Intent intent, final SignInListener signInListener) {
+    private static void handleLogin(Intent intent, final SignInListener signInListener) {
         GoogleSignIn.getSignedInAccountFromIntent(intent).addOnSuccessListener(new OnSuccessListener<GoogleSignInAccount>() {
             public void onSuccess(GoogleSignInAccount googleSignInAccount) {
                 signInListener.onSignInComplete(true, googleSignInAccount);

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

@@ -45,8 +45,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
     private GoogleDownloadContract.UserActionListener mGoogleDownloadPresenter;
     private boolean mIsDownloadInterruption = false;
     private ListView mListView;
-    /* access modifiers changed from: private */
-    public int mPosition = 0;
+    private int mPosition = 0;
     private TextView mSignInMessage;
     private boolean mSignInOutButtonEnabled;
     private int mSignInOutButtonType;
@@ -108,8 +107,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         }
     }
 
-    /* access modifiers changed from: private */
-    public void dismissDialog(@NonNull final String str) {
+    private void dismissDialog(@NonNull final String str) {
         if (!this.mActivityForeground) {
             this.mForegroundRunnableList.addLast(new Runnable() {
                 public void run() {
@@ -124,8 +122,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         }
     }
 
-    /* access modifiers changed from: private */
-    public void localOnItemClick(int i) {
+    private void localOnItemClick(int i) {
         OnlineFile driveItem = this.mFileListAdapter.getDriveItem(i);
         if (driveItem != null) {
             this.mGoogleDownloadPresenter.itemSelected(driveItem);
@@ -226,8 +223,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         invalidateOptionsMenu();
     }
 
-    /* access modifiers changed from: private */
-    public void showErrorDialog(final int i, final String str) {
+    private void showErrorDialog(final int i, final String str) {
         if (!this.mActivityForeground) {
             this.mForegroundRunnableList.addLast(new Runnable() {
                 public void run() {
@@ -261,8 +257,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         showProgressFragment(false, 0);
     }
 
-    /* access modifiers changed from: private */
-    public void showProgressFragment(final boolean z, final int i) {
+    private void showProgressFragment(final boolean z, final int i) {
         if (!this.mActivityForeground) {
             this.mForegroundRunnableList.addLast(new Runnable() {
                 public void run() {
@@ -357,8 +352,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         this.mIsDownloadInterruption = false;
     }
 
-    /* access modifiers changed from: private */
-    public void removeProgressIfExists() {
+    private void removeProgressIfExists() {
         if (!this.mActivityForeground) {
             this.mForegroundRunnableList.addLast(new Runnable() {
                 public void run() {

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

@@ -42,12 +42,9 @@ public class OneDriveClient extends StorageServiceClient {
     private static final String[] EXTENSIONS_ONEDRIVE_SPEC = {"doc", "docx", "epub", "eml", "htm", "html", "md", NotificationCompat.CATEGORY_MESSAGE, "odp", "ods", "odt", "pps", "ppsx", "ppt", "pptx", "rtf", "tif", "tiff", "xls", "xlsm", "xlsx"};
     private static final String[] MIMETYPE_IPRINT_SPEC = {CommonDefine.DOC_TYPE_1, CommonDefine.DOCX_TYPE_2, CommonDefine.POWERPOINT_TYPE_1, "application/vnd.openxmlformats-officedocument.presentationml.slideshow", CommonDefine.POWERPOINT_TYPE_2, CommonDefine.RTF_TYPE, CommonDefine.EXCEL_TYPE_1, CommonDefine.EXCEL_TYPE_2, "application/vnd.ms-excel.sheet.macroEnabled.12"};
     protected static final String TAG = "OneDriveClient";
-    /* access modifiers changed from: private */
-    public List<StorageItem> mStorageItemList;
-    /* access modifiers changed from: private */
-    public StorageServiceClient.ProcessError mUploadProcessError;
-    /* access modifiers changed from: private */
-    public IOneDriveClient oneDriveClient;
+    private List<StorageItem> mStorageItemList;
+    private StorageServiceClient.ProcessError mUploadProcessError;
+    private IOneDriveClient oneDriveClient;
 
     public interface OnOneDriveClientListener {
         void onNotifyOneDriveClientCollectionPage(List<StorageItem> list);
@@ -141,8 +138,7 @@ public class OneDriveClient extends StorageServiceClient {
         return context.getString(R.string.onedrive);
     }
 
-    /* access modifiers changed from: private */
-    public void getItems(IOneDriveClient iOneDriveClient, String str, StorageServiceClient.EnumerateCompletion enumerateCompletion) {
+    private void getItems(IOneDriveClient iOneDriveClient, String str, StorageServiceClient.EnumerateCompletion enumerateCompletion) {
         this.mStorageItemList = new ArrayList();
         getItem(iOneDriveClient, str, getCallbackItemCollectionPage(enumerateCompletion));
     }
@@ -164,8 +160,7 @@ public class OneDriveClient extends StorageServiceClient {
         }
     }
 
-    /* access modifiers changed from: 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 || isPrintableFileTypes(next) || isConvertPdfExtension((Item) next.userInfo) || isConvertPdfMimeType((Item) next.userInfo)) {
@@ -175,8 +170,7 @@ public class OneDriveClient extends StorageServiceClient {
         return arrayList;
     }
 
-    /* access modifiers changed from: private */
-    public ICallback<IItemCollectionPage> getCallbackCollectionPage(final OnOneDriveClientListener onOneDriveClientListener) {
+    private ICallback<IItemCollectionPage> getCallbackCollectionPage(final OnOneDriveClientListener onOneDriveClientListener) {
         return new ICallback<IItemCollectionPage>() {
             public void success(IItemCollectionPage iItemCollectionPage) {
                 if (iItemCollectionPage != null) {
@@ -216,8 +210,7 @@ public class OneDriveClient extends StorageServiceClient {
         };
     }
 
-    /* access modifiers changed from: private */
-    public StorageItem getStorageItem(Item item) {
+    private StorageItem getStorageItem(Item item) {
         StorageItem storageItem = new StorageItem();
         storageItem.name = item.name;
         storageItem.path = File.separator + item.name;
@@ -244,18 +237,15 @@ public class OneDriveClient extends StorageServiceClient {
         iOneDriveClient.getDrive().getItems(str).getChildren().buildRequest().get(iCallback);
     }
 
-    /* access modifiers changed from: private */
-    public void getNextPage(IItemCollectionPage iItemCollectionPage, ICallback<IItemCollectionPage> iCallback) {
+    private void getNextPage(IItemCollectionPage iItemCollectionPage, ICallback<IItemCollectionPage> iCallback) {
         ((IItemCollectionRequestBuilder) iItemCollectionPage.getNextPage()).buildRequest().get(iCallback);
     }
 
-    /* access modifiers changed from: private */
-    public UploadSession getUploadSession(IOneDriveClient iOneDriveClient, String str) {
+    private UploadSession getUploadSession(IOneDriveClient iOneDriveClient, String str) {
         return iOneDriveClient.getDrive().getRoot().getItemWithPath(str).getCreateSession(new ChunkedUploadSessionDescriptor()).buildRequest().post();
     }
 
-    /* access modifiers changed from: private */
-    public void uploadLargeFile(UploadSession uploadSession, InputStream inputStream, int i, IProgressCallback<Item> iProgressCallback) {
+    private void uploadLargeFile(UploadSession uploadSession, InputStream inputStream, int i, IProgressCallback<Item> iProgressCallback) {
         ChunkedUploadProvider createUploadProvider;
         QueryOption queryOption = new QueryOption("@name.conflictBehavior", "rename");
         if (uploadSession != null && (createUploadProvider = uploadSession.createUploadProvider(this.oneDriveClient, inputStream, i, Item.class)) != null) {
@@ -267,13 +257,11 @@ public class OneDriveClient extends StorageServiceClient {
         }
     }
 
-    /* access modifiers changed from: private */
-    public InputStream getDownloadInputStream(IOneDriveClient iOneDriveClient, String str) {
+    private InputStream getDownloadInputStream(IOneDriveClient iOneDriveClient, String str) {
         return iOneDriveClient.getDrive().getItems(str).getContent().buildRequest().get();
     }
 
-    /* access modifiers changed from: private */
-    public InputStream getDownloadInputStreamPdf(IOneDriveClient iOneDriveClient, String str) {
+    private InputStream getDownloadInputStreamPdf(IOneDriveClient iOneDriveClient, String str) {
         return iOneDriveClient.getDrive().getItems(str).getContent().buildRequest(Collections.singletonList(new QueryOption("format", BoxRepresentation.TYPE_PDF))).get();
     }
 
@@ -296,13 +284,11 @@ public class OneDriveClient extends StorageServiceClient {
         return true;
     }
 
-    /* access modifiers changed from: private */
-    public boolean isExpired(IOneDriveClient iOneDriveClient) {
+    private boolean isExpired(IOneDriveClient iOneDriveClient) {
         return iOneDriveClient.getAuthenticator().getAccountInfo().isExpired();
     }
 
-    /* access modifiers changed from: private */
-    public void getClient(Activity activity, OneDriveAuthenticator.OnOneDriveAuthenticatorListener onOneDriveAuthenticatorListener) {
+    private void getClient(Activity activity, OneDriveAuthenticator.OnOneDriveAuthenticatorListener onOneDriveAuthenticatorListener) {
         IOneDriveClient iOneDriveClient = this.oneDriveClient;
         if (iOneDriveClient == null) {
             getOneDriveClient(activity, onOneDriveAuthenticatorListener);
@@ -335,8 +321,7 @@ public class OneDriveClient extends StorageServiceClient {
         });
     }
 
-    /* access modifiers changed from: private */
-    public void getRootFolder(final IOneDriveClient iOneDriveClient, final StorageServiceClient.EnumerateCompletion enumerateCompletion) {
+    private void getRootFolder(final IOneDriveClient iOneDriveClient, final StorageServiceClient.EnumerateCompletion enumerateCompletion) {
         getRoot(iOneDriveClient, new ICallback<Item>() {
             public void success(Item item) {
                 if (item != null) {
@@ -353,8 +338,7 @@ public class OneDriveClient extends StorageServiceClient {
         });
     }
 
-    /* access modifiers changed from: private */
-    public boolean isConvertPdfExtension(Item item) {
+    private boolean isConvertPdfExtension(Item item) {
         int lastIndexOf;
         if (item != null && item.name != null && !item.name.isEmpty() && (lastIndexOf = item.name.lastIndexOf(CommonDefine.DOT)) > 0) {
             String substring = item.name.substring(lastIndexOf + 1);
@@ -367,8 +351,7 @@ public class OneDriveClient extends StorageServiceClient {
         return false;
     }
 
-    /* access modifiers changed from: private */
-    public boolean isConvertPdfMimeType(Item item) {
+    private boolean isConvertPdfMimeType(Item item) {
         if (!(item == null || item.file == null || item.file.mimeType == null)) {
             for (String equalsIgnoreCase : MIMETYPE_IPRINT_SPEC) {
                 if (item.file.mimeType.equalsIgnoreCase(equalsIgnoreCase)) {
@@ -379,8 +362,7 @@ public class OneDriveClient extends StorageServiceClient {
         return false;
     }
 
-    /* access modifiers changed from: private */
-    public String getConvertPdfName(String str) {
+    private String getConvertPdfName(String str) {
         if (str == null || str.isEmpty()) {
             return "";
         }
@@ -500,13 +482,10 @@ public class OneDriveClient extends StorageServiceClient {
     }
 
     class OneDriveDownloader extends StorageServiceClient.Downloader {
-        /* access modifiers changed from: private */
-        public String mItemid;
-        /* access modifiers changed from: private */
-        public StorageItem mStorageItem;
+        private String mItemid;
+        private StorageItem mStorageItem;
         private DownloadThread mThread = null;
-        /* access modifiers changed from: private */
-        public String mWriteFilename;
+        private String mWriteFilename;
 
         public boolean isCancelable() {
             return true;
@@ -652,14 +631,12 @@ public class OneDriveClient extends StorageServiceClient {
     }
 
     private class LocalUploader implements Runnable {
-        /* access modifiers changed from: private */
-        public volatile boolean bCanceled = false;
+        private volatile boolean bCanceled = false;
         private FileInputStream fileInputStream;
         private StorageServiceClient.UploadCompletion mNotifier;
         private String mOrgFilePath;
         private String mUploadFilename;
-        /* access modifiers changed from: private */
-        public boolean result = true;
+        private boolean result = true;
         private UploadSession uploadSession;
 
         LocalUploader(Activity activity, String str, String str2, @NonNull StorageServiceClient.UploadCompletion uploadCompletion) {
@@ -721,8 +698,7 @@ public class OneDriveClient extends StorageServiceClient {
             }
         }
 
-        /* access modifiers changed from: private */
-        public void uploadcancel() {
+        private void uploadcancel() {
             closefile();
         }
 

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

@@ -13,8 +13,7 @@ import epson.print.R;
 public class OneDriveStorageProcessUploadActivity extends StorageProcessUploadActivity {
     protected static final String TAG = "OneDriveStorageProcessUploadActivity";
     boolean mExpired;
-    /* access modifiers changed from: private */
-    public OneDriveClient mStorageServiceClient;
+    private OneDriveClient mStorageServiceClient;
 
     protected void onStart() {
         super.onStart();

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

@@ -30,8 +30,7 @@ class ActivityBase extends ActivityIACommon {
     static String printerId;
     static String printerIp;
     static final HashMap<String, String> strings = new HashMap<>();
-    /* access modifiers changed from: private */
-    public String TAG = "ActivityBase";
+    private String TAG = "ActivityBase";
     ECopyComponent copyComponent = ECopyComponent.sharedComponent();
     ECopyComponent.ECopyType copyType = ECopyComponent.ECopyType.Standard;
     boolean isKeepSimpleAPConnection = false;

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

@@ -23,6 +23,7 @@ import epson.common.Utils;
 import epson.print.R;
 import epson.print.MyPrinter;
 import epson.print.Util.EPLog;
+import epson.print.WebviewActivity;
 import epson.print.copy.ActivityBase;
 import epson.print.copy.Component.ecopycomponent.ECopyComponent;
 import epson.print.copy.Component.ecopycomponent.ECopyOptionContext;
@@ -40,49 +41,44 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
     private static final int REQUEST_CODE_REPEAT_COPY = 12;
     private final int COMM_ERROR = 1;
     private final int PROBE_PRINTER = 0;
-    /* access modifiers changed from: private */
-    public String TAG = "CopyActivty";
+    private String TAG = "CopyActivty";
     private final int UPDATE_SETTING = 2;
     boolean bProbedPrinter = false;
-    /* access modifiers changed from: private */
-    public int clearindex = 0;
+    private int clearindex = 0;
     CopyProcess copyProcess;
-    /* access modifiers changed from: private */
-    public boolean doClear = false;
-    /* access modifiers changed from: private */
-    public ActivityBase.errorDialog errordialog;
-    /* access modifiers changed from: private */
-    public String ipAdress;
+    private boolean doClear = false;
+    private ActivityBase.errorDialog errordialog;
+    private String ipAdress;
     private RadioGroup mCopyTypeGroup;
     Handler mHandler = new Handler(new Handler.Callback() {
         public boolean handleMessage(Message message) {
-            EPLog.i(CopyActivity.this.TAG, "HandlerCallback");
+            EPLog.i(TAG, "HandlerCallback");
             switch (message.what) {
                 case 0:
-                    EPLog.i(CopyActivity.this.TAG, "PROBE_PRINTER");
+                    EPLog.i(TAG, "PROBE_PRINTER");
                     CopyActivity copyActivity = CopyActivity.this;
                     ProbePrinter unused = copyActivity.task = new ProbePrinter();
-                    CopyActivity.this.task.execute(new Void[0]);
+                    task.execute(new Void[0]);
                     return true;
                 case 1:
-                    EPLog.i(CopyActivity.this.TAG, "COMM_ERROR");
+                    EPLog.i(TAG, "COMM_ERROR");
                     CopyActivity copyActivity2 = CopyActivity.this;
                     ActivityBase.errorDialog unused2 = copyActivity2.errordialog = new ActivityBase.errorDialog(copyActivity2);
-                    CopyActivity.this.errordialog.showErrorDialog(CopyActivity.this.getString(R.string.EPS_PRNERR_COMM_TITLE), CopyActivity.this.getString(R.string.EPS_PRNERR_COMM5), ActivityBase.DialogButtons.Ok, new ActivityBase.IClose() {
+                    errordialog.showErrorDialog(getString(R.string.EPS_PRNERR_COMM_TITLE), getString(R.string.EPS_PRNERR_COMM5), ActivityBase.DialogButtons.Ok, new ActivityBase.IClose() {
                         public void onClose(ActivityBase.ClickButton clickButton) {
-                            CopyActivity.this.finish();
+                            finish();
                         }
                     });
                     return true;
                 case 2:
-                    EPLog.i(CopyActivity.this.TAG, "UPDATE_SETTING");
-                    if (CopyActivity.this.optionContext == null) {
-                        CopyActivity.this.fetchCopyOptionContext();
+                    EPLog.i(TAG, "UPDATE_SETTING");
+                    if (optionContext == null) {
+                        fetchCopyOptionContext();
                         return true;
                     }
                     CopyActivity copyActivity3 = CopyActivity.this;
                     copyActivity3.optionContext = copyActivity3.copyComponent.getBindedCopyOptionContext();
-                    CopyActivity.this.copyComponent.bindCopyOptionContext(CopyActivity.this.optionContext, CopyActivity.this.optionListener);
+                    copyComponent.bindCopyOptionContext(optionContext, optionListener);
                     CopyActivity copyActivity4 = CopyActivity.this;
                     copyActivity4.buildCopyOptions(copyActivity4.copyComponent.getCopyOptionItems());
                     return true;
@@ -93,39 +89,35 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
     });
     private ViewGroup mLayout;
     private RadioButton mNormalCopyButton;
-    /* access modifiers changed from: private */
-    public MaintainPrinter2 mPrinter;
+    private MaintainPrinter2 mPrinter;
     private RadioButton mRepeatCopyButton;
     ECopyComponent.ICopyOptionListener optionListener;
     ActivityBase.OptionItemChangedListener optionValueChangedListener;
-    /* access modifiers changed from: private */
-    public ActivityBase.settingPreference presettings = new ActivityBase.settingPreference();
-    /* access modifiers changed from: private */
-    public int printerLocation;
+    private ActivityBase.settingPreference presettings = new ActivityBase.settingPreference();
+    private int printerLocation;
     ECopyComponent.ICopySystemSettings systemSettings;
-    /* access modifiers changed from: private */
-    public ProbePrinter task;
+    private ProbePrinter task;
 
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        this.copyComponent.getRemoteOperationUUID(this);
-        this.optionContext = null;
-        this.mLayout = (ViewGroup) getLayoutInflater().inflate(R.layout.copy, (ViewGroup) null);
-        setContentView((View) this.mLayout);
+        copyComponent.getRemoteOperationUUID(this);
+        optionContext = null;
+        mLayout = (ViewGroup) getLayoutInflater().inflate(R.layout.copy, (ViewGroup) null);
+        setContentView((View) mLayout);
         setupUi();
         setActionBar((int) R.string.FunctionName_iPrint_Copy, true);
-        if (this.mPrinter == null) {
-            this.mPrinter = MaintainPrinter2.getInstance();
+        if (mPrinter == null) {
+            mPrinter = MaintainPrinter2.getInstance();
         }
-        this.optionValueChangedListener = new ActivityBase.OptionItemChangedListener() {
+        optionValueChangedListener = new ActivityBase.OptionItemChangedListener() {
             public void onOptionItemChanged(ECopyOptionItem eCopyOptionItem) {
-                CopyActivity.this.copyComponent.setCopyOptionItem(eCopyOptionItem);
+                copyComponent.setCopyOptionItem(eCopyOptionItem);
             }
         };
-        this.optionListener = new ECopyComponent.ICopyOptionListener() {
+        optionListener = new ECopyComponent.ICopyOptionListener() {
             public void onCopyOptionChanged(ECopyOptionItem eCopyOptionItem, ArrayList<ECopyOptionItem> arrayList, ECopyComponent.ICopyOptionListener.CopyOptionChangedError copyOptionChangedError) {
                 if (copyOptionChangedError != null) {
-                    CopyActivity.this.loading.dismiss();
+                    loading.dismiss();
                     CopyActivity copyActivity = CopyActivity.this;
                     ActivityBase.errorDialog errordialog = new ActivityBase.errorDialog(copyActivity);
                     String[] reasonText = errordialog.getReasonText(copyOptionChangedError);
@@ -133,65 +125,65 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                     return;
                 }
                 ArrayList arrayList2 = new ArrayList();
-                if (CopyActivity.this.doClear) {
-                    if (CopyActivity.this.clearindex != CopyActivity.this.copyComponent.getCopyOptionItems().size()) {
-                        CopyActivity.this.allClear();
+                if (doClear) {
+                    if (clearindex != copyComponent.getCopyOptionItems().size()) {
+                        allClear();
                         return;
                     }
-                    boolean unused = CopyActivity.this.doClear = false;
-                    int unused2 = CopyActivity.this.clearindex = 0;
-                    arrayList2.addAll(CopyActivity.this.copyComponent.getCopyOptionItems());
+                    boolean unused = doClear = false;
+                    int unused2 = clearindex = 0;
+                    arrayList2.addAll(copyComponent.getCopyOptionItems());
                 }
                 arrayList2.add(eCopyOptionItem);
                 if (arrayList != null) {
                     arrayList2.addAll(arrayList);
                 }
-                CopyActivity.this.buildCopyOptions(arrayList2);
+                buildCopyOptions(arrayList2);
             }
         };
     }
 
     public void onResume() {
-        EPLog.v(this.TAG, "onResume()");
+        EPLog.v(TAG, "onResume()");
         super.onResume();
-        this.isKeepSimpleAPConnection = false;
+        isKeepSimpleAPConnection = false;
         getPrinterInfo();
-        CopyProcess copyProcess2 = this.copyProcess;
+        CopyProcess copyProcess2 = copyProcess;
         if (copyProcess2 == null || !copyProcess2.isProccessing()) {
             if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
-                this.isTryConnectSimpleAp = false;
-            } else if (!this.isTryConnectSimpleAp) {
-                this.isTryConnectSimpleAp = true;
+                isTryConnectSimpleAp = false;
+            } else if (!isTryConnectSimpleAp) {
+                isTryConnectSimpleAp = true;
                 if (WiFiDirectManager.reconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, -1)) {
-                    this.isKeepSimpleAPConnection = true;
-                    this.bProbedPrinter = false;
+                    isKeepSimpleAPConnection = true;
+                    bProbedPrinter = false;
                     return;
                 }
             }
-            this.loading.show();
-            if (!this.bProbedPrinter) {
-                this.mHandler.sendEmptyMessage(0);
+            loading.show();
+            if (!bProbedPrinter) {
+                mHandler.sendEmptyMessage(0);
             } else {
-                this.mHandler.sendEmptyMessage(2);
+                mHandler.sendEmptyMessage(2);
             }
         } else {
-            this.copyProcess.setDisconnectWifi(false);
+            copyProcess.setDisconnectWifi(false);
         }
     }
 
     public void onPause() {
-        EPLog.v(this.TAG, "onPause()");
+        EPLog.v(TAG, "onPause()");
         super.onPause();
-        int i = this.printerLocation;
+        int i = printerLocation;
         if (i == 1 || i == 3) {
-            ProbePrinter probePrinter = this.task;
+            ProbePrinter probePrinter = task;
             if (probePrinter != null) {
                 probePrinter.cancel(true);
             }
-            CopyProcess copyProcess2 = this.copyProcess;
+            CopyProcess copyProcess2 = copyProcess;
             if (copyProcess2 != null && copyProcess2.isProccessing()) {
-                this.copyProcess.setDisconnectWifi(true);
-            } else if (!this.isKeepSimpleAPConnection) {
+                copyProcess.setDisconnectWifi(true);
+            } else if (!isKeepSimpleAPConnection) {
                 WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, ActivityBase.printerIp);
             }
         }
@@ -209,7 +201,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             if (i2 == -1) {
                 finish();
             } else {
-                this.mNormalCopyButton.setChecked(true);
+                mNormalCopyButton.setChecked(true);
             }
         }
     }
@@ -228,29 +220,28 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         LongTapRepeatAdapter.bless(findViewById(R.id.SettingButonCopiesCountDown));
         LongTapRepeatAdapter.bless(findViewById(R.id.SettingButonXDensityCountUp));
         LongTapRepeatAdapter.bless(findViewById(R.id.SettingButonXDensityCountDown));
-        this.mCopyTypeGroup = (RadioGroup) findViewById(R.id.copy_type_group);
-        this.mNormalCopyButton = (RadioButton) findViewById(R.id.normal_copy_tab);
-        this.mNormalCopyButton.setChecked(true);
-        this.mNormalCopyButton.setEnabled(false);
-        this.mNormalCopyButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        mCopyTypeGroup = (RadioGroup) findViewById(R.id.copy_type_group);
+        mNormalCopyButton = (RadioButton) findViewById(R.id.normal_copy_tab);
+        mNormalCopyButton.setChecked(true);
+        mNormalCopyButton.setEnabled(false);
+        mNormalCopyButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             public void onCheckedChanged(CompoundButton compoundButton, boolean z) {
             }
         });
-        this.mRepeatCopyButton = (RadioButton) findViewById(R.id.repeat_copy_tab);
-        this.mRepeatCopyButton.setChecked(false);
-        this.mNormalCopyButton.setEnabled(false);
-        this.mRepeatCopyButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        mRepeatCopyButton = (RadioButton) findViewById(R.id.repeat_copy_tab);
+        mRepeatCopyButton.setChecked(false);
+        mNormalCopyButton.setEnabled(false);
+        mRepeatCopyButton.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             public void onCheckedChanged(CompoundButton compoundButton, boolean z) {
                 if (z) {
-                    CopyActivity.this.switchToRepeatCopy();
+                    switchToRepeatCopy();
                 }
             }
         });
     }
 
-    /* access modifiers changed from: private */
-    public void switchToRepeatCopy() {
-        this.isKeepSimpleAPConnection = true;
+    private void switchToRepeatCopy() {
+        isKeepSimpleAPConnection = true;
         startActivityForResult(new Intent(this, epson.print.rpcopy.CopyActivity.class), 12);
     }
 
@@ -263,11 +254,11 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                 startActivityAndKeepSimpleAp(intent);
                 return;
             case R.id.copy_button /*2131230948*/:
-                String str = this.TAG;
+                String str = TAG;
                 EPLog.i(str, "NOW_PRINTER:" + printerId);
-                this.presettings.saveCopyOptions(this.copyComponent.getCopyOptionItems());
-                this.copyProcess = new CopyProcess(this);
-                this.copyProcess.startCopy(getApplicationContext());
+                presettings.saveCopyOptions(copyComponent.getCopyOptionItems());
+                copyProcess = new CopyProcess(this);
+                copyProcess.startCopy(getApplicationContext());
                 return;
             case R.id.copy_setting_clear_all /*2131230967*/:
                 allClear();
@@ -308,16 +299,16 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
     }
 
     private void startActivityAndKeepSimpleAp(Intent intent) {
-        this.isKeepSimpleAPConnection = true;
+        isKeepSimpleAPConnection = true;
         startActivity(intent);
     }
 
     private void allClear() {
-        this.doClear = true;
-        this.loading.show();
-        ArrayList<ECopyOptionItem> copyOptionItems = this.copyComponent.getCopyOptionItems();
-        int i = this.clearindex;
-        this.clearindex = i + 1;
+        doClear = true;
+        loading.show();
+        ArrayList<ECopyOptionItem> copyOptionItems = copyComponent.getCopyOptionItems();
+        int i = clearindex;
+        clearindex = i + 1;
         ECopyOptionItem eCopyOptionItem = copyOptionItems.get(i);
         switch (eCopyOptionItem.getKey()) {
             case ColorEffectsType:
@@ -353,28 +344,28 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                 eCopyOptionItem.selectValue(eCopyOptionItem.getDefaultValue());
                 break;
         }
-        this.copyComponent.setCopyOptionItem(eCopyOptionItem);
+        copyComponent.setCopyOptionItem(eCopyOptionItem);
     }
 
     private void fetchCopyOptionContext() {
-        this.copyComponent.createCopyOptionContext(this.copyType, new ECopyComponent.ICopyOptionContextListener() {
+        copyComponent.createCopyOptionContext(copyType, new ECopyComponent.ICopyOptionContextListener() {
             public void onCopyOptionContextCreated(ECopyComponent.ECopyType eCopyType, ECopyOptionContext eCopyOptionContext, ECopyComponent.ICopyOptionContextListener.ContextCreationError contextCreationError) {
                 CopyActivity copyActivity = CopyActivity.this;
                 copyActivity.optionContext = eCopyOptionContext;
                 if (contextCreationError == null) {
-                    copyActivity.copyComponent.bindCopyOptionContext(CopyActivity.this.optionContext, CopyActivity.this.optionListener);
-                    ArrayList<ECopyOptionItem> copyOptionItems = CopyActivity.this.copyComponent.getCopyOptionItems();
-                    if (ActivityBase.printerId.equalsIgnoreCase(CopyActivity.this.presettings.loadPrePrinter())) {
-                        CopyActivity.this.presettings.setCopyOptions(copyOptionItems);
+                    copyActivity.copyComponent.bindCopyOptionContext(optionContext, optionListener);
+                    ArrayList<ECopyOptionItem> copyOptionItems = copyComponent.getCopyOptionItems();
+                    if (ActivityBase.printerId.equalsIgnoreCase(presettings.loadPrePrinter())) {
+                        presettings.setCopyOptions(copyOptionItems);
                     } else {
-                        CopyActivity.this.buildCopyOptions(copyOptionItems);
+                        buildCopyOptions(copyOptionItems);
                     }
                 } else {
                     ActivityBase.errorDialog unused = copyActivity.errordialog = new ActivityBase.errorDialog(copyActivity);
-                    String[] reasonText = CopyActivity.this.errordialog.getReasonText(contextCreationError);
-                    CopyActivity.this.errordialog.showErrorDialog(reasonText[0], reasonText[1], ActivityBase.DialogButtons.Ok, new ActivityBase.IClose() {
+                    String[] reasonText = errordialog.getReasonText(contextCreationError);
+                    errordialog.showErrorDialog(reasonText[0], reasonText[1], ActivityBase.DialogButtons.Ok, new ActivityBase.IClose() {
                         public void onClose(ActivityBase.ClickButton clickButton) {
-                            CopyActivity.this.finish();
+                            finish();
                         }
                     });
                 }
@@ -389,58 +380,58 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             ECopyOptionItem.ECopyOptionItemKey key = next.getKey();
             switch (key) {
                 case ColorEffectsType:
-                    String str = this.TAG;
+                    String str = TAG;
                     EPLog.i(str, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_color_info, next);
                     break;
                 case ScanContentType:
-                    String str2 = this.TAG;
+                    String str2 = TAG;
                     EPLog.i(str2, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_document_type_info, next);
                     break;
                 case PrintMediaType:
-                    String str3 = this.TAG;
+                    String str3 = TAG;
                     EPLog.i(str3, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_paper_type_info, next);
                     break;
                 case PrintMediaSize:
-                    String str4 = this.TAG;
+                    String str4 = TAG;
                     EPLog.i(str4, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_paper_size_info, next);
                     break;
                 case PrintMediaSource:
-                    String str5 = this.TAG;
+                    String str5 = TAG;
                     EPLog.i(str5, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_paper_source_info, next);
                     break;
                 case PrintQuality:
-                    String str6 = this.TAG;
+                    String str6 = TAG;
                     EPLog.i(str6, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_quality_info, next);
                     break;
                 case XScale:
-                    String str7 = this.TAG;
+                    String str7 = TAG;
                     EPLog.i(str7, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_scale_info, next);
                     break;
                 case XDensity:
-                    this.optionValueMap.put(key, new XDensityValue(next));
+                    optionValueMap.put(key, new XDensityValue(next));
                     break;
                 case CopyMagnification:
-                    this.optionValueMap.put(key, new ActivityBase.CopyMagnificationValue(next));
+                    optionValueMap.put(key, new ActivityBase.CopyMagnificationValue(next));
                     break;
                 case Copies:
-                    this.optionValueMap.put(key, new CopiesValue(next));
+                    optionValueMap.put(key, new CopiesValue(next));
                     break;
             }
-            this.loading.dismiss();
+            loading.dismiss();
         }
     }
 
     private void updateSetting(int i, ECopyOptionItem eCopyOptionItem) {
-        TextView textView = (TextView) this.mLayout.findViewById(i);
+        TextView textView = (TextView) 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) + " %");
+            textView.setText(getString(R.string.XScale_CustomSetting) + String.valueOf(((ActivityBase.NumberOptionValue) optionValueMap.get(ECopyOptionItem.ECopyOptionItemKey.CopyMagnification)).value) + " %");
             return;
         }
         textView.setText(string(eCopyOptionItem.getSelectedChoice().name()));
@@ -452,47 +443,47 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             bindOption(R.id.SettingEditCopies, eCopyOptionItem);
             bindCountUp(R.id.SettingButonCopiesCountUp);
             bindCountDown(R.id.SettingButonCopiesCountDown);
-            setOptionValueChangedListener(CopyActivity.this.optionValueChangedListener);
+            setOptionValueChangedListener(optionValueChangedListener);
         }
     }
 
     class XDensityValue extends ActivityBase.NumberOptionValue {
         ImageView image;
-        TypedArray images = CopyActivity.this.getResources().obtainTypedArray(R.array.density_images);
+        TypedArray images = getResources().obtainTypedArray(R.array.density_images);
 
         public XDensityValue(ECopyOptionItem eCopyOptionItem) {
             super();
             bindOption(R.id.density_image, eCopyOptionItem);
             bindCountUp(R.id.SettingButonXDensityCountUp);
             bindCountDown(R.id.SettingButonXDensityCountDown);
-            setOptionValueChangedListener(CopyActivity.this.optionValueChangedListener);
+            setOptionValueChangedListener(optionValueChangedListener);
         }
 
         private void bindOption(int i, ECopyOptionItem eCopyOptionItem) {
-            this.optionItem = eCopyOptionItem;
-            this.value = eCopyOptionItem.getSelectedValue();
-            this.image = (ImageView) CopyActivity.this.findViewById(i);
-            this.image.setImageDrawable(this.images.getDrawable(this.value + 4));
-            this.image.setEnabled(eCopyOptionItem.isEnabled());
+            optionItem = eCopyOptionItem;
+            value = eCopyOptionItem.getSelectedValue();
+            image = (ImageView) findViewById(i);
+            image.setImageDrawable(images.getDrawable(value + 4));
+            image.setEnabled(eCopyOptionItem.isEnabled());
         }
 
         private void bindCountUp(int i) {
-            this.countUp = (Button) CopyActivity.this.findViewById(i);
-            this.countUp.setOnClickListener(new CounterImage(1));
-            if (this.value == this.optionItem.getMaximumValue()) {
-                this.countUp.setEnabled(false);
+            countUp = (Button) findViewById(i);
+            countUp.setOnClickListener(new CounterImage(1));
+            if (value == optionItem.getMaximumValue()) {
+                countUp.setEnabled(false);
             } else {
-                this.countUp.setEnabled(true);
+                countUp.setEnabled(true);
             }
         }
 
         private void bindCountDown(int i) {
-            this.countDown = (Button) CopyActivity.this.findViewById(i);
-            this.countDown.setOnClickListener(new CounterImage(-1));
-            if (this.value == this.optionItem.getMinimumValue()) {
-                this.countDown.setEnabled(false);
+            countDown = (Button) findViewById(i);
+            countDown.setOnClickListener(new CounterImage(-1));
+            if (value == optionItem.getMinimumValue()) {
+                countDown.setEnabled(false);
             } else {
-                this.countDown.setEnabled(true);
+                countDown.setEnabled(true);
             }
         }
 
@@ -502,15 +493,15 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             }
 
             private void updateImage(int i) {
-                XDensityValue.this.value += i;
-                XDensityValue.this.optionItem.selectValue(XDensityValue.this.value);
-                if (XDensityValue.this.changedListener != null) {
-                    XDensityValue.this.changedListener.onOptionItemChanged(XDensityValue.this.optionItem);
+                XDensityValue.value += i;
+                XDensityValue.optionItem.selectValue(XDensityValue.value);
+                if (XDensityValue.changedListener != null) {
+                    XDensityValue.changedListener.onOptionItemChanged(XDensityValue.optionItem);
                 }
             }
 
             public void onClick(View view) {
-                updateImage(this.amount);
+                updateImage(amount);
             }
         }
     }
@@ -519,7 +510,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         MyPrinter curPrinter = MyPrinter.getCurPrinter(this);
         printerId = curPrinter.getPrinterId();
         printerIp = curPrinter.getIp();
-        this.printerLocation = curPrinter.getLocation();
+        printerLocation = curPrinter.getLocation();
     }
 
     private class ProbePrinter extends AsyncTask<Void, Void, Boolean> {
@@ -532,25 +523,25 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         }
 
         protected Boolean doInBackground(Void... voidArr) {
-            EPLog.i(CopyActivity.this.TAG, "ProbePrinter doInBackground");
-            this.mRepeatCopyAvailable = false;
-            if ((CopyActivity.this.printerLocation != 1 && CopyActivity.this.printerLocation != 3) || ActivityBase.printerId == null) {
+            EPLog.i(TAG, "ProbePrinter doInBackground");
+            mRepeatCopyAvailable = false;
+            if ((printerLocation != 1 && printerLocation != 3) || ActivityBase.printerId == null) {
                 return false;
             }
-            CopyActivity.this.mPrinter.doInitDriver(CopyActivity.this, 2);
-            if (CopyActivity.this.mPrinter.doProbePrinter(60, ActivityBase.printerId, ActivityBase.printerIp, CopyActivity.this.printerLocation) != 0) {
+            mPrinter.doInitDriver(CopyActivity.this, 2);
+            if (mPrinter.doProbePrinter(60, ActivityBase.printerId, ActivityBase.printerIp, printerLocation) != 0) {
                 return false;
             }
-            int doSetPrinter = CopyActivity.this.mPrinter.doSetPrinter();
-            String access$200 = CopyActivity.this.TAG;
+            int doSetPrinter = mPrinter.doSetPrinter();
+            String access$200 = TAG;
             EPLog.i(access$200, "Set Printer result: " + doSetPrinter);
             if (doSetPrinter != 0) {
                 return false;
             }
             CopyActivity copyActivity = CopyActivity.this;
             String unused = copyActivity.ipAdress = copyActivity.mPrinter.doGetIp();
-            String access$2002 = CopyActivity.this.TAG;
-            EPLog.i(access$2002, "IPAdress : " + CopyActivity.this.ipAdress);
+            String access$2002 = TAG;
+            EPLog.i(access$2002, "IPAdress : " + ipAdress);
             CopyActivity copyActivity2 = CopyActivity.this;
             copyActivity2.bProbedPrinter = true;
             copyActivity2.systemSettings = new ECopyComponent.ICopySystemSettings() {
@@ -559,46 +550,44 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                 }
 
                 public String getPrinterIPAddress() {
-                    String access$200 = CopyActivity.this.TAG;
-                    EPLog.i(access$200, "getPrinterIPAddress : " + CopyActivity.this.ipAdress);
-                    return CopyActivity.this.ipAdress;
+                    String access$200 = TAG;
+                    EPLog.i(access$200, "getPrinterIPAddress : " + ipAdress);
+                    return ipAdress;
                 }
             };
             ECopyComponent sharedComponent = ECopyComponent.sharedComponent();
-            sharedComponent.setSystemSettings(CopyActivity.this.systemSettings);
+            sharedComponent.setSystemSettings(systemSettings);
             sharedComponent.setProperty(ECopyComponent.Property.RequestConnectionTimeout, CopyActivity.CONNECTION_TIMEOUT);
-            this.mRepeatCopyAvailable = CopyActivity.this.checkRepeatCopyFunction();
+            mRepeatCopyAvailable = checkRepeatCopyFunction();
             return true;
         }
 
         protected void onCancelled() {
-            EPLog.i(CopyActivity.this.TAG, "ProbePrinter onCancelled");
+            EPLog.i(TAG, "ProbePrinter onCancelled");
             super.onCancelled();
-            CopyActivity.this.mPrinter.doCancelFindPrinter();
+            mPrinter.doCancelFindPrinter();
         }
 
         protected void onPostExecute(Boolean bool) {
-            EPLog.i(CopyActivity.this.TAG, "ProbePrinter onPostExecute");
-            CopyActivity.this.changeRepeatCopyButtonState(this.mRepeatCopyAvailable);
+            EPLog.i(TAG, "ProbePrinter onPostExecute");
+            changeRepeatCopyButtonState(mRepeatCopyAvailable);
             if (bool.booleanValue()) {
-                CopyActivity.this.mHandler.sendEmptyMessage(2);
+                mHandler.sendEmptyMessage(2);
             } else {
-                CopyActivity.this.mHandler.sendEmptyMessage(1);
+                mHandler.sendEmptyMessage(1);
             }
         }
     }
 
-    /* access modifiers changed from: private */
-    public boolean checkRepeatCopyFunction() {
+    private boolean checkRepeatCopyFunction() {
         ERemoteDevice eRemoteDevice = new ERemoteDevice();
-        eRemoteDevice.setHostIP(this.ipAdress);
+        eRemoteDevice.setHostIP(ipAdress);
         eRemoteDevice.setRequestConnectionTimeout(CONNECTION_TIMEOUT);
         ERemoteDevice.ERemoteDeviceFunctionsResult executeGetFunctionsCommand = eRemoteDevice.executeGetFunctionsCommand(Utils.getRemoteOperationUUID(getApplicationContext()));
         return executeGetFunctionsCommand.success() && executeGetFunctionsCommand.functions().contains(ERemoteOperation.ERemoteParam.repeat_copy);
     }
 
-    /* access modifiers changed from: private */
-    public void changeRepeatCopyButtonState(boolean z) {
+    private void changeRepeatCopyButtonState(boolean z) {
         int i;
         boolean z2 = false;
         if (z) {
@@ -607,8 +596,8 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         } else {
             i = 8;
         }
-        this.mCopyTypeGroup.setVisibility(i);
-        this.mRepeatCopyButton.setEnabled(z2);
+        mCopyTypeGroup.setVisibility(i);
+        mRepeatCopyButton.setEnabled(z2);
     }
 
     protected void deleteLongTapMessage() {

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

@@ -23,51 +23,51 @@ public class CopyProcess implements ECopyComponent.ICopyStatusListener {
     }
 
     public CopyProcess(ActivityBase activityBase2, String str) {
-        this.copyComponent = ECopyComponent.sharedComponent();
-        this.disconnectWifi = false;
-        this.activityBase = activityBase2;
-        this.jobToken = str;
-        ActivityBase activityBase3 = this.activityBase;
+        copyComponent = ECopyComponent.sharedComponent();
+        disconnectWifi = false;
+        activityBase = activityBase2;
+        jobToken = str;
+        ActivityBase activityBase3 = activityBase;
         activityBase3.getClass();
-        this.wheel = new ActivityBase.WheelDialog(this.activityBase);
+        wheel = new ActivityBase.WheelDialog(activityBase);
     }
 
     public void startCopy(Context context) {
-        String str = this.jobToken;
-        this.cancelRequest = str == null ? this.copyComponent.startCopy(this, context) : this.copyComponent.recoverCopy(str, this);
+        String str = jobToken;
+        cancelRequest = str == null ? copyComponent.startCopy(this, context) : copyComponent.recoverCopy(str, this);
     }
 
     public void startCopyPhoto(String str) {
-        this.cancelRequest = this.copyComponent.startCopyPhoto(str, this);
+        cancelRequest = copyComponent.startCopyPhoto(str, this);
     }
 
     public void onStarted(ECopyComponent.ICopyStatusListener.CopyTaskType copyTaskType) {
-        this.wheel.show(this.activityBase.getString(R.string.CopyTaskProgressCopying), new ActivityBase.CancelRequestCallback() {
+        wheel.show(activityBase.getString(R.string.CopyTaskProgressCopying), new ActivityBase.CancelRequestCallback() {
             public void onCancelRequest() {
-                CopyProcess.this.cancelRequest.cancel();
+                cancelRequest.cancel();
             }
         });
     }
 
     public void onProcessed(ECopyComponent.ICopyStatusListener.CopyTaskType copyTaskType, int i, int i2, ECopyComponent.ICopyStatusListener.CopyTaskProgress copyTaskProgress, final ECopyComponent.ICopyResumeRequest iCopyResumeRequest) {
-        ActivityBase.errorDialog errordialog = this.printererror;
+        ActivityBase.errorDialog errordialog = printererror;
         if (errordialog != null) {
             errordialog.Cancel();
         }
         if (copyTaskProgress.equals(ECopyComponent.ICopyStatusListener.CopyTaskProgress.Copying) || copyTaskProgress.equals(ECopyComponent.ICopyStatusListener.CopyTaskProgress.Processing)) {
-            ActivityBase.WheelDialog wheelDialog = this.wheel;
-            wheelDialog.setText(this.activityBase.getString(R.string.CopyTaskProgressCopying) + " " + i2 + CommonDefine.SLASH + i);
+            ActivityBase.WheelDialog wheelDialog = wheel;
+            wheelDialog.setText(activityBase.getString(R.string.CopyTaskProgressCopying) + " " + i2 + CommonDefine.SLASH + i);
         } else {
-            this.wheel.setText("");
+            wheel.setText("");
         }
         switch (copyTaskProgress) {
             case Stopped:
-                ActivityBase activityBase2 = this.activityBase;
+                ActivityBase activityBase2 = activityBase;
                 activityBase2.getClass();
-                this.printererror = new ActivityBase.errorDialog(this.activityBase);
+                printererror = new ActivityBase.errorDialog(activityBase);
                 ECopyComponent.ICopyResumeRequest.StopReason stopReason = iCopyResumeRequest.getStopReason();
                 if (stopReason.equals(ECopyComponent.ICopyResumeRequest.StopReason.PrinterMediaEmptyError)) {
-                    Iterator<ECopyOptionItem> it = this.copyComponent.getCopyOptionItems().iterator();
+                    Iterator<ECopyOptionItem> it = copyComponent.getCopyOptionItems().iterator();
                     while (it.hasNext()) {
                         ECopyOptionItem next = it.next();
                         if (next.getKey().equals(ECopyOptionItem.ECopyOptionItemKey.PrintMediaSource) && next.getSelectedChoice().equals(ECopyOptionItem.ECopyOptionItemChoice.PrintMediaSource_Manual)) {
@@ -75,22 +75,22 @@ public class CopyProcess implements ECopyComponent.ICopyStatusListener {
                         }
                     }
                 }
-                String[] reasonText = this.printererror.getReasonText(stopReason);
-                this.printererror.showErrorDialog(reasonText[0], reasonText[1], iCopyResumeRequest.isPossibleClearError() ? ActivityBase.DialogButtons.ClearErrorCancel : ActivityBase.DialogButtons.Cancel, new ActivityBase.IClose() {
+                String[] reasonText = printererror.getReasonText(stopReason);
+                printererror.showErrorDialog(reasonText[0], reasonText[1], iCopyResumeRequest.isPossibleClearError() ? ActivityBase.DialogButtons.ClearErrorCancel : ActivityBase.DialogButtons.Cancel, new ActivityBase.IClose() {
                     public void onClose(ActivityBase.ClickButton clickButton) {
                         iCopyResumeRequest.resume(clickButton == ActivityBase.ClickButton.ClearError ? ECopyComponent.ICopyResumeRequest.ResumeState.ClearError : ECopyComponent.ICopyResumeRequest.ResumeState.Cancel);
                     }
                 });
                 return;
             case Waiting2ndPage:
-                this.activityBase.showNextPageDialog(new ActivityBase.INextPageClose() {
+                activityBase.showNextPageDialog(new ActivityBase.INextPageClose() {
                     public void onClose(ECopyComponent.ICopyResumeRequest.ResumeState resumeState) {
                         iCopyResumeRequest.resume(resumeState);
                     }
                 });
                 return;
             case Canceling:
-                this.wheel.hideCancelButton();
+                wheel.hideCancelButton();
                 return;
             default:
                 return;
@@ -98,15 +98,15 @@ public class CopyProcess implements ECopyComponent.ICopyStatusListener {
     }
 
     public void onFinished(ECopyComponent.ICopyStatusListener.CopyTaskType copyTaskType, ECopyComponent.ICopyStatusListener.CopyTaskResult copyTaskResult) {
-        this.wheel.dismiss();
+        wheel.dismiss();
         switch (copyTaskResult) {
             case Succeed:
-                Iterator<ECopyOptionItem> it = this.copyComponent.getCopyOptionItems().iterator();
+                Iterator<ECopyOptionItem> it = copyComponent.getCopyOptionItems().iterator();
                 while (it.hasNext()) {
                     ECopyOptionItem next = it.next();
                     if (next.getKey().equals(ECopyOptionItem.ECopyOptionItemKey.Copies)) {
                         next.selectValue(next.getDefaultValue());
-                        this.copyComponent.setCopyOptionItem(next);
+                        copyComponent.setCopyOptionItem(next);
                     }
                 }
                 break;
@@ -114,26 +114,26 @@ public class CopyProcess implements ECopyComponent.ICopyStatusListener {
             case ErrorCommunication:
             case RemoveAdfPaper:
             case ErrorOther:
-                ActivityBase activityBase2 = this.activityBase;
+                ActivityBase activityBase2 = activityBase;
                 activityBase2.getClass();
-                this.printererror = new ActivityBase.errorDialog(this.activityBase);
-                String[] reasonText = this.printererror.getReasonText(copyTaskResult);
-                this.printererror.showErrorDialog(reasonText[0], reasonText[1], ActivityBase.DialogButtons.Ok, new ActivityBase.IClose() {
+                printererror = new ActivityBase.errorDialog(activityBase);
+                String[] reasonText = printererror.getReasonText(copyTaskResult);
+                printererror.showErrorDialog(reasonText[0], reasonText[1], ActivityBase.DialogButtons.Ok, new ActivityBase.IClose() {
                     public void onClose(ActivityBase.ClickButton clickButton) {
                     }
                 });
                 break;
         }
-        if (this.disconnectWifi) {
-            WiFiDirectManager.disconnect(this.activityBase, WiFiDirectManager.DEVICE_TYPE_PRINTER, ActivityBase.printerIp);
+        if (disconnectWifi) {
+            WiFiDirectManager.disconnect(activityBase, WiFiDirectManager.DEVICE_TYPE_PRINTER, ActivityBase.printerIp);
         }
     }
 
     public boolean isProccessing() {
-        return this.wheel.isShowing();
+        return wheel.isShowing();
     }
 
     public void setDisconnectWifi(boolean z) {
-        this.disconnectWifi = z;
+        disconnectWifi = z;
     }
 }

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

@@ -13,10 +13,8 @@ import java.lang.ref.WeakReference;
 
 public class ImageResizer {
     private static ImageResizer sImageResizer;
-    /* access modifiers changed from: private */
-    public BitmapCache mBitmapCache = new BitmapCache();
-    /* access modifiers changed from: private */
-    public volatile boolean mIsTargetActivityForeground;
+    private BitmapCache mBitmapCache = new BitmapCache();
+    private volatile boolean mIsTargetActivityForeground;
     private int mReqSize;
 
     public interface BitmapDrawer {

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

@@ -214,8 +214,7 @@ public abstract class ImageSelectActivity extends ActivityIACommon implements Im
     }
 
     public static class OsCacheDialog extends DialogFragment {
-        /* access modifiers changed from: private */
-        public boolean mUseMediaStoreThumbnail;
+        private boolean mUseMediaStoreThumbnail;
 
         public static OsCacheDialog newInstance() {
             return new OsCacheDialog();
@@ -245,8 +244,7 @@ public abstract class ImageSelectActivity extends ActivityIACommon implements Im
             return create;
         }
 
-        /* access modifiers changed from: private */
-        public void onOkPressed() {
+        private void onOkPressed() {
             ImageSelectActivity imageSelectActivity = (ImageSelectActivity) getActivity();
             if (imageSelectActivity != null) {
                 imageSelectActivity.changeThumbnailCreateMethod(this.mUseMediaStoreThumbnail);

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

@@ -31,8 +31,7 @@ public class ImageViewMultiSelectFragment extends ImageViewBaseFragment {
         return inflate;
     }
 
-    /* access modifiers changed from: private */
-    public void selectImageOnMultiFileMode(boolean z) {
+    private void selectImageOnMultiFileMode(boolean z) {
         ImageSelector selector = this.mListener.getSelector();
         if (!z) {
             selector.remove(this.mFileName);
@@ -77,8 +76,7 @@ public class ImageViewMultiSelectFragment extends ImageViewBaseFragment {
             forceSetChecked(z);
         }
 
-        /* access modifiers changed from: private */
-        public void toggleCheckStatus() {
+        private void toggleCheckStatus() {
             setMyChecked(!this.mToggleImage.isSelected());
         }
 

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

@@ -35,10 +35,8 @@ public class ImageViewPagerActivity extends ActivityIACommon implements ImageVie
     private int mFirstPosition;
     private ImageResizer mImageResizer;
     private ImageSelector mImageSelector;
-    /* access modifiers changed from: private */
-    public int mMessageType;
-    /* access modifiers changed from: private */
-    public boolean mSingleFileMode;
+    private int mMessageType;
+    private boolean mSingleFileMode;
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);

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

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

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

@@ -51,13 +51,11 @@ public class InkRplnProgressFragment extends Fragment {
         return inkRplnProgressFragment2;
     }
 
-    /* access modifiers changed from: private */
-    public InkReplenishSystem getIPrintInkDsManager() {
+    private InkReplenishSystem getIPrintInkDsManager() {
         return this.mInkReplenishSystem;
     }
 
-    /* access modifiers changed from: private */
-    public void requestToShowDialogOrFinish() {
+    private void requestToShowDialogOrFinish() {
         if (this.mInkReplenishSystem.needsDisplayInvitationDialog(IprintApplication.getInstance())) {
             requestToShowDialog();
         } else {

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

@@ -108,8 +108,7 @@ public class JumpUrlFragment extends Fragment {
         bundle.putParcelable(KEY_RESULT_URL, this.mResultUrl);
     }
 
-    /* access modifiers changed from: private */
-    public void requestShowErrorDialogAndFinishActivity() {
+    private void requestShowErrorDialogAndFinishActivity() {
         if (!this.mFragmentForeground) {
             this.mFragmentStatus = FragmentStatus.WAITE_DIALOG_SHOW;
         } else if (((LocalAlertDialogFragment) getFragmentManager().findFragmentByTag(DIALOG_TAG)) == null) {
@@ -117,8 +116,7 @@ public class JumpUrlFragment extends Fragment {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void requestStartBrowser(Uri uri) {
+    private void requestStartBrowser(Uri uri) {
         if (getActivity() == null) {
             this.mFragmentStatus = FragmentStatus.WAITE_START_BROWSE_ACTIVITY;
             this.mResultUrl = uri;

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

@@ -6,16 +6,11 @@ import com.epson.mobilephone.common.maintain2.MaintainPrinter2;
 import epson.print.IprintApplication;
 
 public class PrintSettingDependencyBuilder extends DependencyBuilder {
-    /* access modifiers changed from: private */
-    public final String mEscprLibPrinterId;
-    /* access modifiers changed from: private */
-    public final String mPrinterIpAddress;
-    /* access modifiers changed from: private */
-    public final int mPrinterLocation;
-    /* access modifiers changed from: private */
-    public final String mPrinterModelName;
-    /* access modifiers changed from: private */
-    public final String mPrinterSerialNumber;
+    private final String mEscprLibPrinterId;
+    private final String mPrinterIpAddress;
+    private final int mPrinterLocation;
+    private final String mPrinterModelName;
+    private final String mPrinterSerialNumber;
 
     public PrintSettingDependencyBuilder(String str, String str2, String str3, int i, String str4) {
         this.mEscprLibPrinterId = str;

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

@@ -22,15 +22,13 @@ public class pdfRender implements CommonDefine {
     private static final float DEF_ZOOM_PREVIEW = 0.5f;
     private static final float DEF_ZOOM_PRINT = 1.5f;
     private static final String TAG = "PDF_CONVERTER";
-    /* access modifiers changed from: private */
-    public Thread backgroundThread;
+    private Thread backgroundThread;
     private Context mContext = null;
     private String mConvertedName;
     private String mConvertedNamePrint;
     protected volatile boolean mIsPreviewCon;
     protected boolean mOpenError = false;
-    /* access modifiers changed from: private */
-    public AdobePdfContainer mPdfFile;
+    private AdobePdfContainer mPdfFile;
     private String mPdfFilename;
     protected boolean mPreviewmode = false;
     protected volatile boolean mPrintingCon;
@@ -38,8 +36,7 @@ public class pdfRender implements CommonDefine {
     protected boolean mRotate = false;
     protected boolean mRotateCheck = false;
     public int mTotalPage;
-    /* access modifiers changed from: private */
-    public Handler mUiHandler;
+    private Handler mUiHandler;
 
     public int StartReloadDocument(String str) {
         return 0;

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

@@ -104,16 +104,14 @@ public class PhotoPreview extends View {
         this.mFitMode = 1;
     }
 
-    /* access modifiers changed from: private */
-    public void startScaleChange() {
+    private void startScaleChange() {
         this.maskExpandPreview = false;
         this.baseScaleFactor = this.scaleFactor;
         this.mFitMode = 0;
         invalidate();
     }
 
-    /* access modifiers changed from: private */
-    public void changeScale(float f) {
+    private void changeScale(float f) {
         this.scaleFactor = f * this.baseScaleFactor;
         float f2 = this.scaleFactor;
         if (f2 < MINI_MAGNIFICATION_FACTOR) {
@@ -129,8 +127,7 @@ public class PhotoPreview extends View {
         invalidate();
     }
 
-    /* access modifiers changed from: private */
-    public void changeFitModeAndRefresh() {
+    private void changeFitModeAndRefresh() {
         this.maskExpandPreview = true;
         changeFitMode();
         invalidate();
@@ -557,14 +554,12 @@ public class PhotoPreview extends View {
         invalidate();
     }
 
-    /* access modifiers changed from: private */
-    public void onMoveEventStarted(float f, float f2) {
+    private void onMoveEventStarted(float f, float f2) {
         this.maskExpandPreview = false;
         invalidate();
     }
 
-    /* access modifiers changed from: private */
-    public void onMoving(float f, float f2) {
+    private void onMoving(float f, float f2) {
         this.mFitMode = 0;
         if (this.mBitmap != null) {
             Point point = this.trans;

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

@@ -9,8 +9,7 @@ import java.util.Iterator;
 
 public class PhotoPreviewImageList {
     private ArrayList<EpImageWrapper> mEpImageWrapperList = new ArrayList<>();
-    /* access modifiers changed from: private */
-    public ArrayList<LayoutInfo> mLayoutInfoList = new ArrayList<>();
+    private ArrayList<LayoutInfo> mLayoutInfoList = new ArrayList<>();
 
     public void clearExceptSrcFileName() {
     }

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

@@ -33,8 +33,7 @@ class ActivityBase extends ActivityIACommon {
     private static final HashMap<String, String> mParamStringToDisplayStringHash = new HashMap<>();
     static String printerId;
     static String printerIp;
-    /* access modifiers changed from: private */
-    public String TAG = "ActivityBase";
+    private String TAG = "ActivityBase";
     ECopyComponent copyComponent = ECopyComponent.sharedComponent();
     ECopyComponent.ECopyType copyType = ECopyComponent.ECopyType.Standard;
     boolean isKeepSimpleAPConnection = false;

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

@@ -594,8 +594,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
         }
     }
 
-    /* access modifiers changed from: private */
-    public void localPublishProgress(Progress... progressArr) {
+    private void localPublishProgress(Progress... progressArr) {
         if (progressArr[0].taskProgress == null) {
             EPLog.e("RemoteCOpyTask", "Error: Progress.taskProgress == null");
         } else {

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

@@ -37,19 +37,14 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
     public static final int RESULT_CHANGE_TO_NORMAL_COPY = 0;
     private final int COMM_ERROR = 1;
     private final int PROBE_PRINTER = 0;
-    /* access modifiers changed from: private */
-    public String TAG = "CopyActivty";
+    private String TAG = "CopyActivty";
     private final int UPDATE_SETTING = 2;
     boolean bProbedPrinter = false;
-    /* access modifiers changed from: private */
-    public int clearindex = 0;
+    private int clearindex = 0;
     CopyProcess copyProcess;
-    /* access modifiers changed from: private */
-    public boolean doClear = false;
-    /* access modifiers changed from: private */
-    public ActivityBase.errorDialog errordialog;
-    /* access modifiers changed from: private */
-    public String ipAdress;
+    private boolean doClear = false;
+    private ActivityBase.errorDialog errordialog;
+    private String ipAdress;
     Handler mHandler = new Handler(new Handler.Callback() {
         public boolean handleMessage(Message message) {
             EPLog.i(CopyActivity.this.TAG, "HandlerCallback");
@@ -89,17 +84,13 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
     });
     private ViewGroup mLayout;
     private RadioButton mNormalCopyButton;
-    /* access modifiers changed from: private */
-    public MaintainPrinter2 mPrinter;
+    private MaintainPrinter2 mPrinter;
     ECopyComponent.ICopyOptionListener optionListener;
     ActivityBase.OptionItemChangedListener optionValueChangedListener;
-    /* access modifiers changed from: private */
-    public ActivityBase.settingPreference presettings = new ActivityBase.settingPreference();
-    /* access modifiers changed from: private */
-    public int printerLocation;
+    private ActivityBase.settingPreference presettings = new ActivityBase.settingPreference();
+    private int printerLocation;
     ECopyComponent.ICopySystemSettings systemSettings;
-    /* access modifiers changed from: private */
-    public ProbePrinter task;
+    private ProbePrinter task;
 
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
@@ -224,8 +215,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         ((RadioButton) findViewById(R.id.repeat_copy_tab)).setChecked(true);
     }
 
-    /* access modifiers changed from: private */
-    public void setupUiPostCommunication() {
+    private void setupUiPostCommunication() {
         findViewById(R.id.print_cut_line_layout).setVisibility(0);
         findViewById(R.id.print_cut_line_style_separator).setVisibility(0);
         findViewById(R.id.print_cut_line_style_layout).setVisibility(0);
@@ -233,14 +223,12 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         findViewById(R.id.print_cut_line_weight_layout).setVisibility(0);
     }
 
-    /* access modifiers changed from: private */
-    public void switchToNormalCopy() {
+    private void switchToNormalCopy() {
         setResult(0);
         finish();
     }
 
-    /* access modifiers changed from: private */
-    public void returnToHome() {
+    private void returnToHome() {
         setResult(-1);
         finish();
     }
@@ -263,8 +251,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         LongTapRepeatAdapter.bless(findViewById(R.id.SettingButonXDensityCountDown));
     }
 
-    /* access modifiers changed from: private */
-    public void setClickListenerPostCommunication() {
+    private void setClickListenerPostCommunication() {
         findViewById(R.id.print_cut_line_layout).setOnClickListener(this);
         findViewById(R.id.print_cut_line_style_layout).setOnClickListener(this);
         findViewById(R.id.print_cut_line_weight_layout).setOnClickListener(this);

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

@@ -62,35 +62,26 @@ public class ActivityPrinterSetting extends ActivityIACommon implements View.OnC
     private final int SHOW_ERROR_MESSAGE = 6;
     private final int SUPPORTED_REMOTE_PRINT = 1;
     private final int UPDATE_ACCESSKEY_LAYOUT = 4;
-    /* access modifiers changed from: private */
-    public EditText accessKeyEdit = null;
-    /* access modifiers changed from: private */
-    public FrameLayout accessKeyLayout = null;
-    /* access modifiers changed from: private */
-    public TextView accessKeyText = null;
+    private EditText accessKeyEdit = null;
+    private FrameLayout accessKeyLayout = null;
+    private TextView accessKeyText = null;
     private Bundle bundle = null;
     private Button clearAccessKeyButton = null;
     private Button clearPrinterEmailAddressButton = null;
     private Button clearPrinterNameButton = null;
-    /* access modifiers changed from: private */
-    public Context context = null;
+    private Context context = null;
     private LinearLayout getprinterAdress = null;
     private LinearLayout getprinterAdressLink = null;
     Handler mHandler;
     private LocalTextWatcher mLocalTextWatcher;
     MyPrinter mMyPrinter;
-    /* access modifiers changed from: private */
-    public String oldPrinterEmailAddress = "";
-    /* access modifiers changed from: private */
-    public String printerAccessKey = "";
-    /* access modifiers changed from: private */
-    public String printerEmailAddress = "";
-    /* access modifiers changed from: private */
-    public EditText printerEmailAddressEdit = null;
+    private String oldPrinterEmailAddress = "";
+    private String printerAccessKey = "";
+    private String printerEmailAddress = "";
+    private EditText printerEmailAddressEdit = null;
     private TextView printerEmailText = null;
     private String printerName = "";
-    /* access modifiers changed from: private */
-    public EditText printerNameEdit = null;
+    private EditText printerNameEdit = null;
     private FrameLayout printerNameLayout = null;
     private TextView printerNameText = null;
 
@@ -207,8 +198,7 @@ public class ActivityPrinterSetting extends ActivityIACommon implements View.OnC
         }
     }
 
-    /* access modifiers changed from: private */
-    public void showMailDomainSelectDialog() {
+    private void showMailDomainSelectDialog() {
         StringListSelectDialog.newInstance(new String[]{this.MAIL_DOMAIN_NAME, MAIL_DOMAIN_CHINA}).show(getSupportFragmentManager(), DIALOG_TAG_DOMAIN_SELECT);
     }
 
@@ -435,8 +425,7 @@ public class ActivityPrinterSetting extends ActivityIACommon implements View.OnC
         replaceMailDomainEditText(deleteFirstAtMark(str));
     }
 
-    /* access modifiers changed from: private */
-    public String getDefaultMailDomain() {
+    private String getDefaultMailDomain() {
         return guessIfMainlandChina() ? MAIL_DOMAIN_CHINA : this.MAIL_DOMAIN_NAME;
     }
 

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

@@ -15,8 +15,7 @@ public class PaperSourceInfo {
     public static final int NOTIFY_PAPERSOURCEINFO = 100;
     private static final String TAG = "PaperSourceInfo";
     public static PaperSourceInfo instance;
-    /* access modifiers changed from: private */
-    public MaintainPrinter2 mPrinter = MaintainPrinter2.getInstance();
+    private MaintainPrinter2 mPrinter = MaintainPrinter2.getInstance();
     private PaparInfoTask paparInfoTask = null;
 
     private PaperSourceInfo(Context context) {

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

@@ -59,8 +59,7 @@ public class PaperSourceSettingScr extends ActivityIACommon {
             PaperSourceSettingScr.this.finish();
         }
     };
-    /* access modifiers changed from: private */
-    public IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
+    private IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
         public void onFindPrinterResult(String str, String str2, String str3, String str4, String str5) throws RemoteException {
         }
 
@@ -106,8 +105,7 @@ public class PaperSourceSettingScr extends ActivityIACommon {
             }
         }
     };
-    /* access modifiers changed from: private */
-    public IEpsonService mEpsonService = null;
+    private IEpsonService mEpsonService = null;
     Handler mHandler = new Handler(new Handler.Callback() {
         public boolean handleMessage(Message message) {
             int i = message.what;
@@ -127,8 +125,7 @@ public class PaperSourceSettingScr extends ActivityIACommon {
         }
     });
     PaperSourceInfoBuilder mListBuilder = null;
-    /* access modifiers changed from: private */
-    public String mPrintSettingTypeName = PrintSetting.Kind.photo.name();
+    private String mPrintSettingTypeName = PrintSetting.Kind.photo.name();
     PaperSourceInfo paperSourceInfo = null;
     WorkingDialog progress = null;
 

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

@@ -46,24 +46,18 @@ public class PrintProgress extends Activity implements CommonDefine {
     public static final String PARAM_PRINT_PROGRESS = "progress-params";
     public static final String PREFS_NAME = "PrintSetting";
     public static final int RESULT_ERROR = 1000;
-    /* access modifiers changed from: private */
-    public static boolean bRestartactivity = false;
+    private static boolean bRestartactivity = false;
     static int copies = 0;
     static int curError = 0;
     static int fileIndex = 0;
     static boolean isBkRetry = false;
     static boolean isContinue = false;
     static boolean isDocument = false;
-    /* access modifiers changed from: private */
-    public static final Object lockBCancel = new Object();
-    /* access modifiers changed from: private */
-    public static IEpsonServiceCallback mCallback;
-    /* access modifiers changed from: private */
-    public static ServiceConnection mEpsonConnection;
-    /* access modifiers changed from: private */
-    public static IEpsonService mEpsonService = null;
-    /* access modifiers changed from: private */
-    public static final Object mLock = new Object();
+    private static final Object lockBCancel = new Object();
+    private static IEpsonServiceCallback mCallback;
+    private static ServiceConnection mEpsonConnection;
+    private static IEpsonService mEpsonService = null;
+    private static final Object mLock = new Object();
     private static final Object mLockInit = new Object();
     static ProgressBar mProgressCopies;
     static ProgressBar mProgressPage;
@@ -85,27 +79,19 @@ public class PrintProgress extends Activity implements CommonDefine {
     private final int START_PRINT = 2;
     private final int UPDATE_PERCENT = 0;
     boolean bCancel = false;
-    /* access modifiers changed from: private */
-    public boolean bSearching = false;
-    /* access modifiers changed from: private */
-    public boolean bSearchingPrinter = false;
-    /* access modifiers changed from: private */
-    public Context context = null;
-    /* access modifiers changed from: private */
-    public int curCopy = 1;
-    /* access modifiers changed from: private */
-    public int curSheet = 1;
+    private boolean bSearching = false;
+    private boolean bSearchingPrinter = false;
+    private Context context = null;
+    private int curCopy = 1;
+    private int curSheet = 1;
     int duplex = 0;
-    /* access modifiers changed from: private */
-    public boolean isDialogOpen = false;
-    /* access modifiers changed from: private */
-    public boolean isRemotePrinter = false;
+    private boolean isDialogOpen = false;
+    private boolean isRemotePrinter = false;
     private boolean mApfProgressDisplay;
     Button mCancelButton;
     boolean mCanceled = false;
     TextView mCopies;
-    /* access modifiers changed from: private */
-    public volatile boolean mError = false;
+    private volatile boolean mError = false;
     Handler mHandler = new Handler(new Handler.Callback() {
         /* JADX WARNING: Can't fix incorrect switch cases order */
         /* JADX WARNING: Code restructure failed: missing block: B:40:0x01ec, code lost:
@@ -647,12 +633,9 @@ public class PrintProgress extends Activity implements CommonDefine {
     TextView mPercent;
     private boolean mPrintProgressDisplay;
     private ProgressParams mProgressParams;
-    /* access modifiers changed from: private */
-    public volatile boolean mWaitEpsonServiceForFinish = false;
-    /* access modifiers changed from: private */
-    public String percentString = "";
-    /* access modifiers changed from: private */
-    public String printerIp;
+    private volatile boolean mWaitEpsonServiceForFinish = false;
+    private String percentString = "";
+    private String printerIp;
     private int sheets;
 
     public interface ProgressParams extends Serializable {
@@ -858,8 +841,7 @@ public class PrintProgress extends Activity implements CommonDefine {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void triggerPrint() {
+    private void triggerPrint() {
         this.mHandler.sendEmptyMessage(2);
     }
 
@@ -893,8 +875,7 @@ public class PrintProgress extends Activity implements CommonDefine {
         NfcTagUtils.disableForegroundDispatch(this);
     }
 
-    /* access modifiers changed from: private */
-    public void setPrintEnd() {
+    private void setPrintEnd() {
         ((IprintApplication) getApplication()).setPrinting(false);
     }
 
@@ -926,8 +907,7 @@ public class PrintProgress extends Activity implements CommonDefine {
         this.percentString = getString(R.string.apf_processing);
     }
 
-    /* access modifiers changed from: private */
-    public void updatePrintProgress(int i) {
+    private void updatePrintProgress(int i) {
         if (!this.mPrintProgressDisplay) {
             changePrintProgress();
             this.mPrintProgressDisplay = true;
@@ -958,8 +938,7 @@ public class PrintProgress extends Activity implements CommonDefine {
         this.mPercent.setText(this.percentString + "         " + i + "%");
     }
 
-    /* access modifiers changed from: private */
-    public void updateApfProgress(int i) {
+    private void updateApfProgress(int i) {
         if (!this.mApfProgressDisplay) {
             changeApfProgress();
             this.mApfProgressDisplay = true;
@@ -969,8 +948,7 @@ public class PrintProgress extends Activity implements CommonDefine {
         textView.setText(this.percentString + "         " + i + "%");
     }
 
-    /* access modifiers changed from: private */
-    public void startPrint() throws RemoteException {
+    private void startPrint() throws RemoteException {
         this.bSearching = false;
         this.mProgressParams.print(mEpsonService, isBkRetry);
     }
@@ -1116,8 +1094,7 @@ public class PrintProgress extends Activity implements CommonDefine {
         }
     }
 
-    /* access modifiers changed from: private */
-    public void CancelPrint() {
+    private void CancelPrint() {
         try {
             if (mEpsonService != null) {
                 mEpsonService.cancelPrint();
@@ -1150,8 +1127,7 @@ public class PrintProgress extends Activity implements CommonDefine {
         }).create().show();
     }
 
-    /* access modifiers changed from: private */
-    public void sendPrintLog() {
+    private void sendPrintLog() {
         Analytics.sendPrintLog(this, this.mProgressParams);
     }
 

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

@@ -45,10 +45,8 @@ import java.util.Locale;
 public class PrinterFinder extends ActivityIACommon {
     private static final int DELAY = 100;
     private static final int DIALOG_INFORM = 0;
-    /* access modifiers changed from: private */
-    public static boolean foundPrinter = false;
-    /* access modifiers changed from: private */
-    public static final Object mLock = new Object();
+    private static boolean foundPrinter = false;
+    private static final Object mLock = new Object();
     private final int CANCEL_FIND_PRINTER = 2;
     private final int DISPLAY_FIND_RESULT = 6;
     private final int INFORM_DIALOG = 5;
@@ -61,15 +59,11 @@ public class PrinterFinder extends ActivityIACommon {
     private final int SELECT_PRINTER = 4;
     private final int UPDATE_PRINTER = 3;
     int curError;
-    /* access modifiers changed from: private */
-    public boolean isDialogOpen = false;
-    /* access modifiers changed from: private */
-    public boolean isFinishSearchPrinter = false;
-    /* access modifiers changed from: private */
-    public Boolean isFocused = true;
+    private boolean isDialogOpen = false;
+    private boolean isFinishSearchPrinter = false;
+    private Boolean isFocused = true;
     AbstractListBuilder mBuilder;
-    /* access modifiers changed from: private */
-    public IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
+    private IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
         public void onGetInkState() throws RemoteException {
         }
 
@@ -133,8 +127,7 @@ public class PrinterFinder extends ActivityIACommon {
             }
         }
     };
-    /* access modifiers changed from: private */
-    public IEpsonService mEpsonService = null;
+    private IEpsonService mEpsonService = null;
     Handler mHandler = new Handler(new Handler.Callback() {
         public boolean handleMessage(Message message) {
             switch (message.what) {
@@ -267,8 +260,7 @@ public class PrinterFinder extends ActivityIACommon {
     ViewGroup mLayout;
     ProgressBar mProgressBar;
     Button mSearchButton;
-    /* access modifiers changed from: private */
-    public ArrayList<String> printerList = new ArrayList<>();
+    private ArrayList<String> printerList = new ArrayList<>();
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);

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

@@ -29,19 +29,15 @@ public class PrinterInfoDetail extends ActivityIACommon {
     private final int GET_PAPER_TYPE = 2;
     private final int GET_PRINTDATE = 18;
     private final int GET_QUALITY = 4;
-    /* access modifiers changed from: private */
-    public int[] color_info = null;
-    /* access modifiers changed from: private */
-    public int[] duplex_info = null;
+    private int[] color_info = null;
+    private int[] duplex_info = null;
     private int[] feed_direction_info = null;
 
     /* renamed from: id */
     int f405id;
-    /* access modifiers changed from: private */
-    public int[] info = null;
+    private int[] info = null;
     boolean isDocumentSetting;
-    /* access modifiers changed from: private */
-    public int[] layout_info = null;
+    private int[] layout_info = null;
     AbstractListBuilder mBuilder;
     Handler mHandler = new Handler(new Handler.Callback() {
         public boolean handleMessage(Message message) {
@@ -177,15 +173,11 @@ public class PrinterInfoDetail extends ActivityIACommon {
     });
     ViewGroup mLayout;
     MediaInfo.AbstractInfo mLookupTable;
-    /* access modifiers changed from: private */
-    public int[] paper_size_info = null;
-    /* access modifiers changed from: private */
-    public int[] paper_source_info = null;
-    /* access modifiers changed from: private */
-    public int[] paper_type_info = null;
+    private int[] paper_size_info = null;
+    private int[] paper_source_info = null;
+    private int[] paper_type_info = null;
     private int[] printdate_info = null;
-    /* access modifiers changed from: private */
-    public int[] quality_info = null;
+    private int[] quality_info = null;
     private int sizeIndex = 0;
     private int typeIndex = 0;
 

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

@@ -66,10 +66,8 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
     private static final int Menu_Delete = 1;
     private static final int Menu_Edit = 2;
     private static final String TAG = "SearchPrinterScr";
-    /* access modifiers changed from: private */
-    public static boolean foundPrinter = false;
-    /* access modifiers changed from: private */
-    public static final Object mLock = new Object();
+    private static boolean foundPrinter = false;
+    private static final Object mLock = new Object();
     private final int CANCEL_FIND_PRINTER = 2;
     private final int CONNECT_SIMPLEAP = 10;
     private final int DELETE_PRINTER = 7;
@@ -92,22 +90,17 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
     private String connectionInfo = null;
     int curError;
     ListControlHelper helper = null;
-    /* access modifiers changed from: private */
-    public boolean isDialogOpen = false;
-    /* access modifiers changed from: private */
-    public volatile boolean isFinishSearchPrinter = true;
-    /* access modifiers changed from: private */
-    public Boolean isFocused = true;
+    private boolean isDialogOpen = false;
+    private volatile boolean isFinishSearchPrinter = true;
+    private Boolean isFocused = true;
     private boolean isJapaneseLocale = false;
-    /* access modifiers changed from: private */
-    public volatile boolean isSearchSimpleAp = false;
+    private volatile boolean isSearchSimpleAp = false;
     private AdapterView.AdapterContextMenuInfo listItemIndex;
     View mAboutRemoteButton;
     private boolean mActivityForegroundLifetime;
     Button mAddButton;
     AbstractListBuilder mBuilder;
-    /* access modifiers changed from: private */
-    public IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
+    private IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
         public void onGetInkState() throws RemoteException {
         }
 
@@ -177,10 +170,8 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
             }
         }
     };
-    /* access modifiers changed from: private */
-    public Context mContext = null;
-    /* access modifiers changed from: private */
-    public int mDeletePos = -1;
+    private Context mContext = null;
+    private int mDeletePos = -1;
     private ServiceConnection mEpsonConnection = new ServiceConnection() {
         public void onServiceDisconnected(ComponentName componentName) {
             try {
@@ -202,8 +193,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
             }
         }
     };
-    /* access modifiers changed from: private */
-    public IEpsonService mEpsonService = null;
+    private IEpsonService mEpsonService = null;
     Handler mHandler = new Handler(new Handler.Callback() {
         /* JADX DEBUG: Multi-variable search result rejected for TypeSearchVarInfo{r10v46, resolved type: java.lang.Object} */
         /* JADX DEBUG: Multi-variable search result rejected for TypeSearchVarInfo{r2v22, resolved type: epson.print.MyPrinter} */
@@ -639,8 +629,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
     boolean mIsClickSelect = false;
     ViewGroup mLayout;
     private TextView mListEmptyMessageTextView;
-    /* access modifiers changed from: private */
-    public ListView mListView;
+    private ListView mListView;
     RadioButton mLocalButton;
     ProgressBar mProgressBar;
     RadioButton mRemoteButton;
@@ -650,17 +639,12 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
     private String printerEmailAddress = "";
     private String printerId = "";
     private String printerKey = "";
-    /* access modifiers changed from: private */
-    public ArrayList<String> printerList = new ArrayList<>();
-    /* access modifiers changed from: private */
-    public volatile int printer_location = 0;
-    /* access modifiers changed from: private */
-    public MyPrinter probedPrinter = null;
+    private ArrayList<String> printerList = new ArrayList<>();
+    private volatile int printer_location = 0;
+    private MyPrinter probedPrinter = null;
     WorkingDialog progress;
-    /* access modifiers changed from: private */
-    public SearchWiFiDirectPrinterTask searchWiFiDirectPrinter = null;
-    /* access modifiers changed from: private */
-    public MyPrinter selectedPrinter = null;
+    private SearchWiFiDirectPrinterTask searchWiFiDirectPrinter = null;
+    private MyPrinter selectedPrinter = null;
     WiFiDirectPrinterListUtils wiFiDirectPrinterListUtils = null;
 
     protected void onCreate(Bundle bundle) {
@@ -736,8 +720,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         });
     }
 
-    /* access modifiers changed from: private */
-    public void startWifiPrinterSelect() {
+    private void startWifiPrinterSelect() {
         startActivityForResult(new Intent(this, ActivityWiFiDirectStart.class), 10);
     }
 
@@ -750,8 +733,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         });
     }
 
-    /* access modifiers changed from: private */
-    public void buildElements() {
+    private void buildElements() {
         this.mSearchButton = (Button) this.mLayout.findViewById(R.id.function_button);
         this.mProgressBar = (ProgressBar) this.mLayout.findViewById(R.id.progress_bar);
         this.mAddButton = (Button) this.mLayout.findViewById(R.id.edit_button);
@@ -1067,8 +1049,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         }
     }
 
-    /* access modifiers changed from: private */
-    public void search() {
+    private void search() {
         interruptSearch();
         synchronized (mLock) {
             this.printerList.clear();
@@ -1110,8 +1091,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         }
     }
 
-    /* access modifiers changed from: private */
-    public void interruptSearch() {
+    private void interruptSearch() {
         EPLog.d(TAG, "interruptSearch()");
         this.mHandler.removeMessages(1);
         this.mHandler.removeMessages(14);
@@ -1155,8 +1135,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         this.isFinishSearchPrinter = true;
     }
 
-    /* access modifiers changed from: private */
-    public DialogFragment getPrinterNotFoundDialog() {
+    private DialogFragment getPrinterNotFoundDialog() {
         String str;
         boolean prefBoolean = Utils.getPrefBoolean(getApplicationContext(), "PrintSetting", CommonDefine.RE_SEARCH);
         int i = R.string.EPS_PRNERR_COMM_TITLE4;
@@ -1175,8 +1154,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         return CustomLayoutDialogFragment.newInstance(1, str + "\n\n" + getString(R.string.confirm_browse_wlan_setup_info), i, (int) R.string.browse_site, (int) R.string.str_btn_close);
     }
 
-    /* access modifiers changed from: private */
-    public void showPrinterNotFoundDialog(DialogFragment dialogFragment) {
+    private void showPrinterNotFoundDialog(DialogFragment dialogFragment) {
         if (this.mActivityForegroundLifetime) {
             dialogFragment.show(getSupportFragmentManager(), DIALOG_TAG_PRINTER_NOT_FOUND);
         }

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

@@ -73,66 +73,41 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
     private final int SETTING_DONE = 3;
     private final int SHOW_ERROR_DIALOG = 18;
     private TextView apfStateText;
-    /* access modifiers changed from: private */
-    public String autoConnectSsid = null;
-    /* access modifiers changed from: private */
-    public TextView brightness;
-    /* access modifiers changed from: private */
-    public Button brightnessMinus;
-    /* access modifiers changed from: private */
-    public Button brightnessPlus;
-    /* access modifiers changed from: private */
-    public int brightnessValue;
-    /* access modifiers changed from: private */
-    public int color;
-    /* access modifiers changed from: private */
-    public TextView colorInfo;
-    /* access modifiers changed from: private */
-    public int[] color_info = null;
-    /* access modifiers changed from: private */
-    public TextView contrast;
-    /* access modifiers changed from: private */
-    public Button contrastMinus;
-    /* access modifiers changed from: private */
-    public Button contrastPlus;
-    /* access modifiers changed from: private */
-    public int contrastValue;
+    private String autoConnectSsid = null;
+    private TextView brightness;
+    private Button brightnessMinus;
+    private Button brightnessPlus;
+    private int brightnessValue;
+    private int color;
+    private TextView colorInfo;
+    private int[] color_info = null;
+    private TextView contrast;
+    private Button contrastMinus;
+    private Button contrastPlus;
+    private int contrastValue;
     private TextView copies;
     private Button copiesMinus;
     private Button copiesPlus;
     private int copiesValue;
     private boolean disablePrintArea = false;
-    /* access modifiers changed from: private */
-    public int duplex;
-    /* access modifiers changed from: private */
-    public TextView duplexInfo;
-    /* access modifiers changed from: private */
-    public int[] duplex_info = null;
+    private int duplex;
+    private TextView duplexInfo;
+    private int[] duplex_info = null;
     private boolean enableShowPreview = false;
-    /* access modifiers changed from: private */
-    public int endValue;
-    /* access modifiers changed from: private */
-    public int feedDirection;
-    /* access modifiers changed from: private */
-    public TextView feedDirectionInfo;
-    /* access modifiers changed from: private */
-    public int[] info = null;
-    /* access modifiers changed from: private */
-    public boolean isDocumentSetting = true;
+    private int endValue;
+    private int feedDirection;
+    private TextView feedDirectionInfo;
+    private int[] info = null;
+    private boolean isDocumentSetting = true;
     boolean isInfoAvai = false;
     Boolean isNotLoading = true;
     private boolean isRetryAfterConnectSimpleAp = false;
     private boolean isTryConnectSimpleAp = false;
-    /* access modifiers changed from: private */
-    public int lang = 1;
-    /* access modifiers changed from: private */
-    public int layout;
-    /* access modifiers changed from: private */
-    public TextView layoutInfo;
-    /* access modifiers changed from: private */
-    public int[] layout_info = null;
-    /* access modifiers changed from: private */
-    public IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
+    private int lang = 1;
+    private int layout;
+    private TextView layoutInfo;
+    private int[] layout_info = null;
+    private IEpsonServiceCallback mCallback = new IEpsonServiceCallback.Stub() {
         public void onGetInkState() throws RemoteException {
         }
 
@@ -175,8 +150,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
             }
         }
     };
-    /* access modifiers changed from: private */
-    public Context mContext = null;
+    private Context mContext = null;
     private ServiceConnection mEpsonConnection = new ServiceConnection() {
         public void onServiceDisconnected(ComponentName componentName) {
             EPLog.v("SettingScr", "onServiceDisconnected");
@@ -200,10 +174,8 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
             }
         }
     };
-    /* access modifiers changed from: private */
-    public IEpsonService mEpsonService = null;
-    /* access modifiers changed from: private */
-    public volatile boolean mFinishRequested;
+    private IEpsonService mEpsonService = null;
+    private volatile boolean mFinishRequested;
     Handler mHandler = new Handler(new Handler.Callback() {
         /* JADX DEBUG: Multi-variable search result rejected for TypeSearchVarInfo{r1v4, resolved type: boolean} */
         /* JADX WARNING: type inference failed for: r1v1 */
@@ -1824,72 +1796,45 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
             throw new UnsupportedOperationException("Method not decompiled: epson.print.screen.SettingScr.C23643.handleMessage(android.os.Message):boolean");
         }
     });
-    /* access modifiers changed from: private */
-    public MediaInfo.AbstractInfo mLookupTable;
+    private MediaInfo.AbstractInfo mLookupTable;
     private MediaInfo.AbstractInfo mPaperSizeType;
     private boolean mPrinterSelectDone;
     private int mSharpnessValue;
     private TextView mSharpnessValueText;
     private boolean mWaiteInkReplenProgress;
-    /* access modifiers changed from: private */
-    public int paperSize;
-    /* access modifiers changed from: private */
-    public TextView paperSizeInfo;
-    /* access modifiers changed from: private */
-    public int paperSource;
-    /* access modifiers changed from: private */
-    public TextView paperSourceInfo;
-    /* access modifiers changed from: private */
-    public int paperType;
-    /* access modifiers changed from: private */
-    public TextView paperTypeInfo;
-    /* access modifiers changed from: private */
-    public int[] paper_size_info = null;
-    /* access modifiers changed from: private */
-    public int[] paper_source_info = null;
-    /* access modifiers changed from: private */
-    public int[] paper_type_info = null;
+    private int paperSize;
+    private TextView paperSizeInfo;
+    private int paperSource;
+    private TextView paperSourceInfo;
+    private int paperType;
+    private TextView paperTypeInfo;
+    private int[] paper_size_info = null;
+    private int[] paper_source_info = null;
+    private int[] paper_type_info = null;
     private int photoApfValueForLocalPrinter;
     private boolean printAll;
-    /* access modifiers changed from: private */
-    public TextView printDateInfo;
-    /* access modifiers changed from: private */
-    public int printdate;
+    private TextView printDateInfo;
+    private int printdate;
     private MyPrinter printer = null;
     private String printerDeviceId;
-    /* access modifiers changed from: private */
-    public String printerEmailAddress;
-    /* access modifiers changed from: private */
-    public String printerId;
-    /* access modifiers changed from: private */
-    public String printerIp;
-    /* access modifiers changed from: private */
-    public int printerLocation;
-    /* access modifiers changed from: private */
-    public TextView printerName;
+    private String printerEmailAddress;
+    private String printerId;
+    private String printerIp;
+    private int printerLocation;
+    private TextView printerName;
     private String printerSerialNo;
     private View progressGetOption;
-    /* access modifiers changed from: private */
-    public int quality;
-    /* access modifiers changed from: private */
-    public TextView qualityInfo;
-    /* access modifiers changed from: private */
-    public int[] quality_info = null;
-    /* access modifiers changed from: private */
-    public TextView saturation;
-    /* access modifiers changed from: private */
-    public Button saturationMinus;
-    /* access modifiers changed from: private */
-    public Button saturationPlus;
-    /* access modifiers changed from: private */
-    public int saturationValue;
+    private int quality;
+    private TextView qualityInfo;
+    private int[] quality_info = null;
+    private TextView saturation;
+    private Button saturationMinus;
+    private Button saturationPlus;
+    private int saturationValue;
     private int sheets = 1;
-    /* access modifiers changed from: private */
-    public int sizeIndex = 0;
-    /* access modifiers changed from: private */
-    public int startValue;
-    /* access modifiers changed from: private */
-    public int typeIndex = 0;
+    private int sizeIndex = 0;
+    private int startValue;
+    private int typeIndex = 0;
     boolean undoFlag = true;
 
     static /* synthetic */ int access$1208(SettingScr settingScr) {
@@ -2138,8 +2083,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
         }
     }
 
-    /* access modifiers changed from: private */
-    public boolean updateSupportedMediaFile(boolean z) {
+    private boolean updateSupportedMediaFile(boolean z) {
         ExternalFileUtils instance = ExternalFileUtils.getInstance(this);
         EPLog.i("PrintSetting", "call updateSupportedMedia");
         File supportedMedia = instance.getSupportedMedia();
@@ -2931,8 +2875,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
         new InkRplnRepository(false).deleteTemporaryData(this);
     }
 
-    /* access modifiers changed from: private */
-    public void setScreenState(Boolean bool) {
+    private void setScreenState(Boolean bool) {
         if (bool.booleanValue()) {
             this.progressGetOption.setVisibility(8);
         } else {

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

@@ -47,8 +47,7 @@ public class StringListSelectDialog extends DialogFragment {
         throw new IllegalArgumentException();
     }
 
-    /* access modifiers changed from: private */
-    public void itemSelected(int i) {
+    private void itemSelected(int i) {
         OnItemSelectedListener onItemSelectedListener = this.mListener;
         if (onItemSelectedListener != null) {
             onItemSelectedListener.onItemSelected(this.mStringList[i]);

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

@@ -59,44 +59,30 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
     public static final String PREFS_NAME = "PrintSetting";
     public static final int PROGRESS_NOTIFY_TYPE_APF = 2;
     public static final int PROGRESS_NOTIFY_TYPE_PRINTING = 1;
-    /* access modifiers changed from: private */
-    public static volatile boolean bCancelPrinting = false;
+    private static volatile boolean bCancelPrinting = false;
     public static boolean bNotifyPrinter = false;
-    /* access modifiers changed from: private */
-    public static boolean isInitDriver = false;
+    private static boolean isInitDriver = false;
     static final RemoteCallbackList<IEpsonServiceCallback> mCallbacks = new RemoteCallbackList<>();
-    /* access modifiers changed from: private */
-    public static final Object mCancelLock = new Object();
-    /* access modifiers changed from: private */
-    public static final Object mConnect = new Object();
-    /* access modifiers changed from: private */
-    public static final Object mLock = new Object();
-    /* access modifiers changed from: private */
-    public static final Object mLockPrintingStatus = new Object();
-    /* access modifiers changed from: private */
-    public static final Object mLockSearchingStatus = new Object();
-    /* access modifiers changed from: private */
-    public static final Object mPrinting = new Object();
+    private static final Object mCancelLock = new Object();
+    private static final Object mConnect = new Object();
+    private static final Object mLock = new Object();
+    private static final Object mLockPrintingStatus = new Object();
+    private static final Object mLockSearchingStatus = new Object();
+    private static final Object mPrinting = new Object();
     private final int EPS_ERR_PRINTER_NOT_SET = EscprError.EPS_ERR_PRINTER_NOT_SET;
     private final int EPS_PRNERR_COMM = 102;
     private final int EPS_PRNERR_NOERROR = 0;
     private final int EPS_PRNST_BUSY = 2;
     private final int EPS_PRNST_ERROR = 4;
     private final String TAG = "EpsonService";
-    /* access modifiers changed from: private */
-    public String accessKey = "";
-    /* access modifiers changed from: private */
-    public boolean bEnd;
-    /* access modifiers changed from: private */
-    public volatile boolean bPrinting = false;
-    /* access modifiers changed from: private */
-    public volatile boolean bSearching = false;
+    private String accessKey = "";
+    private boolean bEnd;
+    private volatile boolean bPrinting = false;
+    private volatile boolean bSearching = false;
     boolean bSetPrinter = false;
-    /* access modifiers changed from: private */
-    public String clientId = null;
+    private String clientId = null;
     public String debugString;
-    /* access modifiers changed from: private */
-    public EpsJobAttrib epsJobattrib = new EpsJobAttrib();
+    private EpsJobAttrib epsJobattrib = new EpsJobAttrib();
     /* access modifiers changed from: private */
 
     /* renamed from: id */
@@ -105,8 +91,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
 
     /* renamed from: ip */
     public String f407ip;
-    /* access modifiers changed from: private */
-    public final IEpsonService.Stub mBinder = new IEpsonService.Stub() {
+    private final IEpsonService.Stub mBinder = new IEpsonService.Stub() {
         EcClientLib mEcClientLib = new EcClientLib();
         boolean mEpsonConnectlogin;
         int mRemotePrintMaxFileSize = 0;
@@ -1048,11 +1033,9 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             EpsonService.this.updateLoginInfo();
         }
     };
-    /* access modifiers changed from: private */
-    public int mCreatetSheetIndex = 0;
+    private int mCreatetSheetIndex = 0;
     volatile EPImageCreator mEPImageCreator;
-    /* access modifiers changed from: private */
-    public final EscprLib mEscprLib = EscprLib.getInstance();
+    private final EscprLib mEscprLib = EscprLib.getInstance();
     Handler mHandler = new Handler(new Handler.Callback() {
         public boolean handleMessage(Message message) {
             int i = message.what;
@@ -1076,20 +1059,13 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             }
         }
     });
-    /* access modifiers changed from: private */
-    public LocalPrintThread mLocalPrintThread;
-    /* access modifiers changed from: private */
-    public volatile int mSearchCount = 0;
-    /* access modifiers changed from: private */
-    public String mailAddress = "";
-    /* access modifiers changed from: private */
-    public Thread printingThread = null;
-    /* access modifiers changed from: private */
-    public int probeMethod;
-    /* access modifiers changed from: private */
-    public SearchingThread searchingPrinter = null;
-    /* access modifiers changed from: private */
-    public int timeout_sec = -1;
+    private LocalPrintThread mLocalPrintThread;
+    private volatile int mSearchCount = 0;
+    private String mailAddress = "";
+    private Thread printingThread = null;
+    private int probeMethod;
+    private SearchingThread searchingPrinter = null;
+    private int timeout_sec = -1;
 
     static /* synthetic */ int access$504(EpsonService epsonService) {
         int i = epsonService.mSearchCount + 1;
@@ -1174,8 +1150,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         }
     }
 
-    /* access modifiers changed from: private */
-    public void updateLoginInfo() {
+    private void updateLoginInfo() {
         clearRemotePrinterInfo();
         this.clientId = SharedPreferencesProvider.getInstace(this).getString(epson.common.Constants.PRINTER_CLIENT_ID, (String) null);
         EpLog.d("▲clientId = " + this.clientId);
@@ -1189,8 +1164,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         new EPPrinterManager(getApplicationContext()).rollbackRemotePrinterInfo();
     }
 
-    /* access modifiers changed from: private */
-    public synchronized void createSearchingThread() {
+    private synchronized void createSearchingThread() {
         EPLog.e("Epson", "createSearchingThread() call");
         this.searchingPrinter = new SearchingThread();
     }
@@ -1376,20 +1350,17 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         }
     }
 
-    /* access modifiers changed from: private */
-    public void startLocalNonPdfPrintThread(PrintSetting.Kind kind, EPImageList ePImageList, boolean z) {
+    private void startLocalNonPdfPrintThread(PrintSetting.Kind kind, EPImageList ePImageList, boolean z) {
         this.mLocalPrintThread = new LocalPrintThread(this, new LegacyRenderingController(this, ePImageList, kind), z);
         this.mLocalPrintThread.start();
     }
 
-    /* access modifiers changed from: private */
-    public void startPdfPrintThread(String str, String str2, String str3, boolean z, int i, int i2, boolean z2) {
+    private void startPdfPrintThread(String str, String str2, String str3, boolean z, int i, int i2, boolean z2) {
         this.mLocalPrintThread = new LocalPrintThread(this, new PdfRenderingController(this, str, str2, str3, z, new int[]{i, i2}), z2);
         this.mLocalPrintThread.start();
     }
 
-    /* access modifiers changed from: private */
-    public synchronized int createECPrintingThread(final PrintSetting.Kind kind, final EPImageList ePImageList) {
+    private synchronized int createECPrintingThread(final PrintSetting.Kind kind, final EPImageList ePImageList) {
         this.printingThread = new Thread() {
             /*  JADX ERROR: IndexOutOfBoundsException in pass: RegionMakerVisitor
                 java.lang.IndexOutOfBoundsException: Index: 0, Size: 0