a

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

@@ -342,7 +342,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 if (r9 == 0) goto L_0x0274
                 java.lang.String r9 = "Epson"
                 java.lang.String r0 = "begin probe printer before printing"
-                epson.print.Util.EPLog.m307e((java.lang.String) r9, (java.lang.String) r0)     // Catch:{ RemoteException -> 0x026e }
+                epson.print.Util.EPLog.e((java.lang.String) r9, (java.lang.String) r0)     // Catch:{ RemoteException -> 0x026e }
                 com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x026e }
                 epson.print.MyPrinter r9 = epson.print.MyPrinter.getCurPrinter(r9)     // Catch:{ RemoteException -> 0x026e }
                 java.lang.String r0 = r9.getPrinterId()     // Catch:{ RemoteException -> 0x026e }
@@ -415,7 +415,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 if (r0 == 0) goto L_0x02da
                 java.lang.String r0 = "PrintProgress"
                 java.lang.String r4 = "message FINISH: mEpsonService.cancelSearchPrinter()"
-                epson.print.Util.EPLog.m307e((java.lang.String) r0, (java.lang.String) r4)     // Catch:{ all -> 0x031c }
+                epson.print.Util.EPLog.e((java.lang.String) r0, (java.lang.String) r4)     // Catch:{ all -> 0x031c }
                 epson.print.service.IEpsonService r0 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService     // Catch:{ all -> 0x031c }
                 r0.cancelSearchPrinter()     // Catch:{ all -> 0x031c }
                 r0 = 1
@@ -462,7 +462,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 if (r9 == 0) goto L_0x034d
                 java.lang.String r9 = "PrintProgress"
                 java.lang.String r0 = "message FINISH: mEpsonService.unregisterCallback() call"
-                epson.print.Util.EPLog.m307e((java.lang.String) r9, (java.lang.String) r0)     // Catch:{ RemoteException -> 0x0349 }
+                epson.print.Util.EPLog.e((java.lang.String) r9, (java.lang.String) r0)     // Catch:{ RemoteException -> 0x0349 }
                 epson.print.service.IEpsonService r9 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService     // Catch:{ RemoteException -> 0x0349 }
                 epson.print.service.IEpsonServiceCallback r0 = com.epson.cameracopy.ui.CameraPrintProgress.mCallback     // Catch:{ RemoteException -> 0x0349 }
                 r9.unregisterCallback(r0)     // Catch:{ RemoteException -> 0x0349 }
@@ -522,7 +522,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
             L_0x03ae:
                 java.lang.String r9 = "Epson"
                 java.lang.String r0 = "NOTIFY ERROR"
-                epson.print.Util.EPLog.m307e((java.lang.String) r9, (java.lang.String) r0)
+                epson.print.Util.EPLog.e((java.lang.String) r9, (java.lang.String) r0)
                 com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 boolean r9 = r9.isDialogOpen
                 if (r9 != 0) goto L_0x03d6
@@ -534,7 +534,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 int r1 = com.epson.cameracopy.ui.CameraPrintProgress.curError
                 r0.append(r1)
                 java.lang.String r0 = r0.toString()
-                epson.print.Util.EPLog.m307e((java.lang.String) r9, (java.lang.String) r0)
+                epson.print.Util.EPLog.e((java.lang.String) r9, (java.lang.String) r0)
                 goto L_0x03f3
             L_0x03d6:
                 java.lang.String r9 = "Epson"
@@ -545,7 +545,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 int r1 = com.epson.cameracopy.ui.CameraPrintProgress.curError
                 r0.append(r1)
                 java.lang.String r0 = r0.toString()
-                epson.print.Util.EPLog.m307e((java.lang.String) r9, (java.lang.String) r0)
+                epson.print.Util.EPLog.e((java.lang.String) r9, (java.lang.String) r0)
                 com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 r9.removeDialog(r7)
             L_0x03f3:
@@ -735,12 +735,12 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
     }
 
     /* JADX WARNING: Code restructure failed: missing block: B:10:0x000e, code lost:
-        epson.print.Util.EPLog.m307e("Epson", "mEpsonService = null");
+        epson.print.Util.EPLog.e("Epson", "mEpsonService = null");
         mCallback = new com.epson.cameracopy.ui.CameraPrintProgress.C08391(r3);
         mEpsonConnection = new com.epson.cameracopy.ui.CameraPrintProgress.C08442(r3);
-        epson.print.Util.EPLog.m307e("Epson", "bindService() call");
+        epson.print.Util.EPLog.e("Epson", "bindService() call");
         bindService(new android.content.Intent(r3, epson.print.service.EpsonService.class), mEpsonConnection, 1);
-        epson.print.Util.EPLog.m307e("Epson", "bindService() finish");
+        epson.print.Util.EPLog.e("Epson", "bindService() finish");
      */
     /* JADX WARNING: Code restructure failed: missing block: B:18:?, code lost:
         return;
@@ -767,7 +767,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
             if (r0 != 0) goto L_0x003e
             java.lang.String r0 = "Epson"
             java.lang.String r1 = "mEpsonService = null"
-            epson.print.Util.EPLog.m307e((java.lang.String) r0, (java.lang.String) r1)
+            epson.print.Util.EPLog.e((java.lang.String) r0, (java.lang.String) r1)
             com.epson.cameracopy.ui.CameraPrintProgress$1 r0 = new com.epson.cameracopy.ui.CameraPrintProgress$1
             r0.<init>()
             mCallback = r0
@@ -776,7 +776,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
             mEpsonConnection = r0
             java.lang.String r0 = "Epson"
             java.lang.String r1 = "bindService() call"
-            epson.print.Util.EPLog.m307e((java.lang.String) r0, (java.lang.String) r1)
+            epson.print.Util.EPLog.e((java.lang.String) r0, (java.lang.String) r1)
             android.content.Intent r0 = new android.content.Intent
             java.lang.Class<epson.print.service.EpsonService> r1 = epson.print.service.EpsonService.class
             r0.<init>(r3, r1)
@@ -785,7 +785,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
             r3.bindService(r0, r1, r2)
             java.lang.String r0 = "Epson"
             java.lang.String r1 = "bindService() finish"
-            epson.print.Util.EPLog.m307e((java.lang.String) r0, (java.lang.String) r1)
+            epson.print.Util.EPLog.e((java.lang.String) r0, (java.lang.String) r1)
         L_0x003e:
             return
         L_0x003f:
@@ -797,8 +797,8 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
     }
 
     protected void onCreate(Bundle bundle) {
-        EPLog.m307e("Epson", "PrintProgress.java: onCreate() call");
-        EPLog.m307e("Epson", "addFlags : FLAG_KEEP_SCREEN_ON ");
+        EPLog.e("Epson", "PrintProgress.java: onCreate() call");
+        EPLog.e("Epson", "addFlags : FLAG_KEEP_SCREEN_ON ");
         getWindow().addFlags(128);
         super.onCreate(bundle);
         Utils.setFInishOnTOuchOutside(this, false);
@@ -806,7 +806,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         curError = 0;
         mWaitEpsonServiceForFinish = false;
         synchronized (mLockInit) {
-            EPLog.m307e("Epson", "PrintProgress.java: onCreate() call init() funciton");
+            EPLog.e("Epson", "PrintProgress.java: onCreate() call init() funciton");
             init();
         }
         isDocument = getIntent().getExtras().getBoolean(PrintProgress.PARAM_DOCUMENT_MODE, false);
@@ -877,26 +877,26 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
 
     protected void onDestroy() {
         super.onDestroy();
-        EPLog.m307e("Epson", "PrintProgress.java: onDestroy()call");
-        EPLog.m307e("Epson", "clearFlags : FLAG_KEEP_SCREEN_ON ");
+        EPLog.e("Epson", "PrintProgress.java: onDestroy()call");
+        EPLog.e("Epson", "clearFlags : FLAG_KEEP_SCREEN_ON ");
         getWindow().clearFlags(128);
         mHandler.removeMessages(1);
         mHandler.removeMessages(3);
         mHandler.removeMessages(2);
         mHandler.removeMessages(4);
-        EPLog.m307e("Epson", "PrintProgress.java: onDestroy() finish");
+        EPLog.e("Epson", "PrintProgress.java: onDestroy() finish");
     }
 
     protected void onStop() {
         super.onStop();
         if (mEpsonService == null) {
-            EPLog.m307e("Epson", "set bRestartactivity = true (2)");
+            EPLog.e("Epson", "set bRestartactivity = true (2)");
         }
     }
 
     protected void onResume() {
         super.onResume();
-        EPLog.m307e("Epson", "PrintProgress.java call onResume()");
+        EPLog.e("Epson", "PrintProgress.java call onResume()");
         NfcTagUtils.enableForegroundDispatch(this, (IntentFilter[]) null, (String[][]) null);
     }
 
@@ -908,7 +908,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
     protected Dialog onCreateDialog(int i) {
         switch (i) {
             case 0:
-                EPLog.m307e("Epson", "show dialog: " + curError + " cancontinue: " + isContinue);
+                EPLog.e("Epson", "show dialog: " + curError + " cancontinue: " + isContinue);
                 removeDialog(1);
                 Integer[] stringId = MediaInfo.ErrorTable.getStringId(curError);
                 if (stringId == null) {
@@ -916,7 +916,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 }
                 String[] replaceMessage = Utils.replaceMessage(stringId, curError, getApplicationContext());
                 if (!isContinue) {
-                    EPLog.m307e("Epson", "show str_cancel button");
+                    EPLog.e("Epson", "show str_cancel button");
                     AlertDialog.Builder negativeButton = new CustomTitleAlertDialogBuilder(this).setCancelable(false).setTitle(replaceMessage[1]).setMessage(replaceMessage[0]).setNegativeButton(getString(R.string.str_cancel), new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
                             try {
@@ -924,7 +924,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                             } catch (RemoteException e) {
                                 e.printStackTrace();
                             }
-                            EPLog.m307e("Epson", "user click str_cancel button");
+                            EPLog.e("Epson", "user click str_cancel button");
                             CameraPrintProgress.curError = 0;
                             boolean unused = CameraPrintProgress.this.isDialogOpen = false;
                             CameraPrintProgress.this.removeDialog(0);
@@ -984,10 +984,10 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                     public void onClick(DialogInterface dialogInterface, int i) {
                         CameraPrintProgress.mHandler.removeMessages(1);
                         try {
-                            EPLog.m307e("Epson", "user choice cancel print from GUI");
+                            EPLog.e("Epson", "user choice cancel print from GUI");
                             if ((CameraPrintProgress.mEpsonService != null ? CameraPrintProgress.mEpsonService.confirmCancel(true) : 0) == 0) {
                                 synchronized (CameraPrintProgress.lockBCancel) {
-                                    EPLog.m307e("Epson", "===> set bCancel = true");
+                                    EPLog.e("Epson", "===> set bCancel = true");
                                 }
                             }
                         } catch (RemoteException e) {
@@ -1047,15 +1047,15 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
     }
 
     public void onBackPressed() {
-        EPLog.m307e("Epson", "onBackPressed()call");
+        EPLog.e("Epson", "onBackPressed()call");
     }
 
     public boolean onKeyDown(int i, KeyEvent keyEvent) {
-        EPLog.m307e("Epson", "onKeyDown() call");
+        EPLog.e("Epson", "onKeyDown() call");
         if (keyEvent.getAction() != 0 || i != 84) {
             return false;
         }
-        EPLog.m307e("Epson", "onKeyDown() KEYCODE_SEARCH key press");
+        EPLog.e("Epson", "onKeyDown() KEYCODE_SEARCH key press");
         return true;
     }
 

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

@@ -1215,7 +1215,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
 
     protected void onResume() {
         super.onResume();
-        EPLog.m307e("SettingScr", "onResume()");
+        EPLog.e("SettingScr", "onResume()");
         if (this.printerId != null && printerLocation == 1 && isRetryAfterConnectSimpleAp) {
             undoFlag = false;
             if (loadSupportedMediaFile()) {

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

@@ -685,7 +685,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
 
     public boolean onKeyDown(int i, KeyEvent keyEvent) {
         if (keyEvent.getAction() == 0 && i == 84) {
-            EPLog.m307e("key search", "diable");
+            EPLog.e("key search", "diable");
             return true;
         } else if (keyEvent.getAction() != 0 || i != 4) {
             return false;

app/src/main/java/com/epson/iprint/apf/ApfAdapter.java

@@ -99,8 +99,7 @@ public class ApfAdapter {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public boolean canUseApfResult(String str) {
+    protected boolean canUseApfResult(String str) {
         return new File(str).exists();
     }
 
@@ -168,8 +167,7 @@ public class ApfAdapter {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public File convertPngToBmp(String str) {
+    protected File convertPngToBmp(String str) {
         String png2jpeg = ImageUtil.png2jpeg(this.mApplicationContext, str, 1);
         if (png2jpeg == null) {
             return null;
@@ -190,8 +188,7 @@ public class ApfAdapter {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public File convertJpegToBmp(String str) {
+    protected File convertJpegToBmp(String str) {
         File file;
         File file2 = null;
         try {
@@ -240,8 +237,7 @@ public class ApfAdapter {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public String getTmpBmpFilename(String str, String str2) {
+    protected String getTmpBmpFilename(String str, String str2) {
         if (this.mApfImageDir == null) {
             return null;
         }

app/src/main/java/com/epson/iprint/apf/ApfPreviewView.java

@@ -5,7 +5,7 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+
 import com.epson.iprint.apf.ImageSizeConversionCache;
 import epson.print.EPImage;
 import epson.print.EPImageCreator;
@@ -138,8 +138,7 @@ public class ApfPreviewView implements PhotoPreview.PreviewBitmapMaker {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public Bitmap getBitmapConventionally(EPImage ePImage, String str, int i, int i2, int i3) {
+    protected Bitmap getBitmapConventionally(EPImage ePImage, String str, int i, int i2, int i3) {
         EPImage ePImage2 = new EPImage(str, 0);
         new EPImageCreator(IprintApplication.getInstance()).createPreviewImage(ePImage2, i, i2, i3, true);
         if (ePImage2.previewImageFileName == null) {

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

@@ -77,8 +77,7 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
     private DialogProgressViewModel mModelDialog;
     private Thread thread;
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         EPLog.i(LOG_TAG, "onCreate");
         super.onCreate(bundle);
         this.mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
@@ -353,8 +352,7 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         EPLog.i(LOG_TAG, "onActivityResult::requestCode = " + i + "/requestCode = " + i2);
         if (i == 10) {
@@ -412,8 +410,7 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
         finish();
     }
 
-    /* access modifiers changed from: protected */
-    public void onDestroy() {
+    protected void onDestroy() {
         super.onDestroy();
         ManagePreferences managePreferences = new ManagePreferences();
         if (managePreferences.getSavedFlag(getApplicationContext(), "PrintSetting") == 0) {

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

@@ -7,8 +7,7 @@ abstract class SharedParam implements Serializable {
     protected boolean isValid = false;
     protected String package_name = null;
 
-    /* access modifiers changed from: protected */
-    public abstract void setParam(Bundle bundle) throws SharedDataException;
+    protected abstract void setParam(Bundle bundle) throws SharedDataException;
 
     SharedParam() {
     }

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

@@ -26,8 +26,7 @@ public class SharedParamPhoto extends SharedParam implements Serializable {
         return super.isAvailable();
     }
 
-    /* access modifiers changed from: protected */
-    public void setParam(Bundle bundle) throws SharedDataException {
+    protected void setParam(Bundle bundle) throws SharedDataException {
         this.file_type = bundle.getInt("FILE_TYPE", 2);
         int i = this.file_type;
         if (i < 0 || i > 4) {

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

@@ -24,8 +24,7 @@ public class SharedParamScan extends SharedParam implements Serializable {
         return super.isAvailable();
     }
 
-    /* access modifiers changed from: protected */
-    public void setParam(Bundle bundle) throws SharedDataException {
+    protected void setParam(Bundle bundle) throws SharedDataException {
         this.scan_type = bundle.getInt("SCAN_TYPE");
         int i = this.scan_type;
         if (i < 1 || i > 3) {

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

@@ -3,7 +3,7 @@ package com.epson.iprint.storage;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+
 
 
 import android.support.p003v7.app.AlertDialog;

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

@@ -2,8 +2,8 @@ package com.epson.iprint.storage;
 
 import android.app.Dialog;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 
 import android.support.p000v4.app.FragmentManager;
 import android.view.KeyEvent;

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

@@ -1,6 +1,6 @@
 package com.epson.iprint.storage;
 
-import android.support.annotation.NonNull;
+
 import com.epson.iprint.storage.gdrivev3.ActivityWrapper;
 import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
 import epson.common.Utils;

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

@@ -4,8 +4,8 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 
 
 import epson.print.R;

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

@@ -28,8 +28,7 @@ class StorageActivity extends ActivityIACommon {
     StorageActivity() {
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         StorageSecureStore.initSharedSecureStore(getApplicationContext());
     }
@@ -119,8 +118,7 @@ class StorageActivity extends ActivityIACommon {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void showErrorDialog(String str) {
+    protected void showErrorDialog(String str) {
         showErrorDialog(str, (Intent) null);
     }
 

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

@@ -48,14 +48,12 @@ public abstract class StorageProcessActivity extends StorageActivity {
         intent.putExtra(StorageServiceNameKey, str);
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         init();
     }
 
-    /* access modifiers changed from: protected */
-    public void onStart() {
+    protected void onStart() {
         super.onStart();
         updateSignInStatus();
         if (this.mStorageServiceClient.isSignedIn(this)) {
@@ -63,8 +61,7 @@ public abstract class StorageProcessActivity extends StorageActivity {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         updateSignInStatus();
     }

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

@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -55,8 +55,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
     public PrintLog mPrintLog;
     AsyncTaskExecutor<Void, Void, Void> task = null;
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView((int) R.layout.folder_content_layout);
         setActionBar(getStorageClient().getStorageServiceName(this), true);
@@ -105,8 +104,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onStop() {
+    protected void onStop() {
         super.onStop();
         if (this.mIsDownloading && Build.VERSION.SDK_INT >= 29) {
             this.mIsDownloadInterruption = true;
@@ -114,8 +112,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onRestart() {
+    protected void onRestart() {
         super.onRestart();
         if (this.mIsDownloadInterruption && !this.mIsDownloading) {
             itemClick(this.mPosition);
@@ -137,8 +134,7 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         showConnectionError();
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         if (i == 0) {
             String fetchDownloadedFilePath = fetchDownloadedFilePath();
             if (fetchDownloadedFilePath != null) {
@@ -153,13 +149,11 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         String localPath = null;
         StorageActivity.OverlayProgress progress = null;
 
-        /* access modifiers changed from: protected */
-        public void onPreExecute() {
+        protected void onPreExecute() {
             StorageProcessDownloadActivity.this.taskInvoked(true);
         }
 
-        /* access modifiers changed from: protected */
-        public Void doInBackground(Void... voidArr) {
+        protected Void doInBackground(Void... voidArr) {
             final StorageServiceClient.Downloader downloader = StorageProcessDownloadActivity.this.getStorageClient().getDownloader(StorageProcessDownloadActivity.this, this.item, this.localPath);
             C09241 r0 = downloader.isCancelable() ? new StorageActivity.CancelRequestCallback() {
                 public void onCancelRequest(Intent intent) {
@@ -292,13 +286,11 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
         };
         StorageActivity.OverlayProgress progress = new StorageActivity.OverlayProgress();
 
-        /* access modifiers changed from: protected */
-        public void onPreExecute() {
+        protected void onPreExecute() {
             StorageProcessDownloadActivity.this.taskInvoked(true);
         }
 
-        /* access modifiers changed from: protected */
-        public Void doInBackground(Void... voidArr) {
+        protected Void doInBackground(Void... voidArr) {
             boolean isNeedSignin = StorageProcessDownloadActivity.this.getStorageClient().isNeedSignin();
             if (!isNeedSignin) {
                 this.progress.show();
@@ -387,10 +379,10 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
                 switch (storageItem.type) {
                     case DIRECTORY:
                         if (!storageItem.name.equals("..")) {
-                            setViewComponents(view2, storageItem.name, R.C2136drawable.folder, R.C2136drawable.more);
+                            setViewComponents(view2, storageItem.name, R.drawable.folder, R.drawable.more);
                             break;
                         } else {
-                            setViewComponents(view2, storageItem.name, R.C2136drawable.parent_folder, R.C2136drawable.more);
+                            setViewComponents(view2, storageItem.name, R.drawable.parent_folder, R.drawable.more);
                             break;
                         }
                     case LOADMORE:
@@ -401,10 +393,10 @@ public class StorageProcessDownloadActivity extends StorageProcessActivity {
                         setViewComponents(view2, str, -12345, -12345);
                         break;
                     case FILE:
-                        setViewComponents(view2, storageItem.name, R.C2136drawable.file, -12345);
+                        setViewComponents(view2, storageItem.name, R.drawable.file, -12345);
                         break;
                     case PHOTO:
-                        setViewComponents(view2, storageItem.name, R.C2136drawable.image, -12345);
+                        setViewComponents(view2, storageItem.name, R.drawable.image, -12345);
                         StorageProcessDownloadActivity.this.getEnumerator().setThumbnailInBackground(storageItem, getIconView(view2));
                         break;
                 }

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

@@ -36,8 +36,7 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
     private void onUpdateProcessView() {
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         String string;
         super.onCreate(bundle);
         setContentView((int) R.layout.folder_content_layout_for_upload);
@@ -77,15 +76,13 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onSaveInstanceState(Bundle bundle) {
+    protected void onSaveInstanceState(Bundle bundle) {
         super.onSaveInstanceState(bundle);
         this.mUploadFilename = getFilename();
         bundle.putString("Upload.Editing.Filename", this.mUploadFilename);
     }
 
-    /* access modifiers changed from: protected */
-    public void onRestoreInstanceState(Bundle bundle) {
+    protected void onRestoreInstanceState(Bundle bundle) {
         super.onRestoreInstanceState(bundle);
         this.mUploadFilename = bundle.getString("Upload.Editing.Filename");
     }
@@ -108,8 +105,7 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
         UploadTask() {
         }
 
-        /* access modifiers changed from: protected */
-        public Void doInBackground(Void... voidArr) {
+        protected Void doInBackground(Void... voidArr) {
             final ReentrantLock reentrantLock;
             final StorageActivity.OverlayProgress overlayProgress = new StorageActivity.OverlayProgress();
             overlayProgress.show(StorageProcessUploadActivity.this.getString(R.string.uploading_notification), new StorageActivity.CancelRequestCallback() {

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

@@ -2,7 +2,7 @@ package com.epson.iprint.storage;
 
 import android.app.Activity;
 import android.content.Context;
-import android.support.annotation.Nullable;
+
 import android.widget.ImageView;
 import com.epson.iprint.storage.box.BoxNetClient;
 import com.epson.iprint.storage.dropbox.DropboxV2Client;
@@ -59,8 +59,7 @@ public abstract class StorageServiceClient {
 
     public abstract Uploader getUploader(Context context, UploadFileType uploadFileType, String str, String str2);
 
-    /* access modifiers changed from: protected */
-    public boolean isNeedSignin() {
+    protected boolean isNeedSignin() {
         return false;
     }
 
@@ -131,8 +130,7 @@ public abstract class StorageServiceClient {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public boolean isValidUploadName(String str) {
+    protected boolean isValidUploadName(String str) {
         try {
             byte[] bytes = str.getBytes(CharEncoding.UTF_8);
             if (bytes != null) {
@@ -149,8 +147,7 @@ public abstract class StorageServiceClient {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public boolean isPrintableFileTypes(StorageItem storageItem) {
+    protected boolean isPrintableFileTypes(StorageItem storageItem) {
         return isPrintableFilename(storageItem.name);
     }
 
@@ -161,8 +158,7 @@ public abstract class StorageServiceClient {
         return Utils.isPhotoFile(str) || StorageItem.endsWith(str, CommonDefine.FileType_PDF) || Utils.isGConvertFile(str);
     }
 
-    /* access modifiers changed from: protected */
-    public String getDownloadLocalPath(Context context, StorageItem storageItem) {
+    protected String getDownloadLocalPath(Context context, StorageItem storageItem) {
         return storageItem.getDownloadLocalPath(context);
     }
 }

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

@@ -32,8 +32,7 @@ public abstract class StorageSignInActivity extends StorageActivity {
 
     public abstract BasicSignIn getBasicSignIn();
 
-    /* access modifiers changed from: protected */
-    public int getMaxLengthPassword() {
+    protected int getMaxLengthPassword() {
         return 256;
     }
 
@@ -66,8 +65,7 @@ public abstract class StorageSignInActivity extends StorageActivity {
         return intent;
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         BasicSignIn basicSignIn = getBasicSignIn();
         if (basicSignIn != null) {
@@ -75,8 +73,7 @@ public abstract class StorageSignInActivity extends StorageActivity {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onDestroy() {
+    protected void onDestroy() {
         StorageActivity.OverlayProgress overlayProgress = this.mProgressUntilOnDestroy;
         if (overlayProgress != null) {
             overlayProgress.dismiss();
@@ -85,8 +82,7 @@ public abstract class StorageSignInActivity extends StorageActivity {
         super.onDestroy();
     }
 
-    /* access modifiers changed from: protected */
-    public void onInitBasicSignIn(BasicSignIn basicSignIn) {
+    protected void onInitBasicSignIn(BasicSignIn basicSignIn) {
         this.mBasicSignIn = basicSignIn;
         setContentView((int) R.layout.login_screen_layout);
         setActionBar(getIntent().getStringExtra(EXTRA_SERVER_NAME), true);
@@ -96,13 +92,11 @@ public abstract class StorageSignInActivity extends StorageActivity {
         bindClearButton(R.id.login_password_content, R.id.clear_password_btn);
     }
 
-    /* access modifiers changed from: protected */
-    public void showLoginError() {
+    protected void showLoginError() {
         showErrorDialog((int) R.string.authenticate_error_mes);
     }
 
-    /* access modifiers changed from: protected */
-    public void showLoginErrorAndFinish() {
+    protected void showLoginErrorAndFinish() {
         showErrorDialogAndFinish(getString(R.string.authenticate_error_mes));
     }
 
@@ -116,15 +110,13 @@ public abstract class StorageSignInActivity extends StorageActivity {
             this.mPassword = ((EditText) StorageSignInActivity.this.findViewById(R.id.login_password_content)).getText().toString();
         }
 
-        /* access modifiers changed from: protected */
-        public Boolean doInBackground(Void... voidArr) {
+        protected Boolean doInBackground(Void... voidArr) {
             this.progress = new StorageActivity.OverlayProgress();
             this.progress.show();
             return Boolean.valueOf(StorageSignInActivity.this.mBasicSignIn.signInBackground(this.mUserName, this.mPassword));
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(Boolean bool) {
+        protected void onPostExecute(Boolean bool) {
             if (!bool.booleanValue()) {
                 StorageSignInActivity.this.showLoginError();
                 this.progress.dismiss();

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

@@ -31,8 +31,7 @@ public class StorageWaitingActivity extends Activity {
     public void onBackPressed() {
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView(R.layout.storage_progress);
         Intent intent = getIntent();
@@ -41,8 +40,7 @@ public class StorageWaitingActivity extends Activity {
         setCancelRequest(intent);
     }
 
-    /* access modifiers changed from: protected */
-    public void onDestroy() {
+    protected void onDestroy() {
         unregisterReceiver(this.mBroadcastReceiver);
         super.onDestroy();
     }
@@ -119,14 +117,12 @@ public class StorageWaitingActivity extends Activity {
         this.mMessageText.setVisibility(8);
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         bShowing = true;
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
         bShowing = false;
     }

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

@@ -13,8 +13,7 @@ import java.util.concurrent.ConcurrentHashMap;
 public class BoxAuthStorage extends BoxAuthentication.AuthStorage {
     private static final String SECURE_STORE_KEY = "FolderViewer.BOXNET_AUTO_INFO_V4";
 
-    /* access modifiers changed from: protected */
-    public void storeAuthInfoMap(Map<String, BoxAuthentication.BoxAuthenticationInfo> map, Context context) {
+    protected void storeAuthInfoMap(Map<String, BoxAuthentication.BoxAuthenticationInfo> map, Context context) {
         JsonObject jsonObject = new JsonObject();
         for (Map.Entry next : map.entrySet()) {
             jsonObject.add((String) next.getKey(), (JsonValue) ((BoxAuthentication.BoxAuthenticationInfo) next.getValue()).toJsonObject());
@@ -22,13 +21,11 @@ public class BoxAuthStorage extends BoxAuthentication.AuthStorage {
         StorageSecureStore.getSharedSecureStore().put("FolderViewer.BOXNET_AUTO_INFO_V4", new BoxEntity(jsonObject).toJson(), StorageSecureStore.EXEC_MODE.OVERWRITE_IF_EXIST);
     }
 
-    /* access modifiers changed from: protected */
-    public void clearAuthInfoMap(Context context) {
+    protected void clearAuthInfoMap(Context context) {
         StorageSecureStore.getSharedSecureStore().revoke("FolderViewer.BOXNET_AUTO_INFO_V4");
     }
 
-    /* access modifiers changed from: protected */
-    public void storeLastAuthenticatedUserId(String str, Context context) {
+    protected void storeLastAuthenticatedUserId(String str, Context context) {
         StorageSecureStore sharedSecureStore = StorageSecureStore.getSharedSecureStore();
         if (str == null || str.isEmpty()) {
             sharedSecureStore.revoke(Define.BOXNET_LAST_AUTHENTICATED_USER_ID);
@@ -37,13 +34,11 @@ public class BoxAuthStorage extends BoxAuthentication.AuthStorage {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public String getLastAuthentictedUserId(Context context) {
+    protected String getLastAuthentictedUserId(Context context) {
         return StorageSecureStore.getSharedSecureStore().fetch(Define.BOXNET_LAST_AUTHENTICATED_USER_ID);
     }
 
-    /* access modifiers changed from: protected */
-    public ConcurrentHashMap<String, BoxAuthentication.BoxAuthenticationInfo> loadAuthInfoMap(Context context) {
+    protected ConcurrentHashMap<String, BoxAuthentication.BoxAuthenticationInfo> loadAuthInfoMap(Context context) {
         ConcurrentHashMap<String, BoxAuthentication.BoxAuthenticationInfo> concurrentHashMap = new ConcurrentHashMap<>();
         String fetch = StorageSecureStore.getSharedSecureStore().fetch("FolderViewer.BOXNET_AUTO_INFO_V4");
         if (fetch != null && fetch.length() > 0) {

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

@@ -2,8 +2,8 @@ package com.epson.iprint.storage.box;
 
 import android.app.Activity;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 import com.box.androidsdk.content.BoxApiFile;
 import com.box.androidsdk.content.BoxApiFolder;
 import com.box.androidsdk.content.BoxApiSearch;

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

@@ -5,8 +5,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 import com.box.androidsdk.content.auth.BoxAuthentication;
 import com.epson.iprint.storage.StorageSignInActivity;
 import epson.print.R;
@@ -31,8 +31,7 @@ public class BoxNetSignInActivity extends StorageSignInActivity implements BoxAu
         return intent;
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         this.mModeLogout = getMode(getIntent());
         if (this.mModeLogout) {
@@ -92,8 +91,7 @@ public class BoxNetSignInActivity extends StorageSignInActivity implements BoxAu
             this.mBoxNetClient = boxNetClient;
         }
 
-        /* access modifiers changed from: protected */
-        public Void doInBackground(Void... voidArr) {
+        protected Void doInBackground(Void... voidArr) {
             this.mBoxNetClient.boxLogout();
             return null;
         }

app/src/main/java/com/epson/iprint/storage/dropbox/DropboxV2Adapter.java

@@ -1,8 +1,8 @@
 package com.epson.iprint.storage.dropbox;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 import com.dropbox.core.android.Auth;
 import com.dropbox.core.p005v2.DbxClientV2;
 import com.epson.iprint.storage.SecureKeyStore;

app/src/main/java/com/epson/iprint/storage/dropbox/DropboxV2Client.java

@@ -3,8 +3,8 @@ package com.epson.iprint.storage.dropbox;
 import android.app.Activity;
 import android.content.Context;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 import android.widget.ImageView;
 import com.dropbox.core.DbxException;
 import com.dropbox.core.p005v2.DbxClientV2;
@@ -50,8 +50,7 @@ public class DropboxV2Client extends StorageServiceClient {
         return DropboxV2Adapter.hasToken(context);
     }
 
-    /* access modifiers changed from: protected */
-    public boolean isValidUploadName(String str) {
+    protected boolean isValidUploadName(String str) {
         if (str.startsWith(CommonDefine.DOT)) {
             return false;
         }
@@ -165,8 +164,7 @@ public class DropboxV2Client extends StorageServiceClient {
             this.mDownloadCompletion = downloadCompletion;
         }
 
-        /* access modifiers changed from: protected */
-        public Void doInBackground(Object... objArr) {
+        protected Void doInBackground(Object... objArr) {
             String str;
             StorageItem storageItem;
             try {

app/src/main/java/com/epson/iprint/storage/dropbox/DropboxV2SignInActivity.java

@@ -14,8 +14,7 @@ public class DropboxV2SignInActivity extends StorageSignInActivity {
         return null;
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
     }
 
@@ -24,8 +23,7 @@ public class DropboxV2SignInActivity extends StorageSignInActivity {
         DropboxV2Adapter.startAuthentication(this);
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         if (!this.mAuthActivityStarted) {
             startAuthActivity();
@@ -39,8 +37,7 @@ public class DropboxV2SignInActivity extends StorageSignInActivity {
         Task() {
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(Boolean bool) {
+        protected void onPostExecute(Boolean bool) {
             if (bool == null || !bool.booleanValue()) {
                 DropboxV2SignInActivity.this.showLoginErrorAndFinish();
             } else {
@@ -48,8 +45,7 @@ public class DropboxV2SignInActivity extends StorageSignInActivity {
             }
         }
 
-        /* access modifiers changed from: protected */
-        public Boolean doInBackground(Void... voidArr) {
+        protected Boolean doInBackground(Void... voidArr) {
             DropboxV2Adapter.getTokenAndInitClient(DropboxV2SignInActivity.this.getApplicationContext());
             DbxClientV2 client = DropboxV2Adapter.getClient();
             if (client == null) {

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

@@ -64,8 +64,7 @@ public class EvernoteClient extends StorageServiceClient {
                 UploadTask() {
                 }
 
-                /* access modifiers changed from: protected */
-                public Void doInBackground(Void... voidArr) {
+                protected Void doInBackground(Void... voidArr) {
                     StorageServiceClient.ProcessError processError;
                     StorageServiceClient.ProcessError processError2 = StorageServiceClient.ProcessError.NONE;
                     do {
@@ -110,8 +109,7 @@ public class EvernoteClient extends StorageServiceClient {
                 DownloadTask() {
                 }
 
-                /* access modifiers changed from: protected */
-                public Void doInBackground(Void... voidArr) {
+                protected Void doInBackground(Void... voidArr) {
                     StorageServiceClient.ProcessError processError;
                     StorageServiceClient.ProcessError processError2 = StorageServiceClient.ProcessError.NONE;
                     do {
@@ -157,8 +155,7 @@ public class EvernoteClient extends StorageServiceClient {
                 EnumerateTask() {
                 }
 
-                /* access modifiers changed from: protected */
-                public Void doInBackground(StorageItem... storageItemArr) {
+                protected Void doInBackground(StorageItem... storageItemArr) {
                     StorageServiceClient.ProcessError processError;
                     StorageServiceClient.ProcessError processError2 = StorageServiceClient.ProcessError.NONE;
                     StorageItem storageItem = storageItemArr[0];

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

@@ -201,13 +201,13 @@ public class EvernoteRequest {
     }
 
     public StorageServiceClient.ProcessError handleException(Exception exc) {
-        EPLog.m307e(TAG, "handleException");
+        EPLog.e(TAG, "handleException");
         String message = exc.getMessage();
         if (message == null && exc.getCause() != null) {
             message = exc.getCause().getMessage();
         }
         if (message != null) {
-            EPLog.m307e(TAG, message);
+            EPLog.e(TAG, message);
         }
         EvernoteClient.logout(this.mContext);
         return StorageServiceClient.ProcessError.ERROR;

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

@@ -14,8 +14,7 @@ public class EvernoteSignInActivity extends StorageSignInActivity {
         return null;
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         EvernoteClient.getEvernoteSession(this).authenticate((Activity) this);
     }
@@ -31,8 +30,7 @@ public class EvernoteSignInActivity extends StorageSignInActivity {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onDestroy() {
+    protected void onDestroy() {
         super.onDestroy();
     }
 

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

@@ -2,7 +2,7 @@ package com.epson.iprint.storage.gdrivev3;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.support.annotation.NonNull;
+
 import com.epson.iprint.storage.gdrivev3.IprintGoogleSignIn;
 
 public interface ActivityWrapper {

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

@@ -1,6 +1,6 @@
 package com.epson.iprint.storage.gdrivev3;
 
-import android.support.annotation.Nullable;
+
 
 public class DownloadFile implements OnlineFile {
     private final String mMimeType;

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

@@ -3,8 +3,8 @@ package com.epson.iprint.storage.gdrivev3;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 
 import epson.common.ExternalFileUtils;
 import epson.common.Utils;
@@ -33,8 +33,7 @@ public class DownloadTask extends AsyncTask<OnlineFile, Void, OnlineFile> implem
         this.mDownloadFile = null;
     }
 
-    /* access modifiers changed from: protected */
-    public OnlineFile doInBackground(OnlineFile... onlineFileArr) {
+    protected OnlineFile doInBackground(OnlineFile... onlineFileArr) {
         GoogleDriveFile googleDriveFile;
         if (onlineFileArr == null || (googleDriveFile = onlineFileArr[0]) == null) {
             return null;
@@ -76,8 +75,7 @@ public class DownloadTask extends AsyncTask<OnlineFile, Void, OnlineFile> implem
         return mimeExt != null ? mimeExt : "";
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostExecute(OnlineFile onlineFile) {
+    protected void onPostExecute(OnlineFile onlineFile) {
         if (this.mDownloadCancelled) {
             this.mDownloadCompleteListener.onDownloadComplete(false, (String) null);
         }
@@ -95,8 +93,7 @@ public class DownloadTask extends AsyncTask<OnlineFile, Void, OnlineFile> implem
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onCancelled() {
+    protected void onCancelled() {
         deleteDownloadFile();
         this.mDownloadCompleteListener.onDownloadComplete(false, (String) null);
     }

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

@@ -1,7 +1,7 @@
 package com.epson.iprint.storage.gdrivev3;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 import com.epson.iprint.storage.gdrivev3.DownloadTask;
 import com.epson.iprint.storage.gdrivev3.DriveListTask;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;

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

@@ -1,8 +1,8 @@
 package com.epson.iprint.storage.gdrivev3;
 
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 import java.util.ArrayList;
 import java.util.Iterator;
 
@@ -20,8 +20,7 @@ public class DriveListTask extends AsyncTask<OnlineFile, Void, ArrayList<OnlineF
         this.mListTaskCompleteListener = listTaskCompleteListener;
     }
 
-    /* access modifiers changed from: protected */
-    public ArrayList<OnlineFile> doInBackground(OnlineFile... onlineFileArr) {
+    protected ArrayList<OnlineFile> doInBackground(OnlineFile... onlineFileArr) {
         try {
             return filterFiles(this.mMyDrive.listFile(onlineFileArr != null ? onlineFileArr[0] : null));
         } catch (Exception e) {
@@ -31,8 +30,7 @@ public class DriveListTask extends AsyncTask<OnlineFile, Void, ArrayList<OnlineF
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostExecute(ArrayList<OnlineFile> arrayList) {
+    protected void onPostExecute(ArrayList<OnlineFile> arrayList) {
         this.mListTaskCompleteListener.listComplete(arrayList);
     }
 

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

@@ -1,8 +1,8 @@
 package com.epson.iprint.storage.gdrivev3;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.api.client.extensions.android.http.AndroidHttp;
 import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential;

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

@@ -1,7 +1,7 @@
 package com.epson.iprint.storage.gdrivev3;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
 
 import android.view.LayoutInflater;
 import android.view.View;
@@ -53,10 +53,10 @@ public class FileListAdapter extends BaseAdapter {
         }
         OnlineFile onlineFile = this.mDriveFiles.get(i);
         String name = onlineFile.getName();
-        int i3 = R.C2136drawable.file;
+        int i3 = R.drawable.file;
         if (onlineFile.isFolder()) {
-            i3 = onlineFile instanceof ParentFolder ? R.C2136drawable.parent_folder : R.C2136drawable.folder;
-            i2 = R.C2136drawable.more;
+            i3 = onlineFile instanceof ParentFolder ? R.drawable.parent_folder : R.drawable.folder;
+            i2 = R.drawable.more;
         } else {
             i2 = 0;
         }

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

@@ -1,7 +1,7 @@
 package com.epson.iprint.storage.gdrivev3;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 import java.util.ArrayList;
 
 public interface GoogleDownloadContract {

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

@@ -1,7 +1,7 @@
 package com.epson.iprint.storage.gdrivev3;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 import com.epson.iprint.storage.Network;
 import com.epson.iprint.storage.gdrivev3.DownloadTask;
 import com.epson.iprint.storage.gdrivev3.DriveListTask;

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

@@ -3,8 +3,8 @@ package com.epson.iprint.storage.gdrivev3;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 import com.epson.iprint.storage.gdrivev3.DownloadTask;
 import com.epson.iprint.storage.gdrivev3.DriveListTask;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;

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

@@ -1,7 +1,7 @@
 package com.epson.iprint.storage.gdrivev3;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 import com.epson.iprint.storage.StorageServiceClient;
 import com.google.api.services.drive.model.File;
 import java.util.HashSet;

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

@@ -3,7 +3,7 @@ package com.epson.iprint.storage.gdrivev3;
 import android.app.Activity;
 import android.content.Context;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
+
 import com.epson.iprint.storage.StorageItem;
 import com.epson.iprint.storage.StorageServiceClient;
 import com.epson.iprint.storage.gdrivev3.IprintGoogleSignIn;
@@ -87,8 +87,7 @@ public class GoogleV3UploadClient extends StorageServiceClient {
             this.mUploadNotifier = uploadCompletion;
         }
 
-        /* access modifiers changed from: protected */
-        public Void doInBackground(UploadInfo... uploadInfoArr) {
+        protected Void doInBackground(UploadInfo... uploadInfoArr) {
             if (uploadInfoArr == null || uploadInfoArr[0] == null) {
                 this.mUploadNotifier.onUploadComplete((String) null, (String) null, StorageServiceClient.ProcessError.ERROR);
                 return null;

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

@@ -4,8 +4,8 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -64,8 +64,7 @@ public class GoogleV3UploadSignInActivity extends AppCompatActivity implements A
         return intent;
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         this.mPlayServiceDialogManager = new PlayServiceDialogManager();
         this.mMisc = new Network();
@@ -91,8 +90,7 @@ public class GoogleV3UploadSignInActivity extends AppCompatActivity implements A
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostResume() {
+    protected void onPostResume() {
         super.onPostResume();
         this.mMisc.selectSimpleAp(this, false);
         this.mActivityForeground = true;
@@ -121,8 +119,7 @@ public class GoogleV3UploadSignInActivity extends AppCompatActivity implements A
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
         this.mPlayServiceDialogManager.onActivityPaused();
         this.mActivityForeground = false;
@@ -166,8 +163,7 @@ public class GoogleV3UploadSignInActivity extends AppCompatActivity implements A
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         switch (i) {
             case 10:
                 IprintGoogleSignIn.StartActivityResultCallback startActivityResultCallback = this.mSignInStartActivityCallback;

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

@@ -1,7 +1,7 @@
 package com.epson.iprint.storage.gdrivev3;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 import com.epson.iprint.storage.Network;
 import com.epson.iprint.storage.gdrivev3.GoogleDownloadContract;
 

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

@@ -3,8 +3,8 @@ package com.epson.iprint.storage.gdrivev3;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 import com.google.android.gms.auth.api.signin.GoogleSignIn;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.auth.api.signin.GoogleSignInClient;

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

@@ -5,8 +5,8 @@ import android.content.Intent;
 import android.graphics.Typeface;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+
 
 import android.support.p000v4.app.Fragment;
 import android.support.p000v4.app.FragmentManager;
@@ -70,8 +70,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         return 13;
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView((int) R.layout.activity_list_and_download);
         setActionBar(getString(R.string.google_drive), true);
@@ -158,8 +157,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         return true;
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         switch (i) {
             case 10:
                 IprintGoogleSignIn.StartActivityResultCallback startActivityResultCallback = this.mSignInStartActivityCallback;
@@ -182,8 +180,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostResume() {
+    protected void onPostResume() {
         super.onPostResume();
         this.mActivityForeground = true;
         processForegroundList();
@@ -198,8 +195,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
         this.mGoogleDownloadPresenter.activityOnPause();
         this.mActivityForeground = false;
@@ -343,8 +339,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         this.mGoogleDownloadPresenter.cancelDownload();
     }
 
-    /* access modifiers changed from: protected */
-    public void onStop() {
+    protected void onStop() {
         super.onStop();
         if (!this.mGoogleDownloadPresenter.isDownloading() || Build.VERSION.SDK_INT < 29) {
             this.mIsDownloadInterruption = false;
@@ -354,8 +349,7 @@ public class ListAndDownloadActivity extends ActivityIACommon implements Activit
         cancel();
     }
 
-    /* access modifiers changed from: protected */
-    public void onRestart() {
+    protected void onRestart() {
         super.onRestart();
         if (this.mIsDownloadInterruption) {
             localOnItemClick(this.mPosition);

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

@@ -1,6 +1,6 @@
 package com.epson.iprint.storage.gdrivev3;
 
-import android.support.annotation.Nullable;
+
 
 public interface OnlineFile {
     @Nullable

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

@@ -1,6 +1,6 @@
 package com.epson.iprint.storage.gdrivev3;
 
-import android.support.annotation.Nullable;
+
 
 public class ParentFolder implements OnlineFile {
     @Nullable

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

@@ -3,7 +3,7 @@ package com.epson.iprint.storage.gdrivev3;
 import android.app.Activity;
 import android.app.Dialog;
 import android.content.DialogInterface;
-import android.support.annotation.NonNull;
+
 import com.google.android.gms.common.GoogleApiAvailability;
 
 public class PlayServiceDialogManager {

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

@@ -3,7 +3,7 @@ package com.epson.iprint.storage.onedrive;
 import android.app.Activity;
 import android.content.Context;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
+
 import android.support.p000v4.app.NotificationCompat;
 import com.box.androidsdk.content.models.BoxRepresentation;
 import com.epson.iprint.storage.StorageItem;
@@ -53,8 +53,7 @@ public class OneDriveClient extends StorageServiceClient {
         void onNotifyOneDriveClientCollectionPage(List<StorageItem> list);
     }
 
-    /* access modifiers changed from: protected */
-    public boolean isNeedSignin() {
+    protected boolean isNeedSignin() {
         return true;
     }
 

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

@@ -12,8 +12,7 @@ public class OneDriveSignInActivity extends StorageSignInActivity {
         return null;
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         if (!this.mAuthActivityStarted) {
             OneDriveAuthenticator.getOneDriveClient(this, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {

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

@@ -16,15 +16,13 @@ public class OneDriveStorageProcessUploadActivity extends StorageProcessUploadAc
     /* access modifiers changed from: private */
     public OneDriveClient mStorageServiceClient;
 
-    /* access modifiers changed from: protected */
-    public void onStart() {
+    protected void onStart() {
         super.onStart();
         this.mExpired = false;
         checkSession();
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         this.mExpired = false;
         OneDriveClient oneDriveClient = this.mStorageServiceClient;

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

@@ -38,7 +38,7 @@ public class AltViewImageAdapter extends BaseAdapter implements CommonDefine {
         try {
             mSelectPictureBitmap = BitmapFactory.decodeResource(mContext.getResources(), R.drawable.select_picture, options);
         } catch (OutOfMemoryError e) {
-            EPLog.m307e(TAG, "BitmapFactory.decodeResource Error " + e.getMessage());
+            EPLog.e(TAG, "BitmapFactory.decodeResource Error " + e.getMessage());
         }
     }
 
@@ -102,7 +102,7 @@ public class AltViewImageAdapter extends BaseAdapter implements CommonDefine {
                         imageView3.setBackground((Drawable) null);
                         imageView3.setImageBitmap(mSelectPictureBitmap);
                     } catch (OutOfMemoryError e3) {
-                        EPLog.m307e(TAG, "setImageBitmap Error" + e3.getMessage());
+                        EPLog.e(TAG, "setImageBitmap Error" + e3.getMessage());
                         System.runFinalization();
                         System.gc();
                     }

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

@@ -77,7 +77,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
                             case 3:
                                 break;
                             default:
-                                EPLog.m307e(MemcardImageGrid.LOG_TAG, "unkown AsyncTask.getStatus() value");
+                                EPLog.e(MemcardImageGrid.LOG_TAG, "unkown AsyncTask.getStatus() value");
                                 return;
                         }
                     } else {
@@ -305,7 +305,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
             mHandler.sendEmptyMessage(1);
         } catch (InterruptedException e) {
             e.printStackTrace();
-            EPLog.m307e(LOG_TAG, "queue.put() error in chengeTargetDirectory()");
+            EPLog.e(LOG_TAG, "queue.put() error in chengeTargetDirectory()");
             dismissProgressDialog();
         }
     }

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

@@ -185,7 +185,7 @@ public class MemcardReadProgress extends Activity {
                         EPLog.i(MemcardReadProgress.LOG_TAG, "MediaScannerConnection.scanFile path = " + replace);
                         MediaScannerConnection.scanFile(MemcardReadProgress.this, new String[]{replace}, (String[]) null, (MediaScannerConnection.OnScanCompletedListener) null);
                     } else {
-                        EPLog.m307e(MemcardReadProgress.LOG_TAG, "Failed MediaScannerConnection.scanFile path = " + replace);
+                        EPLog.e(MemcardReadProgress.LOG_TAG, "Failed MediaScannerConnection.scanFile path = " + replace);
                     }
                     mCommonLog.numberOfSheet = i;
                 }

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

@@ -193,7 +193,7 @@ public class Utils {
                 String str = TAG;
                 EPLog.i(str, "getMobileDataEnabled :" + Boolean.valueOf(isAvailable).toString());
             } catch (Exception unused) {
-                EPLog.m307e(TAG, "getMobileDataEnabled : Error");
+                EPLog.e(TAG, "getMobileDataEnabled : Error");
             }
         }
         String str2 = TAG;

app/src/main/java/epson/common/httpclient/IAHttpClient.java

@@ -199,7 +199,7 @@ public class IAHttpClient {
                         }
                     }
                 } catch (FileNotFoundException e) {
-                    EPLog.m307e(TAG, e.getMessage());
+                    EPLog.e(TAG, e.getMessage());
                 } catch (Throwable th) {
                     try {
                         byteArrayOutputStream.close();

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

@@ -1495,7 +1495,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
     }
 
     protected void onResume() {
-        EPLog.m307e("MaintainActivity", "onResume()");
+        EPLog.e("MaintainActivity", "onResume()");
         super.onResume();
         isKeepSimpleAPConnection = false;
         if (!mWaiteInkDsDialog) {

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

@@ -717,7 +717,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
             docFileName = getDocFileNameFromIntent(intent);
             String str = docFileName;
             if (str == null || str.length() == 0) {
-                EPLog.m307e(TAG, "onCreate : Error ACTION_VIEW or ACTION_SEND");
+                EPLog.e(TAG, "onCreate : Error ACTION_VIEW or ACTION_SEND");
                 Toast.makeText(this, getString(R.string.file_size_notsupport), 1).show();
                 finish();
                 return;
@@ -831,7 +831,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                     }
                 }
             } catch (IOException | SecurityException e) {
-                EPLog.m307e(TAG, "getDocFileNameFromIntent : " + e.toString());
+                EPLog.e(TAG, "getDocFileNameFromIntent : " + e.toString());
                 Toast.makeText(getApplicationContext(), getString(R.string.file_size_notsupport), 1).show();
                 finish();
                 return null;

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

@@ -1275,7 +1275,7 @@ public class ActivityViewImageSelect extends ActivityIACommon implements View.On
 
     public boolean onKeyDown(int i, KeyEvent keyEvent) {
         if (keyEvent.getAction() == 0 && i == 84) {
-            EPLog.m307e("key search", "diable");
+            EPLog.e("key search", "diable");
             return true;
         } else if (keyEvent.getAction() != 0 || i != 4) {
             return false;

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

@@ -208,7 +208,7 @@ public class EPImage implements Parcelable {
             options.inJustDecodeBounds = true;
             BitmapFactory.decodeFile(loadImageFileName, options);
             if (options.outWidth <= 0 || options.outHeight <= 0) {
-                EPLog.m307e(TAG, "BitmapFactory.decodeFile Failed");
+                EPLog.e(TAG, "BitmapFactory.decodeFile Failed");
                 if (mEpsonImage == null) {
                     mEpsonImage = new epsonImage();
                 }

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

@@ -164,7 +164,7 @@ public class EPImageCreator implements CommonDefine {
                             ePImage.decodeImageFileName = str;
                             break;
                         } else if (stopRequested()) {
-                            EPLog.m307e("EPImageCreator", "EPImageCreator::LoadJpegFile() jpg2bmp stoped.");
+                            EPLog.e("EPImageCreator", "EPImageCreator::LoadJpegFile() jpg2bmp stoped.");
                             return null;
                         } else {
                             ePImage.decodeImageFileName = null;
@@ -1796,7 +1796,7 @@ public class EPImageCreator implements CommonDefine {
             new File(CANCEL_FILE_NAME).createNewFile();
             EPLog.d("EPImageCreator", "EPImageCreator::makeCancelFile() create cancel file done.");
         } catch (IOException e) {
-            EPLog.m307e("EPImageCreator", "error. can not create cancel_file. " + e);
+            EPLog.e("EPImageCreator", "error. can not create cancel_file. " + e);
         }
         return;
     }
@@ -1805,7 +1805,7 @@ public class EPImageCreator implements CommonDefine {
         try {
             new File(CANCEL_FILE_NAME).delete();
         } catch (SecurityException e) {
-            EPLog.m307e("EPImageCreator", e.toString());
+            EPLog.e("EPImageCreator", e.toString());
         }
         return;
     }

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

@@ -231,7 +231,7 @@ public class EPPrinterManager {
         L_0x00ce:
             java.lang.String r7 = "EPPrinterManager"
             java.lang.String r8 = "loadPrinterList(): error."
-            epson.print.Util.EPLog.m307e((java.lang.String) r7, (java.lang.String) r8)
+            epson.print.Util.EPLog.e((java.lang.String) r7, (java.lang.String) r8)
         L_0x00d5:
             return r0
         */
@@ -401,7 +401,7 @@ public class EPPrinterManager {
                 fileOutputStream = fileOutputStream2;
             }
         } catch (Exception unused2) {
-            EPLog.m307e(TAG, "savePrinterInfo(): writeObject error.");
+            EPLog.e(TAG, "savePrinterInfo(): writeObject error.");
             if (fileOutputStream != null) {
                 try {
                     fileOutputStream.close();
@@ -423,7 +423,7 @@ public class EPPrinterManager {
                 return true;
             }
         }
-        EPLog.m307e(TAG, "deleteRemotePrinterInfo(): Couldn't delete - " + str.toLowerCase() + CommonDefine.DOT);
+        EPLog.e(TAG, "deleteRemotePrinterInfo(): Couldn't delete - " + str.toLowerCase() + CommonDefine.DOT);
         return false;
     }
 
@@ -435,7 +435,7 @@ public class EPPrinterManager {
                 return true;
             }
         }
-        EPLog.m307e(TAG, "deleteIpPrinterInfo(): Couldn't delete - " + str + CommonDefine.DOT);
+        EPLog.e(TAG, "deleteIpPrinterInfo(): Couldn't delete - " + str + CommonDefine.DOT);
         return false;
     }
 

app/src/main/java/epson/print/Util/Photo.java

@@ -170,18 +170,18 @@ public class Photo implements Serializable, CommonDefine {
             str2 = new ExifInterface(str).getAttribute(android.media.ExifInterface.TAG_DATETIME);
             if (str2 == null) {
                 str2 = epsonimage.epsmpGetDate(str);
-                EPLog.m307e("PHOTO", "Get day from C not from EXIF");
+                EPLog.e("PHOTO", "Get day from C not from EXIF");
             }
         } catch (IOException e) {
             e.printStackTrace();
-            EPLog.m307e("PHOTO", "Get day from C not from EXIF");
+            EPLog.e("PHOTO", "Get day from C not from EXIF");
             str2 = epsonimage.epsmpGetDate(str);
         }
         try {
             date = simpleDateFormat.parse(str2);
         } catch (ParseException e2) {
             e2.printStackTrace();
-            EPLog.m307e("PHOTO", "Get last modified day");
+            EPLog.e("PHOTO", "Get last modified day");
             date = new Date(new File(str).lastModified());
         }
         String[] split = simpleDateFormat.format(date).split(":");

app/src/main/java/epson/print/activity/AFolderPhoto.java

@@ -6,8 +6,7 @@ import android.os.Bundle;
 import epson.print.imgsel.PhotoImageSelectActivity;
 
 public class AFolderPhoto extends Activity {
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         startActivity(new Intent(this, PhotoImageSelectActivity.class));
         finish();

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

@@ -331,8 +331,7 @@ public final class ECopyComponent {
         return RemoteCopySetOptionTask.getcopyMagnification(eCopyType, eCopyOptionItemChoice);
     }
 
-    /* access modifiers changed from: protected */
-    public ICopyCancelRequest execute(ITask iTask) {
+    protected ICopyCancelRequest execute(ITask iTask) {
         iTask.setSystemSettings(this.systemSettings);
         iTask.setRequestConnectionTimeout(((Integer) this.properties.get(Property.RequestConnectionTimeout)).intValue());
         iTask.setClientID(this.clientID);

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

@@ -1433,8 +1433,7 @@ public class ECopyOptionItem implements Parcelable {
         return this.numberRange.defaultValue;
     }
 
-    /* access modifiers changed from: protected */
-    public void setDefaultValue(int i) {
+    protected void setDefaultValue(int i) {
         this.numberRange.defaultValue = i;
         selectValue(i);
     }

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

@@ -225,27 +225,23 @@ public class ECopyPreview extends View {
         return eCopyPreview;
     }
 
-    /* access modifiers changed from: protected */
-    public void drawScanPreview(Bitmap bitmap) {
+    protected void drawScanPreview(Bitmap bitmap) {
         this.layout.setScanImage(bitmap);
         requestInvalidateView();
     }
 
-    /* access modifiers changed from: protected */
-    public void calculateScanImageSize(int i, int i2, ScanImageSizeCalculator scanImageSizeCalculator) {
+    protected void calculateScanImageSize(int i, int i2, ScanImageSizeCalculator scanImageSizeCalculator) {
         float scanImageScale = this.layout.getScanImageScale(i, i2);
         scanImageSizeCalculator.onScanImageSize((int) (((float) i) * scanImageScale), (int) (((float) i2) * scanImageScale), scanImageScale);
     }
 
-    /* access modifiers changed from: protected */
-    public void setPaperFrame(RectF rectF) {
+    protected void setPaperFrame(RectF rectF) {
         this.paperFrame = rectF;
         this.layout.setPaperFrame(rectF);
         requestInvalidateView();
     }
 
-    /* access modifiers changed from: protected */
-    public void onDraw(Canvas canvas) {
+    protected void onDraw(Canvas canvas) {
         canvas.save();
         this.backgroundDrawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
         this.backgroundDrawable.draw(canvas);

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

@@ -96,8 +96,7 @@ class PreviewScanTask extends AsyncTask<Void, Void, Void> implements IScanContro
         setPropertyValue(2, Integer.valueOf(IScanController.CPPREV_VALUE_SCAN_RESO_PREVIEW));
     }
 
-    /* access modifiers changed from: protected */
-    public Void doInBackground(Void... voidArr) {
+    protected Void doInBackground(Void... voidArr) {
         setPropertyValue(4, this.systemSettings.getPrinterIPAddress());
         EScanDevice.nativeStartScan(this);
         return null;

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

@@ -115,8 +115,7 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
         return null;
     }
 
-    /* access modifiers changed from: protected */
-    public Result doInBackground(Void... voidArr) {
+    protected Result doInBackground(Void... voidArr) {
         this.operation.setHostIP(this.systemSettings.getPrinterIPAddress());
         Result checkDeviceError = checkDeviceError();
         if (checkDeviceError != null) {
@@ -156,8 +155,7 @@ class RemoteCopyGetOptionTask extends AsyncTask<Void, Void, Result> implements E
         return result;
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostExecute(Result result) {
+    protected void onPostExecute(Result result) {
         this.contextListener.onCopyOptionContextCreated(result.copyType, result.optionContext, result.error);
     }
 }

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

@@ -49,8 +49,7 @@ class RemoteCopyPhotoGetOptionTask extends AsyncTask<Void, Void, Result> impleme
         this.clientID = str;
     }
 
-    /* access modifiers changed from: protected */
-    public Result doInBackground(Void... voidArr) {
+    protected Result doInBackground(Void... voidArr) {
         this.operation.setHostIP(this.systemSettings.getPrinterIPAddress());
         Result result = new Result();
         result.copyType = this.copyType;
@@ -135,8 +134,7 @@ class RemoteCopyPhotoGetOptionTask extends AsyncTask<Void, Void, Result> impleme
         return result;
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostExecute(Result result) {
+    protected void onPostExecute(Result result) {
         this.contextListener.onCopyOptionContextCreated(result.copyType, result.optionContext, result.error);
     }
 }

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

@@ -68,8 +68,7 @@ class RemoteCopyPhotoSetOptionTask extends AsyncTask<Void, Void, Result> impleme
         return result;
     }
 
-    /* access modifiers changed from: protected */
-    public Result doInBackground(Void... voidArr) {
+    protected Result doInBackground(Void... voidArr) {
         this.operation.setHostIP(this.systemSettings.getPrinterIPAddress());
         if (this.selectedItem.isLocalOption) {
             return getResultLocalOptions();
@@ -168,8 +167,7 @@ class RemoteCopyPhotoSetOptionTask extends AsyncTask<Void, Void, Result> impleme
         return result;
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostExecute(Result result) {
+    protected void onPostExecute(Result result) {
         this.optionChangedListener.onCopyOptionChanged(result.selectedItem, result.changedItems, result.error);
     }
 }

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

@@ -113,8 +113,7 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
         this.optionContext = eCopyOptionContext;
     }
 
-    /* access modifiers changed from: protected */
-    public void onPreExecute() {
+    protected void onPreExecute() {
         this.cancelParameter = new ERemoteCopy.IRemoteCancelParameter() {
             public String client_id() {
                 return RemoteCopyPhotoTask.this.clientID;
@@ -151,8 +150,7 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
         this.statusListener.onStarted(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy);
     }
 
-    /* access modifiers changed from: protected */
-    public void onProgressUpdate(Progress... progressArr) {
+    protected void onProgressUpdate(Progress... progressArr) {
         Progress progress2 = progressArr[0];
         this.statusListener.onProcessed(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy, progress2.totalPages, progress2.currentPages, progress2.taskProgress, progress2.resumeRequest);
     }
@@ -291,8 +289,7 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
         return copy;
     }
 
-    /* access modifiers changed from: protected */
-    public Result doInBackground(Void... voidArr) {
+    protected Result doInBackground(Void... voidArr) {
         this.operation.setHostIP(this.systemSettings.getPrinterIPAddress());
         if (!this.photoSetting.parse()) {
             return new Result(ERemoteOperation.ERemoteParam.x_invalid_photo_setting);
@@ -620,8 +617,7 @@ class RemoteCopyPhotoTask extends AsyncTask<Void, Progress, Result> implements E
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostExecute(Result result) {
+    protected void onPostExecute(Result result) {
         this.statusListener.onFinished(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy, result.taskResult);
     }
 }

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

@@ -215,8 +215,7 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
         return result;
     }
 
-    /* access modifiers changed from: protected */
-    public Result doInBackground(Void... voidArr) {
+    protected Result doInBackground(Void... voidArr) {
         this.operation.setHostIP(this.systemSettings.getPrinterIPAddress());
         if (this.selectedItem.isLocalOption) {
             return getResultLocalOptions();
@@ -332,8 +331,7 @@ class RemoteCopySetOptionTask extends AsyncTask<Void, Void, Result> implements E
         return result;
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostExecute(Result result) {
+    protected void onPostExecute(Result result) {
         this.optionChangedListener.onCopyOptionChanged(result.selectedItem, result.changedItems, result.error);
     }
 }

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

@@ -2,7 +2,7 @@ package epson.print.copy.Component.ecopycomponent;
 
 import android.content.Context;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
+
 import com.epson.iprint.prtlogger.Analytics;
 import com.epson.iprint.prtlogger.CommonLog;
 import com.epson.iprint.prtlogger.PrintLog;
@@ -210,8 +210,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
         this.optionContext = eCopyOptionContext;
     }
 
-    /* access modifiers changed from: protected */
-    public void onPreExecute() {
+    protected void onPreExecute() {
         this.cancelParameter = new ERemoteCopy.IRemoteCancelParameter() {
             public String client_id() {
                 return RemoteCopyTask.this.clientID;
@@ -247,8 +246,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
         this.statusListener.onStarted(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy);
     }
 
-    /* access modifiers changed from: protected */
-    public void onProgressUpdate(Progress... progressArr) {
+    protected void onProgressUpdate(Progress... progressArr) {
         Progress progress2 = progressArr[0];
         this.statusListener.onProcessed(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy, progress2.totalPages, progress2.currentPages, progress2.taskProgress, progress2.resumeRequest);
     }
@@ -414,8 +412,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
         }
     }
 
-    /* access modifiers changed from: protected */
-    public Result doInBackground(Void... voidArr) {
+    protected Result doInBackground(Void... voidArr) {
         this.operation.setHostIP(this.systemSettings.getPrinterIPAddress());
         ERemoteOperation.ERemoteReasonResult startCopy = startCopy();
         if (!startCopy.success()) {
@@ -564,8 +561,7 @@ class RemoteCopyTask extends AsyncTask<Void, Progress, Result> implements ECopyC
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostExecute(Result result) {
+    protected void onPostExecute(Result result) {
         this.statusListener.onFinished(ECopyComponent.ICopyStatusListener.CopyTaskType.Copy, result.taskResult);
     }
 }

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

@@ -191,8 +191,7 @@ class RemoteDeviceTask extends AsyncTask<Void, Void, Result> implements ECopyCom
         return new ArrayList<>();
     }
 
-    /* access modifiers changed from: protected */
-    public Result doInBackground(Void... voidArr) {
+    protected Result doInBackground(Void... voidArr) {
         this.operation.setHostIP(this.systemSettings.getPrinterIPAddress());
         ERemoteDevice.ERemoteDeviceStatusResult status = this.operation.getStatus(new ERemoteOperation.IRemoteStatusParameter() {
             public String client_id() {
@@ -227,8 +226,7 @@ class RemoteDeviceTask extends AsyncTask<Void, Void, Result> implements ECopyCom
         return result;
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostExecute(Result result) {
+    protected void onPostExecute(Result result) {
         this.statusListener.onDeviceStatus(result.connetion, result.printer, result.scanner, result.printerReasons, result.scannerReasons, result.jobTokens);
     }
 }

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

@@ -200,13 +200,11 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onDestroy() {
+    protected void onDestroy() {
         super.onDestroy();
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         if (i == 12) {
             if (i2 == -1) {
                 finish();
@@ -527,15 +525,13 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
     private class ProbePrinter extends AsyncTask<Void, Void, Boolean> {
         private volatile boolean mRepeatCopyAvailable;
 
-        /* access modifiers changed from: protected */
-        public void onPreExecute() {
+        protected void onPreExecute() {
         }
 
         private ProbePrinter() {
         }
 
-        /* access modifiers changed from: protected */
-        public Boolean doInBackground(Void... voidArr) {
+        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) {
@@ -575,15 +571,13 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             return true;
         }
 
-        /* access modifiers changed from: protected */
-        public void onCancelled() {
+        protected void onCancelled() {
             EPLog.i(CopyActivity.this.TAG, "ProbePrinter onCancelled");
             super.onCancelled();
             CopyActivity.this.mPrinter.doCancelFindPrinter();
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(Boolean bool) {
+        protected void onPostExecute(Boolean bool) {
             EPLog.i(CopyActivity.this.TAG, "ProbePrinter onPostExecute");
             CopyActivity.this.changeRepeatCopyButtonState(this.mRepeatCopyAvailable);
             if (bool.booleanValue()) {
@@ -617,8 +611,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
         this.mRepeatCopyButton.setEnabled(z2);
     }
 
-    /* access modifiers changed from: protected */
-    public void deleteLongTapMessage() {
+    protected void deleteLongTapMessage() {
         MotionEvent obtain = MotionEvent.obtain(SystemClock.uptimeMillis(), SystemClock.uptimeMillis() + 10, 1, 0.0f, 0.0f, 0);
         findViewById(R.id.SettingButonCopiesCountUp).dispatchTouchEvent(obtain);
         findViewById(R.id.SettingButonCopiesCountDown).dispatchTouchEvent(obtain);

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

@@ -311,8 +311,7 @@ public class CopyScaleActivity extends ActivityBase {
         finish();
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
             this.isTryConnectSimpleAp = false;
@@ -324,8 +323,7 @@ public class CopyScaleActivity extends ActivityBase {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
         if (!this.isKeepSimpleAPConnection) {
             WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, ActivityBase.printerIp);

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

@@ -135,8 +135,7 @@ public class CopySettingActivity extends ActivityBase {
         finish();
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
             this.isTryConnectSimpleAp = false;
@@ -148,8 +147,7 @@ public class CopySettingActivity extends ActivityBase {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
         if (!this.isKeepSimpleAPConnection) {
             WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, ActivityBase.printerIp);

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

@@ -1,7 +1,7 @@
 package epson.print.copy;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+
 import android.support.annotation.StringRes;
 import epson.print.R;
 import epson.print.copy.Component.ecopycomponent.ECopyOptionItem;

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

@@ -96,8 +96,7 @@ public class EcClientLib {
         this.mHttpAcess.resetCancel();
     }
 
-    /* access modifiers changed from: protected */
-    public void finalize() throws Throwable {
+    protected void finalize() throws Throwable {
         Terminate();
     }
 

app/src/main/java/epson/print/gdconv/ConvertProgressActivity.java

@@ -35,8 +35,7 @@ public class ConvertProgressActivity extends AppCompatActivity implements Conver
         return intent;
     }
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView((int) R.layout.activity_convert_progress);
         this.mIprintGoogleSignIn = new IprintGoogleSignIn();
@@ -83,8 +82,7 @@ public class ConvertProgressActivity extends AppCompatActivity implements Conver
         return false;
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         if (i == 10) {
             if (i2 != -1 || !this.mIprintGoogleSignIn.isSignInValid(this, IprintGoogleSignIn.OperationType.UPLOAD)) {
                 setResult(0);

app/src/main/java/epson/print/gdconv/ConvertTask.java

@@ -2,8 +2,8 @@ package epson.print.gdconv;
 
 import android.content.Context;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import com.epson.iprint.storage.Network;
 import com.epson.iprint.storage.gdrivev3.DriveWriter;
 import epson.common.ExternalFileUtils;
@@ -34,8 +34,7 @@ public class ConvertTask extends AsyncTask<String, ConvertStatus, Integer> {
         this.mTaskCallbackWeakReference = new WeakReference<>(taskCallback);
     }
 
-    /* access modifiers changed from: protected */
-    public Integer doInBackground(String[] strArr) {
+    protected Integer doInBackground(String[] strArr) {
         if (strArr == null || strArr[0] == null) {
             return 101;
         }
@@ -77,8 +76,7 @@ public class ConvertTask extends AsyncTask<String, ConvertStatus, Integer> {
         return new File(tempCacheDir, name + CommonDefine.FileType_PDF);
     }
 
-    /* access modifiers changed from: protected */
-    public void onProgressUpdate(ConvertStatus... convertStatusArr) {
+    protected void onProgressUpdate(ConvertStatus... convertStatusArr) {
         TaskCallback taskCallback = (TaskCallback) this.mTaskCallbackWeakReference.get();
         if (taskCallback != null && convertStatusArr != null && convertStatusArr[0] != null) {
             taskCallback.messageChange(convertStatusArr[0]);
@@ -92,13 +90,11 @@ public class ConvertTask extends AsyncTask<String, ConvertStatus, Integer> {
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostExecute(Integer num) {
+    protected void onPostExecute(Integer num) {
         doNotifyTaskEnd(num != null ? num.intValue() : 101);
     }
 
-    /* access modifiers changed from: protected */
-    public void onCancelled() {
+    protected void onCancelled() {
         doNotifyTaskEnd(103);
     }
 }

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

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

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

@@ -62,7 +62,7 @@ public class AltThumbnailCache extends File {
                     try {
                         this.modified = Long.parseLong(file.getName());
                     } catch (NumberFormatException e) {
-                        EPLog.m307e(TAG, e.getMessage());
+                        EPLog.e(TAG, e.getMessage());
                     }
                 }
             }

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

@@ -15,16 +15,14 @@ public class CameraCopyImageSelectActivity extends ImageSelectActivity {
         return new PhotoImageFinder();
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         if (i == 104) {
             finish();
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void goNext() {
+    protected void goNext() {
         ArrayList<String> fileArrayList = getImageSelector().getFileArrayList();
         if (fileArrayList.size() > 0) {
             Intent intent = new Intent(this, ImagePreviewActivity.class);

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

@@ -17,16 +17,14 @@ class FolderFindTask extends AsyncTask<ImageFinder, Object, Void> implements Ima
         this.mApplicationContext = imageFolderListFragment.getActivity().getApplicationContext();
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostExecute(Void voidR) {
+    protected void onPostExecute(Void voidR) {
         ImageFolderListFragment imageFolderListFragment = (ImageFolderListFragment) this.mFragmentReference.get();
         if (imageFolderListFragment != null) {
             imageFolderListFragment.onFolderFindTaskEnd();
         }
     }
 
-    /* access modifiers changed from: protected */
-    public Void doInBackground(ImageFinder... imageFinderArr) {
+    protected Void doInBackground(ImageFinder... imageFinderArr) {
         Collection<ImageFolderInfo> folderPhotoList;
         if (!isCancelled() && imageFinderArr != null && imageFinderArr.length > 0 && (folderPhotoList = imageFinderArr[0].getFolderPhotoList(this, this.mApplicationContext.getContentResolver())) != null) {
             for (ImageFolderInfo next : folderPhotoList) {
@@ -58,8 +56,7 @@ class FolderFindTask extends AsyncTask<ImageFinder, Object, Void> implements Ima
         publishProgress(new Object[]{imageFolderInfo, bitmap});
     }
 
-    /* access modifiers changed from: protected */
-    public void onProgressUpdate(Object... objArr) {
+    protected void onProgressUpdate(Object... objArr) {
         ImageFolderListFragment imageFolderListFragment;
         if (!isCancelled() && (imageFolderListFragment = (ImageFolderListFragment) this.mFragmentReference.get()) != null) {
             imageFolderListFragment.addItem(objArr[0], objArr[1]);

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

@@ -20,8 +20,7 @@ class ImageFindTask extends AsyncTask<ImageFinder, List<ImageItem>, Void> implem
         this.mFolderPath = str;
     }
 
-    /* access modifiers changed from: protected */
-    public Void doInBackground(ImageFinder... imageFinderArr) {
+    protected Void doInBackground(ImageFinder... imageFinderArr) {
         ImageGridFragment imageGridFragment;
         List<ImageFileInfo> findImageInDirectory;
         if (imageFinderArr == null || imageFinderArr.length <= 0) {
@@ -69,24 +68,21 @@ class ImageFindTask extends AsyncTask<ImageFinder, List<ImageItem>, Void> implem
         return isCancelled();
     }
 
-    /* access modifiers changed from: protected */
-    public void onPreExecute() {
+    protected void onPreExecute() {
         ImageGridFragment imageGridFragment = (ImageGridFragment) this.mFragmentReference.get();
         if (imageGridFragment != null) {
             imageGridFragment.clearItem();
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onProgressUpdate(List<ImageItem>... listArr) {
+    protected void onProgressUpdate(List<ImageItem>... listArr) {
         ImageGridFragment imageGridFragment = (ImageGridFragment) this.mFragmentReference.get();
         if (imageGridFragment != null && listArr != null && listArr.length > 0) {
             imageGridFragment.addItem(listArr[0]);
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void onPostExecute(Void voidR) {
+    protected void onPostExecute(Void voidR) {
         ImageGridFragment imageGridFragment = (ImageGridFragment) this.mFragmentReference.get();
         if (imageGridFragment != null) {
             imageGridFragment.updateData();

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

@@ -46,7 +46,7 @@ public class ImageFolderAdapter extends BaseAdapter {
         if (folderInfoAndThumbnail.mBitmap != null) {
             imageView.setImageBitmap(folderInfoAndThumbnail.mBitmap);
         } else {
-            imageView.setImageResource(R.C2136drawable.ic_action_warning);
+            imageView.setImageResource(R.drawable.ic_action_warning);
         }
         return view;
     }

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

@@ -75,8 +75,7 @@ public class ImageResizer {
             this.mReqSize = i;
         }
 
-        /* access modifiers changed from: protected */
-        public Bitmap doInBackground(Void... voidArr) {
+        protected Bitmap doInBackground(Void... voidArr) {
             File file;
             Bitmap bitmap;
             if (isCancelled() || !ImageResizer.this.mIsTargetActivityForeground || (file = this.mOrgFile) == null) {
@@ -135,8 +134,7 @@ public class ImageResizer {
             }
         }
 
-        /* access modifiers changed from: protected */
-        public void onPostExecute(Bitmap bitmap) {
+        protected void onPostExecute(Bitmap bitmap) {
             BitmapDrawer bitmapDrawer = (BitmapDrawer) this.mImageImageDrawerReference.get();
             if (bitmap != null && bitmapDrawer != null) {
                 bitmapDrawer.setBitmap(bitmap);

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

@@ -32,8 +32,7 @@ public abstract class ImageSelectActivity extends ActivityIACommon implements Im
         return 0;
     }
 
-    /* access modifiers changed from: protected */
-    public abstract void goNext();
+    protected abstract void goNext();
 
     public boolean showNfcInvalidMessageOnPagerActivity() {
         return false;
@@ -41,8 +40,7 @@ public abstract class ImageSelectActivity extends ActivityIACommon implements Im
 
     public abstract boolean singleImageMode();
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView((int) R.layout.activity_image_selector);
         setActionBar("", true);
@@ -143,13 +141,11 @@ public abstract class ImageSelectActivity extends ActivityIACommon implements Im
         }
     }
 
-    /* access modifiers changed from: protected */
-    public void showOsCacheDialog() {
+    protected void showOsCacheDialog() {
         OsCacheDialog.newInstance().show(getSupportFragmentManager(), "dialog");
     }
 
-    /* access modifiers changed from: protected */
-    public void onSaveInstanceState(Bundle bundle) {
+    protected void onSaveInstanceState(Bundle bundle) {
         bundle.putStringArrayList(STATE_SELECT_LIST, this.mImageSelector.getFileArrayList());
         super.onSaveInstanceState(bundle);
     }
@@ -162,16 +158,14 @@ public abstract class ImageSelectActivity extends ActivityIACommon implements Im
         getSupportFragmentManager().beginTransaction().replace(R.id.container, ImageGridFragment.newInstance(str), TAG_FRAGMENT_IMAGE_GRID).addToBackStack(TAG_FRAGMENT_IMAGE_GRID).commit();
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         if (isFinishing()) {
             AltThumbnailCache.deleteCacheDirectory();
         }
         super.onPause();
     }
 
-    /* access modifiers changed from: protected */
-    public void refreshSelector(ArrayList<String> arrayList) {
+    protected void refreshSelector(ArrayList<String> arrayList) {
         if (arrayList != null) {
             this.mImageSelector.replaceFiles(arrayList);
             if (getGridFragment() != null) {

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

@@ -25,8 +25,7 @@ public class ImageThumbnailTask extends AsyncTask<Void, ImageItem, Void> impleme
         this.imageItems = new LinkedList<>();
     }
 
-    /* access modifiers changed from: protected */
-    public Void doInBackground(Void... voidArr) {
+    protected Void doInBackground(Void... voidArr) {
         Bitmap bitmap;
         EPLog.d(TAG, "Enter doInBackground");
         ContentResolver resolver = getResolver();
@@ -66,8 +65,7 @@ public class ImageThumbnailTask extends AsyncTask<Void, ImageItem, Void> impleme
         return null;
     }
 
-    /* access modifiers changed from: protected */
-    public void onProgressUpdate(ImageItem... imageItemArr) {
+    protected void onProgressUpdate(ImageItem... imageItemArr) {
         ImageGridFragment imageGridFragment = (ImageGridFragment) this.mFragmentReference.get();
         if (imageGridFragment != null && imageItemArr != null && imageItemArr.length > 0) {
             imageGridFragment.updateItem(imageItemArr[0]);

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

@@ -40,8 +40,7 @@ public class ImageViewPagerActivity extends ActivityIACommon implements ImageVie
     /* access modifiers changed from: private */
     public boolean mSingleFileMode;
 
-    /* access modifiers changed from: protected */
-    public void onCreate(Bundle bundle) {
+    protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView((int) R.layout.activity_temp_image_pager);
         setActionBar("", true);
@@ -102,13 +101,11 @@ public class ImageViewPagerActivity extends ActivityIACommon implements ImageVie
         returnAndRefreshSelection();
     }
 
-    /* access modifiers changed from: protected */
-    public void onStop() {
+    protected void onStop() {
         super.onStop();
     }
 
-    /* access modifiers changed from: protected */
-    public void onSaveInstanceState(Bundle bundle) {
+    protected void onSaveInstanceState(Bundle bundle) {
         bundle.putStringArrayList(STATE_SELECTED_FILE_LIST, this.mImageSelector.getFileArrayList());
         super.onSaveInstanceState(bundle);
     }
@@ -157,14 +154,12 @@ public class ImageViewPagerActivity extends ActivityIACommon implements ImageVie
         finish();
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         this.mImageResizer.setActivityForeground(true);
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
         this.mImageResizer.setActivityForeground(false);
     }

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

@@ -6,20 +6,17 @@ import com.epson.mobilephone.common.wifidirect.NfcTagUtils;
 import epson.print.Util.CommonMessage;
 
 public class ImageViewPagerWithNfcInvalidPrintMessageActivity extends ImageViewPagerActivity {
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         super.onPause();
         NfcTagUtils.disableForegroundDispatch(this);
     }
 
-    /* access modifiers changed from: protected */
-    public void onResume() {
+    protected void onResume() {
         super.onResume();
         NfcTagUtils.enableForegroundDispatch(this, (IntentFilter[]) null, (String[][]) null);
     }
 
-    /* access modifiers changed from: protected */
-    public void onNewIntent(Intent intent) {
+    protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         CommonMessage.showInvalidPrintMessageIfEpsonNfcPrinter(this, intent);
     }

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

@@ -4,8 +4,7 @@ import com.epson.memcardacc.MemcardUtil;
 import java.io.File;
 
 public class JpegHeifImageFinder extends MediaStoreImageFinder {
-    /* access modifiers changed from: protected */
-    public boolean myCheckFile(File file) {
+    protected boolean myCheckFile(File file) {
         return MemcardUtil.isJpegOrHeif(file.toString());
     }
 }

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

@@ -4,8 +4,7 @@ import com.epson.memcardacc.MemcardUtil;
 import java.io.File;
 
 public class JpegImageFinder extends MediaStoreImageFinder {
-    /* access modifiers changed from: protected */
-    public boolean myCheckFile(File file) {
+    protected boolean myCheckFile(File file) {
         return MemcardUtil.isJpegFile(file.toString());
     }
 }

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

@@ -18,8 +18,7 @@ import java.util.Map;
 public abstract class MediaStoreImageFinder implements ImageFinder {
     private static final String TAG = "MediaStoreImageFinder";
 
-    /* access modifiers changed from: protected */
-    public abstract boolean myCheckFile(File file);
+    protected abstract boolean myCheckFile(File file);
 
     public Collection<ImageFolderInfo> getFolderPhotoList(ImageFinder.Canceller canceller, ContentResolver contentResolver) {
         try {

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

@@ -4,8 +4,7 @@ import epson.print.Util.Photo;
 import java.io.File;
 
 public class PhotoImageFinder extends MediaStoreImageFinder {
-    /* access modifiers changed from: protected */
-    public boolean myCheckFile(File file) {
+    protected boolean myCheckFile(File file) {
         return Photo.IsFilePhoto(file.toString());
     }
 }

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

@@ -22,8 +22,7 @@ public class PhotoImageSelectActivity extends ImageSelectActivity {
         return new PhotoImageFinder();
     }
 
-    /* access modifiers changed from: protected */
-    public void onActivityResult(int i, int i2, Intent intent) {
+    protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         if (i == 103 && intent != null) {
             ArrayList<String> stringArrayListExtra = intent.getStringArrayListExtra("imageList");
@@ -40,8 +39,7 @@ public class PhotoImageSelectActivity extends ImageSelectActivity {
         getSupportFragmentManager().popBackStackImmediate();
     }
 
-    /* access modifiers changed from: protected */
-    public void goNext() {
+    protected void goNext() {
         Intent intent = new Intent(this, ActivityViewImageSelect.class);
         intent.putExtra("imageList", getImageSelector().getFileArrayList());
         intent.putExtra(ActivityViewImageSelect.PARAMS_KEY_EPSON_COLOR_MODE, true);
@@ -55,8 +53,7 @@ public class PhotoImageSelectActivity extends ImageSelectActivity {
         return printLog;
     }
 
-    /* access modifiers changed from: protected */
-    public void onPause() {
+    protected void onPause() {
         if (isFinishing()) {
             ApfPreviewView.deleteWorkingDirectory(this);
         }

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

@@ -1,7 +1,7 @@
 package epson.print.imgsel;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+
 
 
 public class ProgressDialogFragment extends DialogFragment {

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

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