liuyuqi-dellpc 3 years ago
parent
commit
9f2e2ca293
82 changed files with 746 additions and 863 deletions
  1. 7 7
      app/src/main/java/com/epson/cameracopy/ui/CameraPrintProgress.java
  2. 20 20
      app/src/main/java/com/epson/cameracopy/ui/CameraPrintSettingActivity.java
  3. 2 2
      app/src/main/java/com/epson/cameracopy/ui/CropImageActivity.java
  4. 2 2
      app/src/main/java/com/epson/cameracopy/ui/ImagePreviewActivity.java
  5. 3 3
      app/src/main/java/com/epson/cameracopy/ui/PrintPreviewActivity.java
  6. 2 2
      app/src/main/java/com/epson/iprint/prtlogger/Analytics.java
  7. 10 10
      app/src/main/java/com/epson/iprint/shared/EpsoniPrintSharedActivity.java
  8. 1 1
      app/src/main/java/com/epson/iprint/storage/StorageProcessUploadActivity.java
  9. 1 1
      app/src/main/java/com/epson/iprint/storage/evernote/EvernoteRequest.java
  10. 1 1
      app/src/main/java/com/epson/iprint/storage/evernote/EvernoteSignInActivity.java
  11. 3 3
      app/src/main/java/com/epson/memcardacc/CifsAccess.java
  12. 5 5
      app/src/main/java/com/epson/memcardacc/ConfirmReadMemcard.java
  13. 7 7
      app/src/main/java/com/epson/memcardacc/ConfirmWriteMemcard.java
  14. 6 6
      app/src/main/java/com/epson/memcardacc/CopyTask.java
  15. 18 18
      app/src/main/java/com/epson/memcardacc/MemcardImageGrid.java
  16. 6 6
      app/src/main/java/com/epson/memcardacc/MemcardReadProgress.java
  17. 2 2
      app/src/main/java/com/epson/memcardacc/MemcardTopSuper.java
  18. 3 3
      app/src/main/java/com/epson/memcardacc/MemcardWriteProgress.java
  19. 1 1
      app/src/main/java/com/epson/memcardacc/PhotoCopyWriteProgress.java
  20. 2 2
      app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectManual.java
  21. 1 1
      app/src/main/java/epson/common/CustomListRowAdapter.java
  22. 3 3
      app/src/main/java/epson/common/ExternalFileUtils.java
  23. 3 3
      app/src/main/java/epson/common/ScalableImageView.java
  24. 2 2
      app/src/main/java/epson/common/Utils.java
  25. 1 1
      app/src/main/java/epson/common/httpclient/IAHttpClient.java
  26. 1 1
      app/src/main/java/epson/image/epsonImage.java
  27. 3 3
      app/src/main/java/epson/maintain/FirmwareManager.java
  28. 9 74
      app/src/main/java/epson/maintain/activity/EccPrintLog.java
  29. 9 9
      app/src/main/java/epson/maintain/activity/GetPrinterReplyData.java
  30. 25 18
      app/src/main/java/epson/maintain/activity/MaintainActivity.java
  31. 21 21
      app/src/main/java/epson/print/ActivityDocsPrintPreview.java
  32. 2 2
      app/src/main/java/epson/print/ActivityNfcPrinter.java
  33. 8 8
      app/src/main/java/epson/print/ActivityPrintWeb.java
  34. 1 1
      app/src/main/java/epson/print/ActivityRequestPermissions.java
  35. 208 266
      app/src/main/java/epson/print/ActivityViewImageSelect.java
  36. 2 2
      app/src/main/java/epson/print/EPImage.java
  37. 14 14
      app/src/main/java/epson/print/EPImageCreator.java
  38. 11 11
      app/src/main/java/epson/print/EPPrinterManager.java
  39. 26 26
      app/src/main/java/epson/print/IprintHome.java
  40. 25 25
      app/src/main/java/epson/print/MenudataAdapter.java
  41. 1 1
      app/src/main/java/epson/print/Util/Utils.java
  42. 16 16
      app/src/main/java/epson/print/WebviewActivity.java
  43. 2 2
      app/src/main/java/epson/print/copy/ActivityBase.java
  44. 18 18
      app/src/main/java/epson/print/copy/CopyActivity.java
  45. 2 2
      app/src/main/java/epson/print/copy/CopyScaleActivity.java
  46. 2 2
      app/src/main/java/epson/print/copy/CopySettingActivity.java
  47. 7 7
      app/src/main/java/epson/print/ecclient/HttpApache.java
  48. 7 7
      app/src/main/java/epson/print/imgsel/ImageThumbnailTask.java
  49. 2 2
      app/src/main/java/epson/print/imgsel/MediaStoreImageFinder.java
  50. 3 3
      app/src/main/java/epson/print/pdf/pdfRender.java
  51. 2 2
      app/src/main/java/epson/print/rpcopy/ActivityBase.java
  52. 17 17
      app/src/main/java/epson/print/rpcopy/CopyActivity.java
  53. 2 2
      app/src/main/java/epson/print/rpcopy/CopySettingActivity.java
  54. 3 3
      app/src/main/java/epson/print/screen/ActivityIpPrinterSetting.java
  55. 5 5
      app/src/main/java/epson/print/screen/PaperSourceInfo.java
  56. 7 7
      app/src/main/java/epson/print/screen/PrintProgress.java
  57. 4 4
      app/src/main/java/epson/print/screen/PrintSetting.java
  58. 8 8
      app/src/main/java/epson/print/screen/PrinterFinder.java
  59. 2 2
      app/src/main/java/epson/print/screen/PrinterInfoDetail.java
  60. 7 7
      app/src/main/java/epson/print/screen/SearchPrinterScr.java
  61. 30 30
      app/src/main/java/epson/print/screen/SettingScr.java
  62. 36 36
      app/src/main/java/epson/print/service/EpsonService.java
  63. 1 1
      app/src/main/java/epson/print/storage/StorageProcessUploadActivity.java
  64. 1 1
      app/src/main/java/epson/print/storage/evernote/EvernoteRequest.java
  65. 1 1
      app/src/main/java/epson/print/storage/evernote/EvernoteSignInActivity.java
  66. 1 1
      app/src/main/java/epson/provider/SharedPreferencesProvider.java
  67. 1 1
      app/src/main/java/epson/scan/activity/I2ScanAreaView.java
  68. 1 1
      app/src/main/java/epson/scan/activity/MailActivity.java
  69. 27 27
      app/src/main/java/epson/scan/activity/ScanActivity.java
  70. 5 5
      app/src/main/java/epson/scan/activity/ScanBaseView.java
  71. 5 5
      app/src/main/java/epson/scan/activity/ScanSearchActivity.java
  72. 3 3
      app/src/main/java/epson/scan/activity/ScanSettingsActivity.java
  73. 2 2
      app/src/main/java/epson/scan/activity/ScanSettingsAdvanceDetailActivity.java
  74. 2 2
      app/src/main/java/epson/scan/activity/ScanSettingsDetailActivity.java
  75. 1 1
      app/src/main/java/epson/scan/lib/ScanSettingHelper.java
  76. 11 11
      app/src/main/java/epson/scan/lib/escanLib.java
  77. 1 1
      app/src/main/java/epson/server/screens/StorageServer.java
  78. 9 9
      app/src/main/java/epson/server/screens/UploadScreen.java
  79. 14 14
      app/src/main/java/epson/support/DeviceInformationActivity.java
  80. BIN
      app/src/main/res/drawable-hdpi-v4/abc_list_pressed_holo_dark.9.png
  81. BIN
      app/src/main/res/drawable-hdpi-v4/abc_tab_indicator_mtrl_alpha.9.png
  82. 0 1
      settings.gradle

+ 7 - 7
app/src/main/java/com/epson/cameracopy/ui/CameraPrintProgress.java

@@ -400,7 +400,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 boolean r4 = r4.mCanceled
                 r0.append(r4)
                 java.lang.String r0 = r0.toString()
-                epson.print.Util.EPLog.m305d(r9, r0)
+                epson.print.Util.EPLog.d(r9, r0)
                 epson.print.service.IEpsonService r9 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService
                 if (r9 == 0) goto L_0x034d
                 java.lang.Object r9 = com.epson.cameracopy.ui.CameraPrintProgress.mLock     // Catch:{ RemoteException -> 0x031f }
@@ -433,7 +433,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 if (r9 != 0) goto L_0x0301
                 java.lang.String r9 = "PrintProgress"
                 java.lang.String r0 = "message FINISH: mEpsonService.confirmCancel(true) call"
-                epson.print.Util.EPLog.m305d(r9, r0)     // Catch:{ RemoteException -> 0x031f }
+                epson.print.Util.EPLog.d(r9, r0)     // Catch:{ RemoteException -> 0x031f }
                 epson.print.service.IEpsonService r9 = com.epson.cameracopy.ui.CameraPrintProgress.mEpsonService     // Catch:{ RemoteException -> 0x031f }
                 r9.confirmCancel(r2)     // Catch:{ RemoteException -> 0x031f }
                 r0 = 1
@@ -444,7 +444,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 if (r9 == 0) goto L_0x0323
                 java.lang.String r9 = "PrintProgress"
                 java.lang.String r0 = "on message FINISH: sendEmptyMessageDelayed(FINISH...)"
-                epson.print.Util.EPLog.m305d(r9, r0)     // Catch:{ RemoteException -> 0x031f }
+                epson.print.Util.EPLog.d(r9, r0)     // Catch:{ RemoteException -> 0x031f }
                 com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this     // Catch:{ RemoteException -> 0x031f }
                 android.os.Handler r9 = r9.mHandler     // Catch:{ RemoteException -> 0x031f }
                 r4 = 500(0x1f4, double:2.47E-321)
@@ -507,7 +507,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                 r0.append(r1)
                 r0.append(r3)
                 java.lang.String r0 = r0.toString()
-                epson.print.Util.EPLog.m305d(r9, r0)
+                epson.print.Util.EPLog.d(r9, r0)
                 com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 android.content.Context r9 = r9.context
                 java.lang.String r0 = "printer"
@@ -574,7 +574,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
             L_0x0426:
                 java.lang.String r9 = "Epson"
                 java.lang.String r0 = "Service or resource file not ready, please wait..."
-                epson.print.Util.EPLog.m313i(r9, r0)
+                epson.print.Util.EPLog.i(r9, r0)
                 com.epson.cameracopy.ui.CameraPrintProgress r9 = com.epson.cameracopy.ui.CameraPrintProgress.this
                 android.widget.TextView r9 = r9.mPercent
                 java.lang.StringBuilder r0 = new java.lang.StringBuilder
@@ -868,7 +868,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
         } else {
             mHandler.sendEmptyMessage(6);
         }
-        EPLog.m313i("Epson", "printProgress.java: onCreate() finish");
+        EPLog.i("Epson", "printProgress.java: onCreate() finish");
     }
 
     private void triggerPrint() {
@@ -966,7 +966,7 @@ public class CameraPrintProgress extends Activity implements CommonDefine {
                         }
                         boolean unused2 = CameraPrintProgress.mWaitEpsonServiceForFinish = true;
                         boolean unused3 = CameraPrintProgress.mError = true;
-                        EPLog.m305d("PrintProgress", "cont/cancel dialog. cancel clicked");
+                        EPLog.d("PrintProgress", "cont/cancel dialog. cancel clicked");
                         CameraPrintProgress.mHandler.sendEmptyMessage(5);
                     }
                 });

+ 20 - 20
app/src/main/java/com/epson/cameracopy/ui/CameraPrintSettingActivity.java

@@ -133,7 +133,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         }
 
         public void onNotifyContinueable(int i) throws RemoteException {
-            EPLog.m313i("IEpsonServiceCallback", "onNotifyContinueable code = " + i);
+            EPLog.i("IEpsonServiceCallback", "onNotifyContinueable code = " + i);
             if (i == 0) {
                 CameraPrintSettingActivity cameraPrintSettingActivity = CameraPrintSettingActivity.this;
                 cameraPrintSettingActivity.isInfoAvai = true;
@@ -145,7 +145,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         }
 
         public void onNotifyError(int i, int i2, boolean z) throws RemoteException {
-            EPLog.m313i("IEpsonServiceCallback", "onNotifyError errorCode = " + i2);
+            EPLog.i("IEpsonServiceCallback", "onNotifyError errorCode = " + i2);
             CameraPrintSettingActivity cameraPrintSettingActivity = CameraPrintSettingActivity.this;
             cameraPrintSettingActivity.isInfoAvai = true;
             int unused = cameraPrintSettingActivity.lang = cameraPrintSettingActivity.getPrinterLang();
@@ -442,10 +442,10 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
         File savedSupportedMedia = instance.getSavedSupportedMedia();
         File supportedMedia = instance.getSupportedMedia();
         File preSupportedMedia = instance.getPreSupportedMedia();
-        EPLog.m313i(TAG, "call loadSupportedMedia");
+        EPLog.i(TAG, "call loadSupportedMedia");
         try {
             if (!savedSupportedMedia.exists()) {
-                EPLog.m318w("loadSupportedMedia", savedSupportedMedia.getName() + " not exist");
+                EPLog.w("loadSupportedMedia", savedSupportedMedia.getName() + " not exist");
                 return false;
             }
             Utils.copyFile(savedSupportedMedia, supportedMedia);
@@ -461,18 +461,18 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                 Utils.copyFile(savedAreaInfo, preAreaInfo);
                 return true;
             } catch (Exception e) {
-                EPLog.m318w("loadSupportedMedia", "failure " + e.getMessage());
+                EPLog.w("loadSupportedMedia", "failure " + e.getMessage());
                 return false;
             }
         } catch (Exception e2) {
-            EPLog.m318w("loadSupportedMedia", "failure " + e2.getMessage());
+            EPLog.w("loadSupportedMedia", "failure " + e2.getMessage());
             return false;
         }
     }
 
     private boolean updateSupportedMediaFile(boolean z) {
         ExternalFileUtils instance = ExternalFileUtils.getInstance(this);
-        EPLog.m313i(TAG, "call updateSupportedMedia");
+        EPLog.i(TAG, "call updateSupportedMedia");
         File supportedMedia = instance.getSupportedMedia();
         File preSupportedMedia = instance.getPreSupportedMedia();
         if (z) {
@@ -502,7 +502,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
                 if (areaInfo != null && areaInfo.exists()) {
                     areaInfo.delete();
                 }
-                EPLog.m318w("updateSupportedMediaFile", "failure " + e.getMessage());
+                EPLog.w("updateSupportedMediaFile", "failure " + e.getMessage());
                 return false;
             }
         } catch (Exception e2) {
@@ -512,19 +512,19 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
             if (preSupportedMedia != null && preSupportedMedia.exists()) {
                 preSupportedMedia.delete();
             }
-            EPLog.m318w("updateSupportedMediaFile", "failure " + e2.getMessage());
+            EPLog.w("updateSupportedMediaFile", "failure " + e2.getMessage());
             return false;
         }
     }
 
     private boolean saveSupportedMediaFile() {
         ExternalFileUtils instance = ExternalFileUtils.getInstance(this);
-        EPLog.m313i(TAG, "call saveSupportedMedia");
+        EPLog.i(TAG, "call saveSupportedMedia");
         File supportedMedia = instance.getSupportedMedia();
         File savedSupportedMedia = instance.getSavedSupportedMedia();
         try {
             if (!supportedMedia.exists()) {
-                EPLog.m318w("updateSupportedMediaFile", supportedMedia.getName() + " not exist");
+                EPLog.w("updateSupportedMediaFile", supportedMedia.getName() + " not exist");
                 return false;
             }
             Utils.copyFile(supportedMedia, savedSupportedMedia);
@@ -534,21 +534,21 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
             if (i == 1 || i == 3) {
                 try {
                     if (!areaInfo.exists()) {
-                        EPLog.m318w("updateSupportedMediaFile", areaInfo.getName() + " not exist");
+                        EPLog.w("updateSupportedMediaFile", areaInfo.getName() + " not exist");
                         return false;
                     }
                     Utils.copyFile(areaInfo, savedAreaInfo);
                 } catch (Exception e) {
-                    EPLog.m318w("saveSupportedMediaFile", "failure " + e.getMessage());
+                    EPLog.w("saveSupportedMediaFile", "failure " + e.getMessage());
                     return false;
                 }
             } else {
-                EPLog.m313i(TAG, "delete AreaInfo");
+                EPLog.i(TAG, "delete AreaInfo");
                 instance.removeAreaInfo();
             }
             return true;
         } catch (Exception e2) {
-            EPLog.m318w("saveSupportedMediaFile", "failure " + e2.getMessage());
+            EPLog.w("saveSupportedMediaFile", "failure " + e2.getMessage());
             return false;
         }
     }
@@ -600,7 +600,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     protected void onDestroy() {
         super.onDestroy();
         unbindEpsonService();
-        EPLog.m313i("SettingScr", "onDestroy");
+        EPLog.i("SettingScr", "onDestroy");
         mPaperSizeType.destructor();
     }
 
@@ -838,7 +838,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         String callingPackage = getCallingPackage();
-        EPLog.m313i(callingPackage, "requestCode = " + i + " resultCode = " + i2);
+        EPLog.i(callingPackage, "requestCode = " + i + " resultCode = " + i2);
         if (i != 0) {
             if (i != 4) {
                 if (i != 2) {
@@ -1118,11 +1118,11 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
-            EPLog.m305d(TAG, "getPrinterLang called : ret = " + i);
+            EPLog.d(TAG, "getPrinterLang called : ret = " + i);
             return i;
         }
         i = 1;
-        EPLog.m305d(TAG, "getPrinterLang called : ret = " + i);
+        EPLog.d(TAG, "getPrinterLang called : ret = " + i);
         return i;
     }
 
@@ -1227,7 +1227,7 @@ public class CameraPrintSettingActivity extends ActivityIACommon implements View
     }
 
     protected void onPause() {
-        EPLog.m305d("SettingScr", "onPause");
+        EPLog.d("SettingScr", "onPause");
         super.onPause();
         if (isFinishing()) {
             deleteLongTapMessage();

+ 2 - 2
app/src/main/java/com/epson/cameracopy/ui/CropImageActivity.java

@@ -3,8 +3,8 @@ package com.epson.cameracopy.ui;
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.AlertDialog;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+
+
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.DialogInterface;

+ 2 - 2
app/src/main/java/com/epson/cameracopy/ui/ImagePreviewActivity.java

@@ -3,8 +3,8 @@ package com.epson.cameracopy.ui;
 import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+
+
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;

+ 3 - 3
app/src/main/java/com/epson/cameracopy/ui/PrintPreviewActivity.java

@@ -1,8 +1,8 @@
 package com.epson.cameracopy.ui;
 
 import android.app.AlertDialog;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+
+
 import android.content.ComponentName;
 import android.content.DialogInterface;
 import android.content.Intent;
@@ -512,7 +512,7 @@ public class PrintPreviewActivity extends ActivityIACommon implements CommonDefi
     }
 
     protected void onPause() {
-        EPLog.m305d("ActivityImageViewSelect", "onPause");
+        EPLog.d("ActivityImageViewSelect", "onPause");
         super.onPause();
         if (isFinishing()) {
             AllReloadTask allReloadTask = reloadTask;

+ 2 - 2
app/src/main/java/com/epson/iprint/prtlogger/Analytics.java

@@ -386,7 +386,7 @@ public class Analytics {
     public static void countScreen(@NonNull Context context, String str) {
         if (NewLoggerController.isLoggerEnabled(context)) {
             if (str == null) {
-                EPLog.m318w(TAG, "ERROR: countScreen() screenId == null");
+                EPLog.w(TAG, "ERROR: countScreen() screenId == null");
                 return;
             }
             Tracker defaultTracker = IprintApplication.getInstance().getDefaultTracker();
@@ -398,7 +398,7 @@ public class Analytics {
     public static void sendAction(@NonNull Context context, String str) {
         if (NewLoggerController.isLoggerEnabled(context)) {
             if (str == null) {
-                EPLog.m318w(TAG, "ERROR: sendAction() actionId == null");
+                EPLog.w(TAG, "ERROR: sendAction() actionId == null");
             } else {
                 IprintApplication.getInstance().getDefaultTracker().send(createEventBuilder().setCategory("tap").setAction(str).build());
             }

+ 10 - 10
app/src/main/java/com/epson/iprint/shared/EpsoniPrintSharedActivity.java

@@ -1,8 +1,8 @@
 package com.epson.iprint.shared;
 
 import android.app.Activity;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -66,11 +66,11 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
     Handler mHandler = new Handler() {
         public void handleMessage(Message message) {
             if (message.what != 0) {
-                EPLog.m318w(EpsoniPrintSharedActivity.LOG_TAG, "handleMessage::default");
+                EPLog.w(EpsoniPrintSharedActivity.LOG_TAG, "handleMessage::default");
                 EpsoniPrintSharedActivity.this.CleanUp();
                 return;
             }
-            EPLog.m313i(EpsoniPrintSharedActivity.LOG_TAG, "handleMessage::0");
+            EPLog.i(EpsoniPrintSharedActivity.LOG_TAG, "handleMessage::0");
             EpsoniPrintSharedActivity.this.setWait();
         }
     };
@@ -79,7 +79,7 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
 
     /* access modifiers changed from: protected */
     public void onCreate(Bundle bundle) {
-        EPLog.m313i(LOG_TAG, "onCreate");
+        EPLog.i(LOG_TAG, "onCreate");
         super.onCreate(bundle);
         this.mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
         this.mModelDialog.getDialogJob().observe(this, new Observer() {
@@ -161,12 +161,12 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
     }
 
     public void run() {
-        EPLog.m313i(LOG_TAG, "run");
+        EPLog.i(LOG_TAG, "run");
         try {
             Thread.sleep(100);
         } catch (InterruptedException unused) {
         }
-        EPLog.m313i(LOG_TAG, "run::1");
+        EPLog.i(LOG_TAG, "run::1");
         this.mHandler.sendEmptyMessage(1);
     }
 
@@ -196,7 +196,7 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
     /* access modifiers changed from: private */
     public void backgroundJob() {
         int i;
-        EPLog.m313i(LOG_TAG, "backgroundJob");
+        EPLog.i(LOG_TAG, "backgroundJob");
         Intent intent = getIntent();
         if (intent == null) {
             setResult(1);
@@ -356,7 +356,7 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
     /* access modifiers changed from: protected */
     public void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
-        EPLog.m313i(LOG_TAG, "onActivityResult::requestCode = " + i + "/requestCode = " + i2);
+        EPLog.i(LOG_TAG, "onActivityResult::requestCode = " + i + "/requestCode = " + i2);
         if (i == 10) {
             setResult(i2);
         } else if (i == 20) {
@@ -417,7 +417,7 @@ public class EpsoniPrintSharedActivity extends AppCompatActivity implements Runn
         super.onDestroy();
         ManagePreferences managePreferences = new ManagePreferences();
         if (managePreferences.getSavedFlag(getApplicationContext(), "PrintSetting") == 0) {
-            EPLog.m313i(LOG_TAG, "Preference 戻す");
+            EPLog.i(LOG_TAG, "Preference 戻す");
             managePreferences.popPreferrences(getApplicationContext());
         }
         CleanUp();

+ 1 - 1
app/src/main/java/com/epson/iprint/storage/StorageProcessUploadActivity.java

@@ -162,7 +162,7 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
                                 UploadTask.this.uploaded = true;
                                 newCondition.signal();
                             } catch (Exception e) {
-                                EPLog.m318w("Storage", "onUploadComplete() exception <" + e.toString() + ">");
+                                EPLog.w("Storage", "onUploadComplete() exception <" + e.toString() + ">");
                             } catch (Throwable th) {
                                 reentrantLock.unlock();
                                 throw th;

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

@@ -162,7 +162,7 @@ public class EvernoteRequest {
 
         private void cancel() {
             this.canceled = true;
-            EPLog.m305d(EvernoteRequest.TAG, "Upload Canceled!!");
+            EPLog.d(EvernoteRequest.TAG, "Upload Canceled!!");
         }
     }
 

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

@@ -26,7 +26,7 @@ public class EvernoteSignInActivity extends StorageSignInActivity {
                 showLoginErrorAndFinish();
                 return;
             }
-            EPLog.m313i(TAG, "REQUEST_CODE_OAUTH RESULT_OK");
+            EPLog.i(TAG, "REQUEST_CODE_OAUTH RESULT_OK");
             finish();
         }
     }

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

@@ -78,7 +78,7 @@ public class CifsAccess {
             if (r1 == 0) goto L_0x0027
             java.lang.String r1 = "CifsAccess"
             java.lang.String r2 = "in init() sCifsLib != null"
-            epson.print.Util.EPLog.m318w((java.lang.String) r1, (java.lang.String) r2)     // Catch:{ all -> 0x0044 }
+            epson.print.Util.EPLog.w((java.lang.String) r1, (java.lang.String) r2)     // Catch:{ all -> 0x0044 }
             r3.freeCifsLib()     // Catch:{ all -> 0x0044 }
         L_0x0027:
             com.epson.memcardacc.CifsAccess$CifsLibFactory r1 = sCifsLibFactory     // Catch:{ all -> 0x0044 }
@@ -122,13 +122,13 @@ public class CifsAccess {
     protected synchronized boolean acquireCifsLibSemaphore() {
         try {
             if (!getCifsLibSemaphore().tryAcquire(60, TimeUnit.SECONDS)) {
-                EPLog.m318w("CifsAccess", "cifsSemaphore.tryAcquire() can not get semaphore.");
+                EPLog.w("CifsAccess", "cifsSemaphore.tryAcquire() can not get semaphore.");
                 return false;
             }
             mGotCifsLibSemaphore = true;
             return true;
         } catch (InterruptedException unused) {
-            EPLog.m313i("CifsAccess", "cifsSemaphore.tryAcquire() interrupted.");
+            EPLog.i("CifsAccess", "cifsSemaphore.tryAcquire() interrupted.");
             return false;
         }
     }

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

@@ -1,7 +1,7 @@
 package com.epson.memcardacc;
 
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+
+
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -128,12 +128,12 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
     }
 
     protected void onPause() {
-        EPLog.m305d(LOG_TAG, "onPause()");
+        EPLog.d(LOG_TAG, "onPause()");
         super.onPause();
     }
 
     protected void onStop() {
-        EPLog.m305d(LOG_TAG, "onStop()");
+        EPLog.d(LOG_TAG, "onStop()");
         super.onStop();
         if (!this.isKeepSimleApConnect) {
             WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, MemcardUtil.getPrinterIpAddress(this));
@@ -162,7 +162,7 @@ public class ConfirmReadMemcard extends ActivityIACommon implements DialogProgre
             localShowDialog(DIALOG_WRITE_LOCAL_DIR_CANNOT_GET);
             str2 = "";
         }
-        EPLog.m313i(LOG_TAG, "outdir: " + mCopyTargetFolderName);
+        EPLog.i(LOG_TAG, "outdir: " + mCopyTargetFolderName);
         mCopyTargetPathText.setText(String.format(getResources().getString(R.string.memcard_folder_save_to_format), new Object[]{str2}));
     }
 

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

@@ -1,7 +1,7 @@
 package com.epson.memcardacc;
 
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+
+
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
@@ -162,7 +162,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
     }
 
     protected void onResume() {
-        EPLog.m305d(LOG_TAG, "onResume()");
+        EPLog.d(LOG_TAG, "onResume()");
         super.onResume();
         if (!WiFiDirectManager.isNeedConnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER)) {
             isTryConnectSimpleAp = false;
@@ -189,7 +189,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
     }
 
     protected void onStop() {
-        EPLog.m305d(LOG_TAG, "onStop()");
+        EPLog.d(LOG_TAG, "onStop()");
         super.onStop();
         if (!this.isKeepSimleApConnect) {
             WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, MemcardUtil.getPrinterIpAddress(this));
@@ -232,7 +232,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
     }
 
     private int capacityCheck() {
-        EPLog.m313i(LOG_TAG, "in capacityCheck()");
+        EPLog.i(LOG_TAG, "in capacityCheck()");
         CifsAccess instance = CifsAccess.getInstance();
         try {
             if (instance.initDefault(this, 1) == 0) {
@@ -246,7 +246,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
             long freeUnit = instance.getFreeUnit();
             instance.disconnectStorage();
             instance.free();
-            EPLog.m313i(LOG_TAG, "unit :<" + unitSize + "> free: <" + freeUnit + ">");
+            EPLog.i(LOG_TAG, "unit :<" + unitSize + "> free: <" + freeUnit + ">");
             if ((mTotalFileSize / ((long) unitSize)) + ((long) mImageList.size()) > freeUnit) {
                 return 1;
             }
@@ -293,7 +293,7 @@ public class ConfirmWriteMemcard extends ActivityIACommon implements DialogProgr
                 cifsAccess.deleteDirectory(format);
                 return format;
             }
-            EPLog.m313i(LOG_TAG, "CifsAccess.createDirectory() return <" + createDirectory + ">");
+            EPLog.i(LOG_TAG, "CifsAccess.createDirectory() return <" + createDirectory + ">");
         }
         return null;
     }

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

@@ -40,12 +40,12 @@ class CopyTask extends AsyncTaskExecutor<Void, Integer, Integer> {
     }
 
     protected void onCancelled() {
-        EPLog.m313i(LOG_TAG, "canceled in AsyncTask");
+        EPLog.i(LOG_TAG, "canceled in AsyncTask");
         mCallback.finishWithState(0, 0, mLogData);
     }
 
     protected void onPostExecute(Integer num) {
-        EPLog.m313i(LOG_TAG, "onPostExecute in AsyncTask");
+        EPLog.i(LOG_TAG, "onPostExecute in AsyncTask");
         mCallback.finishWithState(num.intValue(), mErrorCode, mLogData);
     }
 
@@ -270,7 +270,7 @@ class CopyTask extends AsyncTaskExecutor<Void, Integer, Integer> {
             r8.append(r9)
             r8.append(r5)
             java.lang.String r8 = r8.toString()
-            epson.print.Util.EPLog.m313i(r6, r8)
+            epson.print.Util.EPLog.i(r6, r8)
             long r8 = com.epson.memcardacc.MemcardUtil.getFileLength(r3)
             r10 = 2147483647(0x7fffffff, double:1.060997895E-314)
             r6 = 3
@@ -315,7 +315,7 @@ class CopyTask extends AsyncTaskExecutor<Void, Integer, Integer> {
             java.lang.String r12 = ">"
             r11.append(r12)
             java.lang.String r11 = r11.toString()
-            epson.print.Util.EPLog.m318w((java.lang.String) r9, (java.lang.String) r11)
+            epson.print.Util.EPLog.w((java.lang.String) r9, (java.lang.String) r11)
             if (r8 != r4) goto L_0x00d1
             com.epson.memcardacc.CifsAccess r0 = r13.mCifsAccess
             r0.deleteFile(r5)
@@ -367,7 +367,7 @@ class CopyTask extends AsyncTaskExecutor<Void, Integer, Integer> {
     public void taskCancel() {
         if (!mCanceling) {
             mCanceling = true;
-            EPLog.m313i(LOG_TAG, "taskCancel()");
+            EPLog.i(LOG_TAG, "taskCancel()");
             mCifsAccess.cancel();
             cancel(false);
         }
@@ -376,7 +376,7 @@ class CopyTask extends AsyncTaskExecutor<Void, Integer, Integer> {
     public void taskCancelByFileSizeZero() {
         if (!mCanceling) {
             mCanceling = true;
-            EPLog.m313i(LOG_TAG, "taskCancel()");
+            EPLog.i(LOG_TAG, "taskCancel()");
             mCifsAccess.cancelByFileSizeZero();
             cancel(false);
         }

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

@@ -2,8 +2,8 @@ package com.epson.memcardacc;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+
+
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.os.AsyncTask;
@@ -68,7 +68,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
             switch (message.what) {
                 case 1:
                     if (MemcardImageGrid.mCifsFileListLoader != null) {
-                        EPLog.m313i(MemcardImageGrid.LOG_TAG, "status :" + MemcardImageGrid.mCifsFileListLoader.getStatus());
+                        EPLog.i(MemcardImageGrid.LOG_TAG, "status :" + MemcardImageGrid.mCifsFileListLoader.getStatus());
                         switch (C09864.$SwitchMap$android$os$AsyncTask$Status[MemcardImageGrid.mCifsFileListLoader.getStatus().ordinal()]) {
                             case 1:
                             case 2:
@@ -81,7 +81,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
                                 return;
                         }
                     } else {
-                        EPLog.m313i(MemcardImageGrid.LOG_TAG, "mCifsFileListLoader == null");
+                        EPLog.i(MemcardImageGrid.LOG_TAG, "mCifsFileListLoader == null");
                     }
                     MemcardImageGrid.mHandler.sendEmptyMessageDelayed(2, 300);
                     return;
@@ -186,7 +186,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
                 discconectOnThreadFinish = true;
             }
             if (!this.discconectOnThreadFinish) {
-                EPLog.m305d(LOG_TAG, "discconect at onStop()");
+                EPLog.d(LOG_TAG, "discconect at onStop()");
                 WiFiDirectManager.disconnect(this, WiFiDirectManager.DEVICE_TYPE_PRINTER, MemcardUtil.getPrinterIpAddress(this));
             }
         }
@@ -227,7 +227,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
     private void gridViewItemClicked(AdapterView<?> adapterView, View view, int i, long j) {
         String directoryName = mImageFileListAdapter.getDirectoryName(i);
         if (directoryName != null) {
-            EPLog.m313i(LOG_TAG, "item clicked : dir_name => " + directoryName);
+            EPLog.i(LOG_TAG, "item clicked : dir_name => " + directoryName);
             chengeTargetDirectory(directoryName);
         } else if (mImageFileListAdapter.itemSelected(i)) {
             updateSelectedNumber();
@@ -296,7 +296,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
     }
 
     private void chengeTargetDirectory(String str) {
-        EPLog.m313i(LOG_TAG, "chengeTargetDirectory() start");
+        EPLog.i(LOG_TAG, "chengeTargetDirectory() start");
         showProgressDialog();
         mTaskQueue.clear();
         cancelFileListLoadTask();
@@ -312,7 +312,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
 
     protected void execNextTaskOrIdle() {
         if (!mTaskQueue.isEmpty()) {
-            EPLog.m313i(LOG_TAG, "checkQueue() queue not empty");
+            EPLog.i(LOG_TAG, "checkQueue() queue not empty");
             mCifsFileListLoader = new CifsFileListLoader();
             String str = "";
             while (!mTaskQueue.isEmpty()) {
@@ -574,7 +574,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         }
 
         protected void onPreExecute() {
-            EPLog.m313i(MemcardImageGrid.LOG_TAG, "doInBackground() onPreExecute().");
+            EPLog.i(MemcardImageGrid.LOG_TAG, "doInBackground() onPreExecute().");
         }
 
         private boolean waiteAdapterUpdateAndCancelCheck() {
@@ -595,7 +595,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         }
 
         protected synchronized Integer doInBackground(String... strArr) {
-            EPLog.m313i(MemcardImageGrid.LOG_TAG, "doInBackground() started");
+            EPLog.i(MemcardImageGrid.LOG_TAG, "doInBackground() started");
             if (MemcardImageGrid.mCifsAccess.initDefault(MemcardImageGrid.this, 1) == 0) {
                 return null;
             }
@@ -629,22 +629,22 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
                 mAdapterUpdateWaitDone = false;
                 publishProgress(new Integer[]{1});
                 if (waiteAdapterUpdateAndCancelCheck()) {
-                    EPLog.m313i(MemcardImageGrid.LOG_TAG, "doInBackground() next createThumbnail");
+                    EPLog.i(MemcardImageGrid.LOG_TAG, "doInBackground() next createThumbnail");
                     createThumbnail(MemcardImageGrid.mCifsAccess);
                 }
-                EPLog.m313i(MemcardImageGrid.LOG_TAG, "doInBackground() disconnectStorage()");
+                EPLog.i(MemcardImageGrid.LOG_TAG, "doInBackground() disconnectStorage()");
                 MemcardImageGrid.mCifsAccess.disconnectStorage();
                 if (MemcardImageGrid.this.discconectOnThreadFinish) {
-                    EPLog.m305d(MemcardImageGrid.LOG_TAG, "disconnectOnThreadFinish");
+                    EPLog.d(MemcardImageGrid.LOG_TAG, "disconnectOnThreadFinish");
                     WiFiDirectManager.disconnect(MemcardImageGrid.this, WiFiDirectManager.DEVICE_TYPE_PRINTER, MemcardUtil.getPrinterIpAddress(MemcardImageGrid.this));
                 }
-                EPLog.m313i(MemcardImageGrid.LOG_TAG, "doInBackground() end");
+                EPLog.i(MemcardImageGrid.LOG_TAG, "doInBackground() end");
                 MemcardImageGrid.mCifsAccess.free();
                 return 0;
             } catch (UnsupportedEncodingException e) {
                 try {
                     e.printStackTrace();
-                    EPLog.m313i(MemcardImageGrid.LOG_TAG, "exception in doInBackground()");
+                    EPLog.i(MemcardImageGrid.LOG_TAG, "exception in doInBackground()");
                     return null;
                 } finally {
                     MemcardImageGrid.mCifsAccess.free();
@@ -654,7 +654,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
 
         public void cancelTask() {
             if (!mCanceling) {
-                EPLog.m313i(MemcardImageGrid.LOG_TAG, "task canceling...");
+                EPLog.i(MemcardImageGrid.LOG_TAG, "task canceling...");
                 mCanceling = true;
                 MemcardImageGrid.mCifsAccess.cancel();
             }
@@ -673,7 +673,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
         }
 
         protected void onPostExecute(Integer num) {
-            EPLog.m313i(MemcardImageGrid.LOG_TAG, "doInBackground() done.");
+            EPLog.i(MemcardImageGrid.LOG_TAG, "doInBackground() done.");
             if (num == null) {
                 MemcardImageGrid.this.dismissProgressDialog();
                 MemcardImageGrid.this.localShowDialog(MemcardImageGrid.DIALOG_FILE_READ_ERROR);
@@ -704,7 +704,7 @@ public class MemcardImageGrid extends ActivityIACommon implements DialogProgress
                         next.setThumbNail((Bitmap) null);
                     } else {
                         String fileName = next.getFileName();
-                        EPLog.m313i(MemcardImageGrid.LOG_TAG, "name <" + fileName + ">");
+                        EPLog.i(MemcardImageGrid.LOG_TAG, "name <" + fileName + ">");
                         next.setThumbNail(MemcardImageGrid.mBitmapCache.cacheOrMakeThumbnailBitmap(fileName, next.getFullPath()));
                     }
                     publishProgress(new Integer[]{2});

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

@@ -70,7 +70,7 @@ public class MemcardReadProgress extends Activity {
     }
 
     protected void onStop() {
-        EPLog.m305d(LOG_TAG, "onStop()");
+        EPLog.d(LOG_TAG, "onStop()");
         actionCancel();
         discconectOnThreadFinish = true;
         super.onStop();
@@ -116,7 +116,7 @@ public class MemcardReadProgress extends Activity {
 
         protected void onCancelled() {
             MemcardUtil.clearKeepScreenOn(MemcardReadProgress.this.getWindow());
-            EPLog.m313i(MemcardReadProgress.LOG_TAG, "canceld in AsyncTask");
+            EPLog.i(MemcardReadProgress.LOG_TAG, "canceld in AsyncTask");
             MemcardReadProgress.this.finishWithState(0, mCommonLog);
         }
 
@@ -168,12 +168,12 @@ public class MemcardReadProgress extends Activity {
                 String format = String.format(Locale.US, "%s/IMG_%04d.JPG", new Object[]{MemcardReadProgress.mTargetFolderName, Integer.valueOf(i)});
                 i++;
                 if (new File(format).exists()) {
-                    EPLog.m313i(MemcardReadProgress.LOG_TAG, "local file exists. skip");
+                    EPLog.i(MemcardReadProgress.LOG_TAG, "local file exists. skip");
                 } else {
-                    EPLog.m313i(MemcardReadProgress.LOG_TAG, "copy " + str + " => " + format);
+                    EPLog.i(MemcardReadProgress.LOG_TAG, "copy " + str + " => " + format);
                     int readFromPrinterMemcard = cifsAccess.readFromPrinterMemcard(str, format);
                     if (readFromPrinterMemcard != 0) {
-                        EPLog.m318w(MemcardReadProgress.LOG_TAG, "cifsAccess.writeFromPrinterMemcard() return <" + readFromPrinterMemcard + ">");
+                        EPLog.w(MemcardReadProgress.LOG_TAG, "cifsAccess.writeFromPrinterMemcard() return <" + readFromPrinterMemcard + ">");
                         new File(format).delete();
                         if (readFromPrinterMemcard == -2) {
                             return 0;
@@ -182,7 +182,7 @@ public class MemcardReadProgress extends Activity {
                     }
                     String replace = format.replace(MemcardConfig.BASE_DIRECTORY, CommonDefine.DEFAULT_DIR);
                     if (new File(replace).exists()) {
-                        EPLog.m313i(MemcardReadProgress.LOG_TAG, "MediaScannerConnection.scanFile path = " + replace);
+                        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);

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

@@ -1,7 +1,7 @@
 package com.epson.memcardacc;
 
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+
+
 import android.os.AsyncTask;
 import android.os.Bundle;
 

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

@@ -89,7 +89,7 @@ public class MemcardWriteProgress extends Activity {
     }
 
     protected void execCopyTask() {
-        EPLog.m313i(LOG_TAG, "mCopyTask.execute()");
+        EPLog.i(LOG_TAG, "mCopyTask.execute()");
         mCopyTask = new CopyTask(this, mCifsAccessStorageType, mMemcardStorageType, mImageList, mWriteFileList, mTargetFolderName, getLogData());
         mCopyTask.executeOnExecutor(new Void[0]);
     }
@@ -147,7 +147,7 @@ public class MemcardWriteProgress extends Activity {
     }
 
     protected void onStop() {
-        EPLog.m305d(LOG_TAG, "onStop()");
+        EPLog.d(LOG_TAG, "onStop()");
         MemcardUtil.clearKeepScreenOn(getWindow());
         actionCancelTask();
         super.onStop();
@@ -173,7 +173,7 @@ public class MemcardWriteProgress extends Activity {
     }
 
     public void finishWithState(int i, int i2, @Nullable CommonLog commonLog) {
-        EPLog.m305d(LOG_TAG, "finishWithState state = " + i);
+        EPLog.d(LOG_TAG, "finishWithState state = " + i);
         mWifiDirectConnector.tryDisconnectWifiDirect();
         if (commonLog != null && commonLog.numberOfSheet > 0) {
             Analytics.sendCommonLog(this, commonLog);

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

@@ -14,7 +14,7 @@ public class PhotoCopyWriteProgress extends MemcardWriteProgress {
     }
 
     protected void taskCancel() {
-        EPLog.m313i("PhotoCopyWriteProgress", "taskCancel()");
+        EPLog.i("PhotoCopyWriteProgress", "taskCancel()");
         mCopyTask.taskCancelByFileSizeZero();
     }
 

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

@@ -1,7 +1,7 @@
 package com.epson.mobilephone.common.wifidirect;
 
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+
+
 import android.content.Context;
 import android.content.Intent;
 import android.net.wifi.WifiManager;

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

@@ -40,7 +40,7 @@ public class CustomListRowAdapter extends ArrayAdapter<CustomListRow> {
     }
 
     protected View populateView(int i, View view, ViewGroup viewGroup) {
-        EPLog.m305d(TAG, "View position [" + i + "]");
+        EPLog.d(TAG, "View position [" + i + "]");
         CustomListRow customListRow = items.get(i);
         if (customListRow.getPrefixImageId() != null) {
             ((ImageView) view.findViewById(R.id.row_prefix_image)).setImageResource(customListRow.getPrefixImageId().intValue());

+ 3 - 3
app/src/main/java/epson/common/ExternalFileUtils.java

@@ -78,7 +78,7 @@ public class ExternalFileUtils {
         if (file.exists()) {
             return false;
         }
-        EPLog.m313i(TAG, "createTempFolder = " + str);
+        EPLog.i(TAG, "createTempFolder = " + str);
         return file.mkdirs();
     }
 
@@ -88,7 +88,7 @@ public class ExternalFileUtils {
         if (listFiles != null) {
             for (int i = 0; i < listFiles.length; i++) {
                 if (listFiles[i].isFile()) {
-                    EPLog.m313i(TAG, "clearTempFoler delete() = " + listFiles[i].getPath());
+                    EPLog.i(TAG, "clearTempFoler delete() = " + listFiles[i].getPath());
                     listFiles[i].delete();
                 } else if (listFiles[i].isDirectory()) {
                     clearTempFoler(listFiles[i].toString());
@@ -96,7 +96,7 @@ public class ExternalFileUtils {
             }
         }
         if (file.exists() && file.isFile()) {
-            EPLog.m313i(TAG, "clearTempFoler delete() = " + file.getPath());
+            EPLog.i(TAG, "clearTempFoler delete() = " + file.getPath());
             file.delete();
         }
     }

+ 3 - 3
app/src/main/java/epson/common/ScalableImageView.java

@@ -30,7 +30,7 @@ public class ScalableImageView extends View {
     private float mScaleFactor = 1.0f;
     private final GestureDetector.SimpleOnGestureListener onGestureListener = new GestureDetector.SimpleOnGestureListener() {
         public boolean onDoubleTap(MotionEvent motionEvent) {
-            EPLog.m305d(TAG, "DOBULE TAP");
+            EPLog.d(TAG, "DOBULE TAP");
             if (mScaleFactor == 1.0f) {
                 float x = (((-mOffsetX) + motionEvent.getX()) / mScaleFactor) / ( canvasRect.width());
                 float y = (((-mOffsetY) + motionEvent.getY()) / mScaleFactor) / ( canvasRect.height());
@@ -65,7 +65,7 @@ public class ScalableImageView extends View {
                 ScalableImageView scalableImageView4 = ScalableImageView.this;
                 float unused4 = scalableImageView4.mOffsetY = Math.max(scalableImageView4.mOffsetY + f4, ( canvasRect.height()) - (( canvasRect.height()) * mScaleFactor));
             }
-            EPLog.m305d(TAG, "mOffsetX = " + mOffsetX + " mOffsetY = " + mOffsetY);
+            EPLog.d(TAG, "mOffsetX = " + mOffsetX + " mOffsetY = " + mOffsetY);
             invalidate();
             return true;
         }
@@ -106,7 +106,7 @@ public class ScalableImageView extends View {
                 ScalableImageView scalableImageView6 = ScalableImageView.this;
                 float unused10 = scalableImageView6.mOffsetY = Math.max(scalableImageView6.mOffsetY, ( canvasRect.height()) - (( canvasRect.height()) * mScaleFactor));
             }
-            EPLog.m305d(TAG, "mScaleFactor = " + mScaleFactor + " mOffsetX = " + mOffsetX + " mOffsetY = " + mOffsetY);
+            EPLog.d(TAG, "mScaleFactor = " + mScaleFactor + " mOffsetX = " + mOffsetX + " mOffsetY = " + mOffsetY);
             invalidate();
             return true;
         }

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

@@ -191,13 +191,13 @@ public class Utils {
             try {
                 isAvailable = Boolean.TRUE.equals(connectivityManager.getClass().getMethod("getMobileDataEnabled", new Class[0]).invoke(connectivityManager, new Object[0]));
                 String str = TAG;
-                EPLog.m313i(str, "getMobileDataEnabled :" + Boolean.valueOf(isAvailable).toString());
+                EPLog.i(str, "getMobileDataEnabled :" + Boolean.valueOf(isAvailable).toString());
             } catch (Exception unused) {
                 EPLog.m307e(TAG, "getMobileDataEnabled : Error");
             }
         }
         String str2 = TAG;
-        EPLog.m313i(str2, "isEnableMobileData :" + Boolean.valueOf(isAvailable).toString());
+        EPLog.i(str2, "isEnableMobileData :" + Boolean.valueOf(isAvailable).toString());
         return isAvailable;
     }
 

+ 1 - 1
app/src/main/java/epson/common/httpclient/IAHttpClient.java

@@ -170,7 +170,7 @@ public class IAHttpClient {
         if (httpURLConnection.getContentType() != null) {
             httpResponse.setContentType(httpURLConnection.getContentType());
         }
-        EPLog.m313i(TAG, "ResponseCode = " + httpResponse.getResponseCode() + " Content-Type = " + httpResponse.getContentType() + " Content-Length = " + httpResponse.getContentLength());
+        EPLog.i(TAG, "ResponseCode = " + httpResponse.getResponseCode() + " Content-Type = " + httpResponse.getContentType() + " Content-Length = " + httpResponse.getContentLength());
         if (z) {
             switch (httpResponse.getResponseCode() / 100) {
                 case 1:

+ 1 - 1
app/src/main/java/epson/image/epsonImage.java

@@ -83,6 +83,6 @@ public final class epsonImage {
     }
 
     private void javaDebugCB(char[] cArr) {
-        EPLog.m313i(getClass().getName(), cArr.toString());
+        EPLog.i(getClass().getName(), cArr.toString());
     }
 }

+ 3 - 3
app/src/main/java/epson/maintain/FirmwareManager.java

@@ -167,7 +167,7 @@ public class FirmwareManager {
         int i = 0;
         while (true) {
             firmwareInfo = maintainPrinter.getFirmwareInfo(enumMap);
-            EPLog.m305d(TAG, "getFirmwareInfo = " + firmwareInfo);
+            EPLog.d(TAG, "getFirmwareInfo = " + firmwareInfo);
             if (firmwareInfo != -1100) {
                 break;
             }
@@ -210,7 +210,7 @@ public class FirmwareManager {
         int i = 0;
         while (true) {
             batteryInfoEx = maintainPrinter.getBatteryInfoEx(batteryInfoEx2);
-            EPLog.m305d(TAG, "getBatteryInfoEx = " + batteryInfoEx);
+            EPLog.d(TAG, "getBatteryInfoEx = " + batteryInfoEx);
             if (batteryInfoEx != -1100) {
                 break;
             }
@@ -1050,7 +1050,7 @@ public class FirmwareManager {
                 java.lang.String r4 = r0.toString()     // Catch:{ IOException -> 0x0182 }
                 r3.append(r4)     // Catch:{ IOException -> 0x0182 }
                 java.lang.String r3 = r3.toString()     // Catch:{ IOException -> 0x0182 }
-                epson.print.Util.EPLog.m318w((java.lang.String) r1, (java.lang.String) r3)     // Catch:{ IOException -> 0x0182 }
+                epson.print.Util.EPLog.w((java.lang.String) r1, (java.lang.String) r3)     // Catch:{ IOException -> 0x0182 }
                 throw r0     // Catch:{ IOException -> 0x0182 }
             L_0x0157:
                 r4.writeTo(r6)     // Catch:{ IOException -> 0x0182 }

+ 9 - 74
app/src/main/java/epson/maintain/activity/EccPrintLog.java

@@ -5,8 +5,10 @@ import android.os.Bundle;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.FragmentActivity;
 import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 
 import epson.common.DialogProgress;
 import epson.common.DialogProgressViewModel;
@@ -40,7 +42,7 @@ public class EccPrintLog extends ActivityIACommon implements DialogProgress.Dial
     }
 
     protected void onCreate(Bundle bundle) {
-        EPLog.m313i(LOG_TAG, "onCreate() start");
+        EPLog.i(LOG_TAG, "onCreate() start");
         super.onCreate(bundle);
         setContentView(R.layout.epsonconnect_print_log);
         mModelDialog = (DialogProgressViewModel) ViewModelProviders.of((FragmentActivity) this).get(DialogProgressViewModel.class);
@@ -91,13 +93,13 @@ public class EccPrintLog extends ActivityIACommon implements DialogProgress.Dial
 
     private synchronized void startRemotePrintHistoryTask() {
         if (mRemotePrintHistoryTask == null) {
-            EPLog.m313i(LOG_TAG, "RemotePrintHistoryTask creating.");
+            EPLog.i(LOG_TAG, "RemotePrintHistoryTask creating.");
             LogUrl logUrl = new LogUrl();
             logUrl.setContextDependValue(this);
             mRemotePrintHistoryTask = new RemotePrintHistoryTask(this);
             mRemotePrintHistoryTask.execute(new LogUrl[]{logUrl});
         } else {
-            EPLog.m313i(LOG_TAG, "RemotePrintHistoryTask exists. not create");
+            EPLog.i(LOG_TAG, "RemotePrintHistoryTask exists. not create");
             mRemotePrintHistoryTask.setActivity(this);
         }
         showProgressDialog();
@@ -165,75 +167,8 @@ public class EccPrintLog extends ActivityIACommon implements DialogProgress.Dial
         mModelDialog.doShow(DIALOG_PROGRESS);
     }
 
-    /* JADX WARNING: Can't fix incorrect switch cases order */
-    /* JADX WARNING: Removed duplicated region for block: B:12:0x002a  */
-    /* JADX WARNING: Removed duplicated region for block: B:15:0x0046  */
-    /* JADX WARNING: Removed duplicated region for block: B:16:0x0052 A[FALL_THROUGH] */
-    /* JADX WARNING: Removed duplicated region for block: B:18:0x0055  */
-    /* JADX WARNING: Removed duplicated region for block: B:20:? A[RETURN, SYNTHETIC] */
-    /* Code decompiled incorrectly, please refer to instructions dump. */
     private void showDialog(java.lang.String r12) {
-        /*
-            r11 = this;
-            int r0 = r12.hashCode()
-            r1 = -21731516(0xfffffffffeb46744, float:-1.1989861E38)
-            r2 = 1
-            r3 = 0
-            if (r0 == r1) goto L_0x001b
-            r1 = 722082897(0x2b0a1c51, float:4.9066746E-13)
-            if (r0 == r1) goto L_0x0011
-            goto L_0x0025
-        L_0x0011:
-            java.lang.String r0 = "dialog_error"
-            boolean r0 = r12.equals(r0)
-            if (r0 == 0) goto L_0x0025
-            r0 = 1
-            goto L_0x0026
-        L_0x001b:
-            java.lang.String r0 = "dialog_progress"
-            boolean r0 = r12.equals(r0)
-            if (r0 == 0) goto L_0x0025
-            r0 = 0
-            goto L_0x0026
-        L_0x0025:
-            r0 = -1
-        L_0x0026:
-            switch(r0) {
-                case 0: goto L_0x0046;
-                case 1: goto L_0x002a;
-                default: goto L_0x0029;
-            }
-        L_0x0029:
-            goto L_0x0052
-        L_0x002a:
-            epson.maintain.activity.EccPrintLogViewModel r0 = r11.mEccPrintLogViewModel
-            java.lang.String[] r0 = r0.getTitleAndMessage()
-            if (r0 == 0) goto L_0x0052
-            r5 = 2
-            r6 = r0[r2]
-            r7 = r0[r3]
-            r0 = 2131624958(0x7f0e03fe, float:1.887711E38)
-            java.lang.String r8 = r11.getString(r0)
-            r9 = 0
-            r10 = 0
-            r4 = r12
-            epson.common.DialogProgress r0 = epson.common.DialogProgress.newInstance(r4, r5, r6, r7, r8, r9, r10)
-            goto L_0x0053
-        L_0x0046:
-            r0 = 2131625243(0x7f0e051b, float:1.8877688E38)
-            java.lang.String r0 = r11.getString(r0)
-            epson.common.DialogProgress r0 = epson.common.DialogProgress.newInstance(r12, r3, r0)
-            goto L_0x0053
-        L_0x0052:
-            r0 = 0
-        L_0x0053:
-            if (r0 == 0) goto L_0x005f
-            r0.setCancelable(r3)
-            android.support.v4.app.FragmentManager r1 = r11.getSupportFragmentManager()
-            r0.show(r1, r12)
-        L_0x005f:
-            return
-        */
+
         throw new UnsupportedOperationException("Method not decompiled: epson.maintain.activity.EccPrintLog.showDialog(java.lang.String):void");
     }
 
@@ -246,7 +181,7 @@ public class EccPrintLog extends ActivityIACommon implements DialogProgress.Dial
 
     public synchronized void setUrl(String str, int i) {
         mRemotePrintHistoryTask = null;
-        EPLog.m313i(LOG_TAG, "setUrl");
+        EPLog.i(LOG_TAG, "setUrl");
         dissmissProgressDialog();
         if (str == null || i != 0) {
             show_message_and_finish(i);
@@ -288,11 +223,11 @@ public class EccPrintLog extends ActivityIACommon implements DialogProgress.Dial
 
         protected void onPostExecute(Void voidR) {
             EccPrintLog eccPrintLog;
-            EPLog.m313i(EccPrintLog.LOG_TAG, "onPostExecute() begin");
+            EPLog.i(EccPrintLog.LOG_TAG, "onPostExecute() begin");
             WeakReference<EccPrintLog> weakReference = mEccPrintLog;
             if (weakReference != null && (eccPrintLog = (EccPrintLog) weakReference.get()) != null) {
                 eccPrintLog.setUrl(mLogUrl, mErrorCode);
-                EPLog.m313i(EccPrintLog.LOG_TAG, "onPostExecute() end");
+                EPLog.i(EccPrintLog.LOG_TAG, "onPostExecute() end");
             }
         }
     }

+ 9 - 9
app/src/main/java/epson/maintain/activity/GetPrinterReplyData.java

@@ -1,8 +1,8 @@
 package epson.maintain.activity;
 
 import android.app.Dialog;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+
+
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Configuration;
@@ -91,7 +91,7 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
                         GetPrinterReplyData.this.showProDia();
                         return;
                     case 1:
-                        EPLog.m313i("Maintain", "********Maintain finish********");
+                        EPLog.i("Maintain", "********Maintain finish********");
                         GetPrinterReplyData.this.interrupMaintainThread();
                         return;
                     case 2:
@@ -206,7 +206,7 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
         if (mPrinter == null) {
             mPrinter = MaintainPrinter2.getInstance();
         }
-        EPLog.m313i(TAG, "onCreate");
+        EPLog.i(TAG, "onCreate");
         lockRotation();
         mPrinter.doInitDriver(this, 2);
         startLoadConThread();
@@ -243,7 +243,7 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
         mIsCancelProbe = false;
         mLoadConfigThread = new Thread(new Runnable() {
             public void run() {
-                EPLog.m313i(GetPrinterReplyData.TAG, "new load Config thread");
+                EPLog.i(GetPrinterReplyData.TAG, "new load Config thread");
                 GetPrinterReplyData.mUiHandler.sendEmptyMessage(6);
                 try {
                     Thread.sleep(500);
@@ -255,11 +255,11 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
                     GetPrinterReplyData getPrinterReplyData = GetPrinterReplyData.this;
                     getPrinterReplyData.mHavePrinter = false;
                     getPrinterReplyData.mUiHandler.sendEmptyMessage(9);
-                    EPLog.m313i(GetPrinterReplyData.TAG, "not select printer");
+                    EPLog.i(GetPrinterReplyData.TAG, "not select printer");
                     return;
                 }
                 GetPrinterReplyData.mUiHandler.sendEmptyMessage(8);
-                EPLog.m313i("startLoadConThread", "mPrinter.doProbePrinter");
+                EPLog.i("startLoadConThread", "mPrinter.doProbePrinter");
                 if (!GetPrinterReplyData.mIsCancelProbe) {
                     int doProbePrinter = GetPrinterReplyData.mPrinter.doProbePrinter(60, GetPrinterReplyData.mPrinterId, GetPrinterReplyData.mPrinterIp, GetPrinterReplyData.mPrinterLocation);
                     while (!GetPrinterReplyData.mIsCancelProbe && doProbePrinter != 0) {
@@ -278,7 +278,7 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
                             e2.printStackTrace();
                         }
                     }
-                    EPLog.m313i(GetPrinterReplyData.TAG, "Probe Printer result: " + doProbePrinter);
+                    EPLog.i(GetPrinterReplyData.TAG, "Probe Printer result: " + doProbePrinter);
                     if (doProbePrinter == 0) {
                         GetPrinterReplyData.mPrinter.setMSearchPos(0);
                         GetPrinterReplyData getPrinterReplyData2 = GetPrinterReplyData.this;
@@ -515,7 +515,7 @@ public class GetPrinterReplyData extends AppCompatActivity implements MediaInfo,
     protected void onDestroy() {
         stopAllThread();
         super.onDestroy();
-        EPLog.m313i(TAG, "onDestroy");
+        EPLog.i(TAG, "onDestroy");
     }
 
     protected void onPause() {

+ 25 - 18
app/src/main/java/epson/maintain/activity/MaintainActivity.java

@@ -2,8 +2,8 @@ package epson.maintain.activity;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -20,12 +20,12 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.RemoteException;
-import android.support.annotation.ColorRes;
 
 
 
-import android.support.p000v4.content.ContextCompat;
-import android.support.p000v4.view.ViewCompat;
+
+
+
 import android.view.Display;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -37,6 +37,13 @@ import android.widget.RelativeLayout;
 import android.widget.Switch;
 import android.widget.TextView;
 
+import androidx.annotation.ColorRes;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.core.view.ViewCompat;
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.ViewModelProviders;
+
 import com.epson.iprint.prtlogger.Analytics;
 import com.epson.mobilephone.common.escpr.MediaInfo;
 import com.epson.mobilephone.common.maintain2.BatteryInfoEx;
@@ -218,7 +225,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                     MaintainActivity.this.showProDia();
                     break;
                 case 1:
-                    EPLog.m313i("Maintain", "********Maintain finish********");
+                    EPLog.i("Maintain", "********Maintain finish********");
                     MaintainActivity.this.interrupMaintainThread();
                     MaintainActivity.this.cancelProDia();
                     break;
@@ -416,7 +423,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                     monitor-enter(r8)
                     java.lang.String r0 = "MAINTAIN"
                     java.lang.String r1 = "new load Config thread"
-                    epson.print.Util.EPLog.m313i(r0, r1)     // Catch:{ all -> 0x01f0 }
+                    epson.print.Util.EPLog.i(r0, r1)     // Catch:{ all -> 0x01f0 }
                     epson.maintain.activity.MaintainActivity r0 = epson.maintain.activity.MaintainActivity.this     // Catch:{ all -> 0x01f0 }
                     android.os.Handler r0 = r0.mUiHandler     // Catch:{ all -> 0x01f0 }
                     r1 = 6
@@ -544,7 +551,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                     r0.sendEmptyMessage(r1)     // Catch:{ all -> 0x01f0 }
                     java.lang.String r0 = "startLoadConThread"
                     java.lang.String r1 = "mPrinter.doProbePrinter"
-                    epson.print.Util.EPLog.m313i(r0, r1)     // Catch:{ all -> 0x01f0 }
+                    epson.print.Util.EPLog.i(r0, r1)     // Catch:{ all -> 0x01f0 }
                     epson.maintain.activity.MaintainActivity r0 = epson.maintain.activity.MaintainActivity.this     // Catch:{ all -> 0x01f0 }
                     com.epson.mobilephone.common.maintain2.MaintainPrinter2 r0 = r0.mPrinter     // Catch:{ all -> 0x01f0 }
                     epson.maintain.activity.MaintainActivity r1 = epson.maintain.activity.MaintainActivity.this     // Catch:{ all -> 0x01f0 }
@@ -602,7 +609,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                     r2.append(r5)     // Catch:{ all -> 0x01f0 }
                     r2.append(r0)     // Catch:{ all -> 0x01f0 }
                     java.lang.String r2 = r2.toString()     // Catch:{ all -> 0x01f0 }
-                    epson.print.Util.EPLog.m313i(r1, r2)     // Catch:{ all -> 0x01f0 }
+                    epson.print.Util.EPLog.i(r1, r2)     // Catch:{ all -> 0x01f0 }
                     epson.maintain.activity.MaintainActivity r1 = epson.maintain.activity.MaintainActivity.this     // Catch:{ all -> 0x01f0 }
                     boolean r1 = r1.mIsCancelProbe     // Catch:{ all -> 0x01f0 }
                     if (r1 != 0) goto L_0x01e5
@@ -628,7 +635,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                     r0.sendEmptyMessage(r1)     // Catch:{ all -> 0x01f0 }
                     java.lang.String r0 = "MAINTAIN"
                     java.lang.String r1 = "not select printer"
-                    epson.print.Util.EPLog.m313i(r0, r1)     // Catch:{ all -> 0x01f0 }
+                    epson.print.Util.EPLog.i(r0, r1)     // Catch:{ all -> 0x01f0 }
                 L_0x01e5:
                     monitor-exit(r8)
                     return
@@ -953,7 +960,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 startActivity(new Intent(this, EccPrintLog.class));
                 return;
             case R.id.printer /*2131231358*/:
-                EPLog.m305d(TAG, "onClick() R.id.printer");
+                EPLog.d(TAG, "onClick() R.id.printer");
                 new AsyncTask<Void, Void, Void>() {
                     WorkingDialog dialog = new WorkingDialog(MaintainActivity.this);
 
@@ -1166,7 +1173,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 maintainActivity.sendMaintenanceBoxInfoMessage(maintainActivity.mUiHandler, maintenanceBoxInformation);
                 while (MaintainActivity.mIsStillUpdate) {
                     try {
-                        EPLog.m313i(MaintainActivity.TAG, "thread update stt running");
+                        EPLog.i(MaintainActivity.TAG, "thread update stt running");
                         int doGetStatus2 = MaintainActivity.mPrinter.doGetStatus();
                         Message message4 = new Message();
                         message4.what = 2;
@@ -1189,7 +1196,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                         MaintainActivity.this.sendMaintenanceBoxInfoMessage(MaintainActivity.mUiHandler, MaintainActivity.mPrinter.getMaintenanceBoxInformation());
                         Thread.sleep(4000);
                     } catch (InterruptedException e) {
-                        EPLog.m318w("startBackgroundThread", "InterruptedException");
+                        EPLog.w("startBackgroundThread", "InterruptedException");
                         e.printStackTrace();
                         return;
                     }
@@ -1441,10 +1448,10 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
         if (stringId != null) {
             String[] replaceMessage = Utils.replaceMessage(stringId, i2, getApplicationContext());
             mTvPrinterStatus.setText(replaceMessage[1]);
-            EPLog.m313i(TAG, "Stt title: " + replaceMessage[1]);
+            EPLog.i(TAG, "Stt title: " + replaceMessage[1]);
             String str = replaceMessage[0];
             mTvPrinterStatusDetail.setText(str);
-            EPLog.m313i(TAG, "Stt detail: " + str);
+            EPLog.i(TAG, "Stt detail: " + str);
             return;
         }
         TextView textView = mTvPrinterStatus;
@@ -1475,7 +1482,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
 
     protected void onDestroy() {
         super.onDestroy();
-        EPLog.m313i(TAG, "onDestroy");
+        EPLog.i(TAG, "onDestroy");
         IEpsonService iEpsonService = mEpsonService;
         if (iEpsonService != null) {
             try {
@@ -1497,7 +1504,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
     }
 
     protected void onPause() {
-        EPLog.m305d("MaintainActivity", "onPause");
+        EPLog.d("MaintainActivity", "onPause");
         mIsCancelProbe = true;
         hideLoadProgressBar();
         mPrinter.doCancelFindPrinter();
@@ -1852,7 +1859,7 @@ public class MaintainActivity extends ActivityIACommon implements View.OnClickLi
                 if (Utils.isOnline(context)) {
                     return true;
                 }
-                EPLog.m305d(TAG, "Wait Connection 3G");
+                EPLog.d(TAG, "Wait Connection 3G");
                 i++;
                 Thread.sleep(1000);
             } catch (InterruptedException e) {

+ 21 - 21
app/src/main/java/epson/print/ActivityDocsPrintPreview.java

@@ -3,8 +3,8 @@ package epson.print;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+
+
 import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -231,7 +231,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
             }
             switch (message.what) {
                 case 0:
-                    EPLog.m305d(ActivityDocsPrintPreview.TAG, "handleMessage : CONVERTED_OK");
+                    EPLog.d(ActivityDocsPrintPreview.TAG, "handleMessage : CONVERTED_OK");
                     ActivityDocsPrintPreview.this.enableProgressBar(false);
                     int unused = ActivityDocsPrintPreview.mCurrentPageView = message.getData().getInt(CommonDefine.CONVERTED_PAGE);
                     ActivityDocsPrintPreview.this.updatePageTextView();
@@ -249,7 +249,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                     if (activityDocsPrintPreview4.bAutoStartPrint) {
                         ActivityDocsPrintPreview activityDocsPrintPreview5 = ActivityDocsPrintPreview.this;
                         activityDocsPrintPreview5.onClick(activityDocsPrintPreview5.mPrint);
-                        EPLog.m305d(ActivityDocsPrintPreview.TAG, "onClick(mPrint)");
+                        EPLog.d(ActivityDocsPrintPreview.TAG, "onClick(mPrint)");
                         ActivityDocsPrintPreview.this.bAutoStartPrint = false;
                         break;
                     }
@@ -258,7 +258,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                     ActivityDocsPrintPreview.this.showDialog(2);
                     break;
                 case 4:
-                    EPLog.m305d(ActivityDocsPrintPreview.TAG, "handleMessage : STAR_CONVERT");
+                    EPLog.d(ActivityDocsPrintPreview.TAG, "handleMessage : STAR_CONVERT");
                     ActivityDocsPrintPreview.this.enableProgressBar(true);
                     break;
                 case 6:
@@ -450,7 +450,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                     ActivityDocsPrintPreview.this.loadRemotePreviewTask.execute(new String[]{ActivityDocsPrintPreview.this.docFileName});
                     break;
                 case 31:
-                    EPLog.m305d(ActivityDocsPrintPreview.TAG, "handleMessage : CONVERTED_OK_EC");
+                    EPLog.d(ActivityDocsPrintPreview.TAG, "handleMessage : CONVERTED_OK_EC");
                     ActivityDocsPrintPreview.this.enableProgressBar(false);
                     int unused16 = ActivityDocsPrintPreview.mCurrentPageView = message.getData().getInt(CommonDefine.CONVERTED_PAGE);
                     ActivityDocsPrintPreview.this.updatePageTextView();
@@ -470,7 +470,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                     if (activityDocsPrintPreview21.bAutoStartPrint) {
                         ActivityDocsPrintPreview activityDocsPrintPreview22 = ActivityDocsPrintPreview.this;
                         activityDocsPrintPreview22.onClick(activityDocsPrintPreview22.mPrint);
-                        EPLog.m305d(ActivityDocsPrintPreview.TAG, "onClick(mPrint)");
+                        EPLog.d(ActivityDocsPrintPreview.TAG, "onClick(mPrint)");
                         ActivityDocsPrintPreview.this.bAutoStartPrint = false;
                         break;
                     }
@@ -791,10 +791,10 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
     private String getDocFileNameFromIntent(Intent intent) {
         Uri uri;
         if ("android.intent.action.VIEW".equals(intent.getAction())) {
-            EPLog.m313i(TAG, "getDocFileNameFromIntent : Intent.ACTION_VIEW.equals(intent.getAction())");
+            EPLog.i(TAG, "getDocFileNameFromIntent : Intent.ACTION_VIEW.equals(intent.getAction())");
             uri = intent.getData();
         } else if ("android.intent.action.SEND".equals(intent.getAction())) {
-            EPLog.m313i(TAG, "getDocFileNameFromIntent : Intent.ACTION_SEND.equals(intent.getAction())");
+            EPLog.i(TAG, "getDocFileNameFromIntent : Intent.ACTION_SEND.equals(intent.getAction())");
             uri = (Uri) intent.getParcelableExtra("android.intent.extra.STREAM");
         } else {
             uri = null;
@@ -802,18 +802,18 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
         if (uri == null) {
             return null;
         }
-        EPLog.m313i(TAG, "getDocFileNameFromIntent : Call by Intent url =" + uri);
+        EPLog.i(TAG, "getDocFileNameFromIntent : Call by Intent url =" + uri);
         if (uri.getScheme().equals("content")) {
-            EPLog.m313i(TAG, "getDocFileNameFromIntent : content");
+            EPLog.i(TAG, "getDocFileNameFromIntent : content");
             ContentResolver contentResolver = getContentResolver();
             try {
                 String type = intent.getType();
                 if (type == null) {
-                    EPLog.m318w(TAG, "getDocFileNameFromIntent : Not set Type");
+                    EPLog.w(TAG, "getDocFileNameFromIntent : Not set Type");
                     String extention = Utils.getExtention(uri.getPath());
                     if (extention != null) {
                         type = Utils.getExtType(extention);
-                        EPLog.m313i(TAG, "getDocFileNameFromIntent : fType = " + type);
+                        EPLog.i(TAG, "getDocFileNameFromIntent : fType = " + type);
                     }
                 }
                 String makeTempFileName = Utils.makeTempFileName(type);
@@ -906,7 +906,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                 case 1:
                     switch (i2) {
                         case 100:
-                            EPLog.m313i(TAG, "onActivityResult : CONVERT_OK");
+                            EPLog.i(TAG, "onActivityResult : CONVERT_OK");
                             docFileName = intent.getStringExtra(CommonDefine.DOWNLOAD_PATH);
                             new AsyncTaskExecutor<Void, Void, Void>() {
                                 protected void onPreExecute() {
@@ -927,27 +927,27 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                             }.executeOnExecutor(new Void[0]);
                             break;
                         case 101:
-                            EPLog.m313i(TAG, "onActivityResult : CONVERT_FAIL");
+                            EPLog.i(TAG, "onActivityResult : CONVERT_FAIL");
                             showDialog(7);
                             break;
                         case 102:
-                            EPLog.m313i(TAG, "onActivityResult : SIZE_ERROR");
+                            EPLog.i(TAG, "onActivityResult : SIZE_ERROR");
                             showDialog(11);
                             break;
                         case 104:
-                            EPLog.m313i(TAG, "onActivityResult : SIZE_ERROR");
+                            EPLog.i(TAG, "onActivityResult : SIZE_ERROR");
                             showDialog(8);
                             break;
                         case 105:
-                            EPLog.m313i(TAG, "onActivityResult : SIZE_ERROR");
+                            EPLog.i(TAG, "onActivityResult : SIZE_ERROR");
                             showDialog(9);
                             break;
                         case 106:
-                            EPLog.m313i(TAG, "onActivityResult : SIZE_ERROR");
+                            EPLog.i(TAG, "onActivityResult : SIZE_ERROR");
                             showDialog(10);
                             break;
                         default:
-                            EPLog.m313i(TAG, "onActivityResult : ELSE");
+                            EPLog.i(TAG, "onActivityResult : ELSE");
                             mUiHandler.sendEmptyMessage(7);
                             break;
                     }
@@ -1350,7 +1350,7 @@ public class ActivityDocsPrintPreview extends ActivityIACommon implements Common
                 EPImage ePImage = new EPImage(this.tmpList.imageList.get(0).getLoadImageFileName(), 0);
                 i = ePImage.srcHeight;
                 i2 = ePImage.srcWidth;
-                EPLog.m313i(ActivityDocsPrintPreview.TAG, "Finish Renderer Page No.1 : srcWidth = " + i2 + " srcHeight = " + i);
+                EPLog.i(ActivityDocsPrintPreview.TAG, "Finish Renderer Page No.1 : srcWidth = " + i2 + " srcHeight = " + i);
             } else {
                 i2 = 0;
                 i = 0;

+ 2 - 2
app/src/main/java/epson/print/ActivityNfcPrinter.java

@@ -91,7 +91,7 @@ public class ActivityNfcPrinter extends Activity {
                 if (r0 == 0) goto L_0x0076
                 java.lang.String r0 = "ActivityChangeWifiPrinter"
                 java.lang.String r2 = "Needless changing Scanner Info"
-                epson.print.Util.EPLog.m318w((java.lang.String) r0, (java.lang.String) r2)
+                epson.print.Util.EPLog.w((java.lang.String) r0, (java.lang.String) r2)
                 int r0 = r7.getLocation()
                 if (r0 != r5) goto L_0x0061
                 epson.print.EPPrinterManager r0 = new epson.print.EPPrinterManager
@@ -135,7 +135,7 @@ public class ActivityNfcPrinter extends Activity {
                 if (r0 == 0) goto L_0x0106
                 java.lang.String r0 = "ActivityChangeWifiPrinter"
                 java.lang.String r4 = "Needless changing Printer Info"
-                epson.print.Util.EPLog.m318w((java.lang.String) r0, (java.lang.String) r4)
+                epson.print.Util.EPLog.w((java.lang.String) r0, (java.lang.String) r4)
                 int r0 = r7.getLocation()
                 if (r0 != r5) goto L_0x00d2
                 epson.print.EPPrinterManager r0 = new epson.print.EPPrinterManager

+ 8 - 8
app/src/main/java/epson/print/ActivityPrintWeb.java

@@ -1,8 +1,8 @@
 package epson.print;
 
 import android.app.AlertDialog;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
+
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -244,7 +244,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
                                             }
                                             if (ActivityPrintWeb.this.bAutoStartPrint) {
                                                 ActivityPrintWeb.this.onClick(ActivityPrintWeb.mPrint);
-                                                EPLog.m305d(ActivityPrintWeb.TAG, "onClick(mPrint)");
+                                                EPLog.d(ActivityPrintWeb.TAG, "onClick(mPrint)");
                                                 ActivityPrintWeb.this.bAutoStartPrint = false;
                                             }
                                         }
@@ -300,14 +300,14 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
         });
         Intent intent = getIntent();
         if (intent == null) {
-            EPLog.m318w(TAG, "intent == null");
+            EPLog.w(TAG, "intent == null");
             finish();
             return;
         }
         fromActivity = intent.getIntExtra("from", 2);
         addImageView = intent.getStringArrayListExtra("print_web");
         if (this.addImageView == null) {
-            EPLog.m318w(TAG, "intent.getStringArrayListExtra(\"print_web\") returns null. action " + intent.getAction());
+            EPLog.w(TAG, "intent.getStringArrayListExtra(\"print_web\") returns null. action " + intent.getAction());
             finish();
             return;
         }
@@ -651,7 +651,7 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
     }
 
     private void setNewImageView(int i) {
-        EPLog.m313i("Current page :", String.valueOf(i));
+        EPLog.i("Current page :", String.valueOf(i));
         try {
             f334bm = Photo.createBitmapWithUri(this.addImageView.get(i), 1024, Videoio.CAP_PVAPI, false);
             if (this.f334bm != null && mImageView != null) {
@@ -802,8 +802,8 @@ public class ActivityPrintWeb extends ActivityIACommon implements CommonDefine,
         new PrintSetting(this, (PrintSetting.Kind) null).resetPageRange(1, mFileTotalPages);
         mStartPage = 1;
         mEndPage = mFileTotalPages;
-        EPLog.m313i("OldStartPage", String.valueOf(mStartPage));
-        EPLog.m313i("OldEndPage", String.valueOf(mEndPage));
+        EPLog.i("OldStartPage", String.valueOf(mStartPage));
+        EPLog.i("OldEndPage", String.valueOf(mEndPage));
     }
 
     public void onBackPressed() {

+ 1 - 1
app/src/main/java/epson/print/ActivityRequestPermissions.java

@@ -44,7 +44,7 @@ public class ActivityRequestPermissions extends Activity {
             for (int i3 = 0; i3 < strArr.length; i3++) {
                 if (mPermissionObject.getPermissionKey(i3).equals(strArr[i3])) {
                     if (iArr[i3] == 0) {
-                        EPLog.m305d(TAG, "PERMISSION_GRANTED " + strArr[i3]);
+                        EPLog.d(TAG, "PERMISSION_GRANTED " + strArr[i3]);
                         i2++;
                     } else if (!ActivityCompat.shouldShowRequestPermissionRationale(this, strArr[i3])) {
                         PermisionAlertDialog(strArr[i3], true, mPermissionObject.getDialogTitle(i3, 1), mPermissionObject.getDialogMessage(i3, 1));

File diff suppressed because it is too large
+ 208 - 266
app/src/main/java/epson/print/ActivityViewImageSelect.java


+ 2 - 2
app/src/main/java/epson/print/EPImage.java

@@ -200,9 +200,9 @@ public class EPImage implements Parcelable {
         index = i;
         loadImageFileName = str;
         if (loadImageFileName == null) {
-            EPLog.m318w(TAG, "loadImageFileName is null");
+            EPLog.w(TAG, "loadImageFileName is null");
         } else if (!new File(str).exists()) {
-            EPLog.m318w(TAG, str + " is not exists.");
+            EPLog.w(TAG, str + " is not exists.");
         } else {
             BitmapFactory.Options options = new BitmapFactory.Options();
             options.inJustDecodeBounds = true;

+ 14 - 14
app/src/main/java/epson/print/EPImageCreator.java

@@ -8,7 +8,7 @@ import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.media.ExifInterface;
-import android.support.p000v4.view.ViewCompat;
+
 
 import com.epson.cameracopy.printlayout.ImageAndLayout;
 
@@ -108,7 +108,7 @@ public class EPImageCreator implements CommonDefine {
             ePImage.loadImageFileName = null;
             return null;
         } else if (ePImage.loadImageFileName == null) {
-            EPLog.m318w("EPImageCreator", "loadImageFileName is null");
+            EPLog.w("EPImageCreator", "loadImageFileName is null");
             return null;
         } else {
             try {
@@ -157,7 +157,7 @@ public class EPImageCreator implements CommonDefine {
                             }
                             if (attributeInt == 3 || attributeInt == 6 || attributeInt == 8) {
                                 if (str2.startsWith(ExternalFileUtils.getInstance(mContext).getTempViewDir())) {
-                                    EPLog.m313i("createPrintImage", "Delete decorded image : " + str2);
+                                    EPLog.i("createPrintImage", "Delete decorded image : " + str2);
                                     new File(str2).delete();
                                 }
                             }
@@ -213,7 +213,7 @@ public class EPImageCreator implements CommonDefine {
             monitor-enter(r4)
             java.lang.String r5 = "EPImageCreator"
             java.lang.String r6 = "Lcok function by createThumbnailImage()."
-            epson.print.Util.EPLog.m305d(r5, r6)     // Catch:{ all -> 0x0104 }
+            epson.print.Util.EPLog.d(r5, r6)     // Catch:{ all -> 0x0104 }
             r5 = 0
             java.lang.String r6 = r2.thumbnailImageFileName     // Catch:{ Exception -> 0x00fa }
             if (r6 == 0) goto L_0x001b
@@ -330,7 +330,7 @@ public class EPImageCreator implements CommonDefine {
             java.lang.String r6 = r2.decodeImageFileName     // Catch:{ Exception -> 0x00fa }
             r3.append(r6)     // Catch:{ Exception -> 0x00fa }
             java.lang.String r3 = r3.toString()     // Catch:{ Exception -> 0x00fa }
-            epson.print.Util.EPLog.m313i(r0, r3)     // Catch:{ Exception -> 0x00fa }
+            epson.print.Util.EPLog.i(r0, r3)     // Catch:{ Exception -> 0x00fa }
             java.io.File r0 = new java.io.File     // Catch:{ Exception -> 0x00fa }
             java.lang.String r3 = r2.decodeImageFileName     // Catch:{ Exception -> 0x00fa }
             r0.<init>(r3)     // Catch:{ Exception -> 0x00fa }
@@ -372,7 +372,7 @@ public class EPImageCreator implements CommonDefine {
             monitor-enter(r4)
             java.lang.String r5 = "EPImageCreator"
             java.lang.String r6 = "Lcok function by createPreviewImage()."
-            epson.print.Util.EPLog.m305d(r5, r6)     // Catch:{ all -> 0x017a }
+            epson.print.Util.EPLog.d(r5, r6)     // Catch:{ all -> 0x017a }
             r5 = 0
             if (r25 != 0) goto L_0x0020
             java.lang.String r6 = r2.previewImageFileName     // Catch:{ Exception -> 0x001d }
@@ -483,7 +483,7 @@ public class EPImageCreator implements CommonDefine {
             r9.append(r10)     // Catch:{ Exception -> 0x001d }
             r9.append(r0)     // Catch:{ Exception -> 0x001d }
             java.lang.String r9 = r9.toString()     // Catch:{ Exception -> 0x001d }
-            epson.print.Util.EPLog.m313i(r8, r9)     // Catch:{ Exception -> 0x001d }
+            epson.print.Util.EPLog.i(r8, r9)     // Catch:{ Exception -> 0x001d }
             java.io.File r8 = new java.io.File     // Catch:{ Exception -> 0x001d }
             r8.<init>(r0)     // Catch:{ Exception -> 0x001d }
             r8.delete()     // Catch:{ Exception -> 0x001d }
@@ -539,7 +539,7 @@ public class EPImageCreator implements CommonDefine {
             java.lang.String r8 = r2.decodeImageFileName     // Catch:{ Exception -> 0x001d }
             r7.append(r8)     // Catch:{ Exception -> 0x001d }
             java.lang.String r7 = r7.toString()     // Catch:{ Exception -> 0x001d }
-            epson.print.Util.EPLog.m313i(r0, r7)     // Catch:{ Exception -> 0x001d }
+            epson.print.Util.EPLog.i(r0, r7)     // Catch:{ Exception -> 0x001d }
             java.io.File r0 = new java.io.File     // Catch:{ Exception -> 0x001d }
             java.lang.String r7 = r2.decodeImageFileName     // Catch:{ Exception -> 0x001d }
             r0.<init>(r7)     // Catch:{ Exception -> 0x001d }
@@ -809,7 +809,7 @@ public class EPImageCreator implements CommonDefine {
             monitor-enter(r23)
             java.lang.String r5 = "EPImageCreator"
             java.lang.String r6 = "Lcok function by createPrintImage()."
-            epson.print.Util.EPLog.m305d(r5, r6)     // Catch:{ all -> 0x042b }
+            epson.print.Util.EPLog.d(r5, r6)     // Catch:{ all -> 0x042b }
             r7 = 0
             r5 = 1
             if (r3 <= r4) goto L_0x0027
@@ -1242,7 +1242,7 @@ public class EPImageCreator implements CommonDefine {
             r10.append(r11)     // Catch:{ Exception -> 0x00ed }
             r10.append(r6)     // Catch:{ Exception -> 0x00ed }
             java.lang.String r10 = r10.toString()     // Catch:{ Exception -> 0x00ed }
-            epson.print.Util.EPLog.m313i(r7, r10)     // Catch:{ Exception -> 0x00ed }
+            epson.print.Util.EPLog.i(r7, r10)     // Catch:{ Exception -> 0x00ed }
             java.io.File r7 = new java.io.File     // Catch:{ Exception -> 0x00ed }
             r7.<init>(r6)     // Catch:{ Exception -> 0x00ed }
             r7.delete()     // Catch:{ Exception -> 0x00ed }
@@ -1281,7 +1281,7 @@ public class EPImageCreator implements CommonDefine {
             r11.append(r12)     // Catch:{ Exception -> 0x00ed }
             r11.append(r6)     // Catch:{ Exception -> 0x00ed }
             java.lang.String r11 = r11.toString()     // Catch:{ Exception -> 0x00ed }
-            epson.print.Util.EPLog.m313i(r10, r11)     // Catch:{ Exception -> 0x00ed }
+            epson.print.Util.EPLog.i(r10, r11)     // Catch:{ Exception -> 0x00ed }
             java.io.File r10 = new java.io.File     // Catch:{ Exception -> 0x00ed }
             r10.<init>(r6)     // Catch:{ Exception -> 0x00ed }
             r10.delete()     // Catch:{ Exception -> 0x00ed }
@@ -1349,7 +1349,7 @@ public class EPImageCreator implements CommonDefine {
             java.lang.String r5 = r9.decodeImageFileName     // Catch:{ Exception -> 0x00ed }
             r4.append(r5)     // Catch:{ Exception -> 0x00ed }
             java.lang.String r4 = r4.toString()     // Catch:{ Exception -> 0x00ed }
-            epson.print.Util.EPLog.m313i(r3, r4)     // Catch:{ Exception -> 0x00ed }
+            epson.print.Util.EPLog.i(r3, r4)     // Catch:{ Exception -> 0x00ed }
             java.io.File r3 = new java.io.File     // Catch:{ Exception -> 0x00ed }
             java.lang.String r4 = r9.decodeImageFileName     // Catch:{ Exception -> 0x00ed }
             r3.<init>(r4)     // Catch:{ Exception -> 0x00ed }
@@ -1712,7 +1712,7 @@ public class EPImageCreator implements CommonDefine {
                 float f = (float) fontSize;
                 paint.setTextSize(f);
                 paint.setTextAlign(Paint.Align.RIGHT);
-                EPLog.m313i("drawTextToImage", "strDateTime = " + str2);
+                EPLog.i("drawTextToImage", "strDateTime = " + str2);
                 int i6 = length * fontSize;
                 int[] iArr = new int[i6];
                 int i7 = 0;
@@ -1794,7 +1794,7 @@ public class EPImageCreator implements CommonDefine {
     private synchronized void makeCancelFile() {
         try {
             new File(CANCEL_FILE_NAME).createNewFile();
-            EPLog.m305d("EPImageCreator", "EPImageCreator::makeCancelFile() create cancel file done.");
+            EPLog.d("EPImageCreator", "EPImageCreator::makeCancelFile() create cancel file done.");
         } catch (IOException e) {
             EPLog.m307e("EPImageCreator", "error. can not create cancel_file. " + e);
         }

+ 11 - 11
app/src/main/java/epson/print/EPPrinterManager.java

@@ -207,7 +207,7 @@ public class EPPrinterManager {
             java.lang.String r5 = ")"
             r3.append(r5)     // Catch:{ Exception -> 0x00ce }
             java.lang.String r3 = r3.toString()     // Catch:{ Exception -> 0x00ce }
-            epson.print.Util.EPLog.m313i(r2, r3)     // Catch:{ Exception -> 0x00ce }
+            epson.print.Util.EPLog.i(r2, r3)     // Catch:{ Exception -> 0x00ce }
             goto L_0x00ba
         L_0x00b6:
             java.lang.String r2 = ""
@@ -286,12 +286,12 @@ public class EPPrinterManager {
 
     public void commitRemotePrinterInfo() {
         if (remotePrinterList != null) {
-            EPLog.m313i(TAG, "commitRemotePrinterInfo() called");
+            EPLog.i(TAG, "commitRemotePrinterInfo() called");
             if (deletedRemotePrinterList != null) {
                 for (int i = 0; i < deletedRemotePrinterList.size(); i++) {
                     String str = deletedRemotePrinterList.get(i).printerEmailAddress;
                     if (StorageSecureStore.getSharedSecureStore().revoke(str.toLowerCase())) {
-                        EPLog.m313i(TAG, "Success: remove printerAccessKey. (" + str.toLowerCase() + ")");
+                        EPLog.i(TAG, "Success: remove printerAccessKey. (" + str.toLowerCase() + ")");
                     }
                 }
             }
@@ -305,14 +305,14 @@ public class EPPrinterManager {
     }
 
     public void rollbackRemotePrinterInfo() {
-        EPLog.m313i(TAG, "rollbackRemotePrinterInfo() called");
+        EPLog.i(TAG, "rollbackRemotePrinterInfo() called");
         remotePrinterList = null;
         deletedRemotePrinterList = null;
     }
 
     public void commitIPPrinterInfo() {
         if (ipPrinterList != null) {
-            EPLog.m313i(TAG, "commitIPPrinterInfo() called");
+            EPLog.i(TAG, "commitIPPrinterInfo() called");
             ExternalFileUtils.getInstance(context).clearIpPrintersInfo();
             ArrayList<EPPrinterInfo> ipPrinterList2 = getIpPrinterList();
             for (int i = 0; i < ipPrinterList2.size(); i++) {
@@ -339,14 +339,14 @@ public class EPPrinterManager {
                     if (!curPrinter.getIp().equals(next.printerIP)) {
                         curPrinter.setIp(next.printerIP);
                         curPrinter.setCurPrinter(context);
-                        EPLog.m318w(TAG, "IP printer's IP changed");
+                        EPLog.w(TAG, "IP printer's IP changed");
                     }
                     z = true;
                 }
             }
             if (!z) {
                 MyPrinter.clearCurPrinter(context);
-                EPLog.m318w(TAG, "IP printer deleted");
+                EPLog.w(TAG, "IP printer deleted");
             }
         }
         if (Utils.getPrefInt(context, Constants.SCAN_REFS_USED_SCANNER_PATH, Constants.SCAN_REFS_SCANNER_LOCATION) == 3) {
@@ -362,19 +362,19 @@ public class EPPrinterManager {
                 if (prefString.equals(next2.scannerID)) {
                     if (!prefString2.equals(next2.printerIP)) {
                         Utils.savePref(context, Constants.SCAN_REFS_USED_SCANNER_PATH, Constants.SCAN_REFS_SCANNER_IP, next2.printerIP);
-                        EPLog.m318w(TAG, "IP scanner's IP changed");
+                        EPLog.w(TAG, "IP scanner's IP changed");
                     }
                 }
             }
             if (!z2) {
                 ScanSettingHelper.saveErroredBlankSettings(context);
-                EPLog.m318w(TAG, "IP scanner deleted");
+                EPLog.w(TAG, "IP scanner deleted");
             }
         }
     }
 
     public void rollbackIPPrinterInfo() {
-        EPLog.m313i(TAG, "rollbackIPPrinterInfo() called");
+        EPLog.i(TAG, "rollbackIPPrinterInfo() called");
         ipPrinterList = null;
     }
 
@@ -386,7 +386,7 @@ public class EPPrinterManager {
                 StorageSecureStore sharedSecureStore = StorageSecureStore.getSharedSecureStore();
                 sharedSecureStore.revoke(str2);
                 if (sharedSecureStore.put(str2, ePPrinterInfo.printerAccessKey)) {
-                    EPLog.m313i(TAG, "Success: put printerAccessKey. (" + str2 + " = " + ePPrinterInfo.printerAccessKey + ")");
+                    EPLog.i(TAG, "Success: put printerAccessKey. (" + str2 + " = " + ePPrinterInfo.printerAccessKey + ")");
                 }
                 ePPrinterInfo.printerAccessKey = "";
             }

+ 26 - 26
app/src/main/java/epson/print/IprintHome.java

@@ -92,11 +92,11 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
     Handler mHandler = new Handler(new Handler.Callback() {
         public boolean handleMessage(Message message) {
             
-            EPLog.m313i(TAG, "HandlerCallback");
+            EPLog.i(TAG, "HandlerCallback");
             
             switch (message.what) {
                 case 0:
-                    EPLog.m313i(TAG, "PROBE_PRINTER");
+                    EPLog.i(TAG, "PROBE_PRINTER");
                     IprintHome iprintHome = IprintHome.this;
                     finishProbe = false;
                     if (task == null) {
@@ -108,7 +108,7 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
                     }
                     break;
                 case 1:
-                    EPLog.m313i(TAG, "UPDATE_PRINTER_STATUS");
+                    EPLog.i(TAG, "UPDATE_PRINTER_STATUS");
                     int[] unused = mPrinterStatus = mPrinter.getMPrinterInfor().getMStatus();
                     EpLog.d("status " + mPrinterStatus);
                     EpLog.d("printerLocation " + printerLocation);
@@ -128,41 +128,41 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
                         str = getString(R.string.remote_can_connect);
                     }
                     printerStatus.setText(str);
-                    EPLog.m313i(TAG, "Stt title: " + str);
+                    EPLog.i(TAG, "Stt title: " + str);
                     break;
                 case 2:
                     printerStatus.setText(getString(R.string.comm_error));
-                    EPLog.m313i(TAG, "Stt title: " + getString(R.string.comm_error));
+                    EPLog.i(TAG, "Stt title: " + getString(R.string.comm_error));
                     break;
                 case 3:
-                    EPLog.m313i(TAG, "STATUS_ERROR");
+                    EPLog.i(TAG, "STATUS_ERROR");
                     int[] intArray = message.getData().getIntArray("STATUS_ERROR");
                     if (intArray == null) {
                         printerStatus.setText(getString(R.string.upon_error));
-                        EPLog.m313i(TAG, "Stt titlef: " + getString(R.string.upon_error));
+                        EPLog.i(TAG, "Stt titlef: " + getString(R.string.upon_error));
                         break;
                     } else {
-                        EPLog.m313i(TAG, "statusError[0] : " + intArray[0]);
-                        EPLog.m313i(TAG, "statusError[1] : " + intArray[1]);
+                        EPLog.i(TAG, "statusError[0] : " + intArray[0]);
+                        EPLog.i(TAG, "statusError[1] : " + intArray[1]);
                         if (intArray[0] != 2 && intArray[0] != 1 && intArray[0] != 3) {
                             if (intArray[0] != 4 || (intArray[1] != 102 && intArray[1] != -1300)) {
                                 printerStatus.setText(getString(R.string.upon_error));
-                                EPLog.m313i(TAG, "Stt title: " + getString(R.string.upon_error));
+                                EPLog.i(TAG, "Stt title: " + getString(R.string.upon_error));
                                 break;
                             } else {
                                 printerStatus.setText(getString(R.string.comm_error));
-                                EPLog.m313i(TAG, "Stt title: " + getString(R.string.comm_error));
+                                EPLog.i(TAG, "Stt title: " + getString(R.string.comm_error));
                                 break;
                             }
                         } else {
                             printerStatus.setText(getString(R.string.printer_ready));
-                            EPLog.m313i(TAG, "Stt title: " + getString(R.string.printer_ready));
+                            EPLog.i(TAG, "Stt title: " + getString(R.string.printer_ready));
                             break;
                         }
                     }
                     break;
                 default:
-                    EPLog.m313i(TAG, DirectorySelecterActivity.PARAM_DEFAULT_DIR);
+                    EPLog.i(TAG, DirectorySelecterActivity.PARAM_DEFAULT_DIR);
                     printerName.setText(getString(R.string.printer_not_select));
                     ((ImageView) findViewById(R.id.printer_icon)).setVisibility(View.GONE);
                     break;
@@ -264,7 +264,7 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
     }
 
     public void onConfigurationChanged(Configuration configuration) {
-        EPLog.m305d(TAG, "onConfigurationChanged");
+        EPLog.d(TAG, "onConfigurationChanged");
         super.onConfigurationChanged(configuration);
         updateMenu();
     }
@@ -288,7 +288,7 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
     }
 
     protected void onResume() {
-        EPLog.m313i(TAG, "onResume()");
+        EPLog.i(TAG, "onResume()");
         EpLog.i();
         super.onResume();
         ExternalFileUtils.getInstance(this).initTempViewDir();
@@ -324,7 +324,7 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
 
     public void onPause() {
         ProbePrinter probePrinter;
-        EPLog.m313i(TAG, "onPause()");
+        EPLog.i(TAG, "onPause()");
         super.onPause();
         mHandler.removeMessages(0);
         mHandler.removeMessages(1);
@@ -409,12 +409,12 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
         }
 
         protected void onPreExecute() {
-            EPLog.m313i(TAG, "ProbePrinter onPreExecute");
+            EPLog.i(TAG, "ProbePrinter onPreExecute");
             printerStatus.setText("");
         }
 
         protected Boolean doInBackground(Void... voidArr) {
-            EPLog.m313i(TAG, "ProbePrinter doInBackground");
+            EPLog.i(TAG, "ProbePrinter doInBackground");
             mPrinter.doInitDriver(this, 2);
             if (printerLocation == 1 || printerLocation == 3) {
                 if (printerId != null) {
@@ -434,11 +434,11 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
                     }
                     finishProbe = true;
                     if (isCancelled()) {
-                        EPLog.m313i(TAG, "Cancelled ProbePrinter");
+                        EPLog.i(TAG, "Cancelled ProbePrinter");
                         return false;
                     }
                     int doSetPrinter = mPrinter.doSetPrinter();
-                    EPLog.m313i(TAG, "Set Printer result: " + doSetPrinter);
+                    EPLog.i(TAG, "Set Printer result: " + doSetPrinter);
                     if (doSetPrinter != 0) {
                         mHandler.sendEmptyMessage(2);
                         return false;
@@ -446,7 +446,7 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
                     while (!isCancelled()) {
                         try {
                             int doGetStatus = mPrinter.doGetStatus();
-                            EPLog.m313i(TAG, "Printer Status result: " + doGetStatus);
+                            EPLog.i(TAG, "Printer Status result: " + doGetStatus);
                             if (doGetStatus != 0) {
                                 mHandler.sendEmptyMessage(2);
                             } else {
@@ -464,11 +464,11 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
                             }
                             Thread.sleep(10000);
                         } catch (InterruptedException e2) {
-                            EPLog.m318w("Background", "InterruptedException");
+                            EPLog.w("Background", "InterruptedException");
                             e2.printStackTrace();
                         }
                     }
-                    EPLog.m313i(TAG, "task Cancelled");
+                    EPLog.i(TAG, "task Cancelled");
                 } else {
                     int unused2 = printerLocation = 0;
                 }
@@ -477,14 +477,14 @@ public class IprintHome extends ActivityIACommon implements CommonDefine {
         }
 
         public boolean cancelTask(boolean z) {
-            EPLog.m313i(TAG, "ProbePrinter cancelTask IN");
+            EPLog.i(TAG, "ProbePrinter cancelTask IN");
             mPrinter.doCancelFindPrinter();
-            EPLog.m313i(TAG, "ProbePrinter cancelTask OUT");
+            EPLog.i(TAG, "ProbePrinter cancelTask OUT");
             return cancel(z);
         }
 
         protected void onPostExecute(Boolean bool) {
-            EPLog.m313i(TAG, "ProbePrinter onPostExecute");
+            EPLog.i(TAG, "ProbePrinter onPostExecute");
             if (bool.booleanValue()) {
                 mHandler.sendEmptyMessage(1);
             }

+ 25 - 25
app/src/main/java/epson/print/MenudataAdapter.java

@@ -35,7 +35,7 @@ public class MenudataAdapter {
     }
 
     public void parseJSONFile() {
-        EPLog.m313i("parseJSONFile", "Start");
+        EPLog.i("parseJSONFile", "Start");
         json = getJSONFile();
         apps = parseApps(this.json);
         functions = parseFunctions(this.json);
@@ -48,12 +48,12 @@ public class MenudataAdapter {
                 }
             }
         }
-        EPLog.m313i("parseJSONFile", CommonDefine.f335OK);
+        EPLog.i("parseJSONFile", CommonDefine.f335OK);
     }
 
     public JSONObject getJSONFile() {
         InputStream inputStream;
-        EPLog.m313i("getJSONFile", CommonDefine.f335OK);
+        EPLog.i("getJSONFile", CommonDefine.f335OK);
         AssetManager assets = mContext.getResources().getAssets();
         String str = "";
         try {
@@ -62,7 +62,7 @@ public class MenudataAdapter {
             } else {
                 inputStream = assets.open("menudata/MenuData.json");
             }
-            EPLog.m313i("jsonRead", "jsonObject" + inputStream);
+            EPLog.i("jsonRead", "jsonObject" + inputStream);
             BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
             StringBuilder sb = new StringBuilder();
             while (true) {
@@ -73,7 +73,7 @@ public class MenudataAdapter {
                     }
                     sb.append(readLine);
                 } catch (IOException unused) {
-                    EPLog.m313i("jsonRead", "error occur");
+                    EPLog.i("jsonRead", "error occur");
                 }
             }
             str = sb.toString();
@@ -81,17 +81,17 @@ public class MenudataAdapter {
             try {
                 return new JSONObject(str);
             } catch (JSONException unused2) {
-                EPLog.m313i("jsonRead", "error occur");
+                EPLog.i("jsonRead", "error occur");
                 return null;
             }
         } catch (IOException unused3) {
-            EPLog.m313i("jsonRead", "cannot read");
+            EPLog.i("jsonRead", "cannot read");
             return null;
         }
     }
 
     public ArrayList<MenuDataApp> parseApps(JSONObject jSONObject) {
-        EPLog.m313i("parseApps", "Start");
+        EPLog.i("parseApps", "Start");
         ArrayList<MenuDataApp> arrayList = new ArrayList<>();
         try {
             JSONArray jSONArray = jSONObject.getJSONArray("Apps");
@@ -110,14 +110,14 @@ public class MenudataAdapter {
                 arrayList.add(menuDataApp);
             }
         } catch (JSONException unused) {
-            EPLog.m313i(JsonFactory.FORMAT_NAME_JSON, "cannnot parseApps");
+            EPLog.i(JsonFactory.FORMAT_NAME_JSON, "cannnot parseApps");
         }
-        EPLog.m313i("parseApps", CommonDefine.f335OK);
+        EPLog.i("parseApps", CommonDefine.f335OK);
         return arrayList;
     }
 
     public ArrayList<MenuDataFunction> parseFunctions(JSONObject jSONObject) {
-        EPLog.m313i("parseFunctions", "Start");
+        EPLog.i("parseFunctions", "Start");
         ArrayList<MenuDataFunction> arrayList = new ArrayList<>();
         try {
             JSONArray jSONArray = jSONObject.getJSONArray("Functions");
@@ -135,18 +135,18 @@ public class MenudataAdapter {
                 arrayList.add(menuDataFunction);
             }
         } catch (JSONException unused) {
-            EPLog.m313i(JsonFactory.FORMAT_NAME_JSON, "cannnot parseFunctions");
+            EPLog.i(JsonFactory.FORMAT_NAME_JSON, "cannnot parseFunctions");
         }
-        EPLog.m313i("parseFunctions", CommonDefine.f335OK);
+        EPLog.i("parseFunctions", CommonDefine.f335OK);
         return arrayList;
     }
 
     public ArrayList<MenuDataCapability> parseCapabilities(JSONObject jSONObject) {
-        EPLog.m313i("parseCapabilities", "Start");
+        EPLog.i("parseCapabilities", "Start");
         ArrayList<MenuDataCapability> arrayList = new ArrayList<>();
         try {
             if (this.defaultCapability == null) {
-                EPLog.m313i("parseCapabilities", "not set defaultcapability");
+                EPLog.i("parseCapabilities", "not set defaultcapability");
                 return null;
             }
             JSONArray jSONArray = jSONObject.getJSONArray("Capabilities");
@@ -163,16 +163,16 @@ public class MenudataAdapter {
                 menuDataCapability.functionIDs = setExcludedlist(menuDataCapability.functionIDs, getExcludedlist(jSONObject2));
                 arrayList.add(menuDataCapability);
             }
-            EPLog.m313i("parseCapabilities", CommonDefine.f335OK);
+            EPLog.i("parseCapabilities", CommonDefine.f335OK);
             return arrayList;
         } catch (JSONException unused) {
-            EPLog.m313i(JsonFactory.FORMAT_NAME_JSON, "cannnot parseCapabilities");
+            EPLog.i(JsonFactory.FORMAT_NAME_JSON, "cannnot parseCapabilities");
             return null;
         }
     }
 
     public MenuDataCapability parseDefaultCapabilities(JSONObject jSONObject) {
-        EPLog.m313i("parseDefaultCapabilities", "Start");
+        EPLog.i("parseDefaultCapabilities", "Start");
         MenuDataCapability menuDataCapability = new MenuDataCapability();
         try {
             JSONObject jSONObject2 = jSONObject.getJSONObject("DefaultCapability");
@@ -181,10 +181,10 @@ public class MenudataAdapter {
             menuDataCapability.isScanner = Boolean.valueOf(jSONObject2.getBoolean("IsScanner"));
             menuDataCapability.appIDs = FilterApps(JSONArrayToString(jSONObject2.getJSONArray("AppIDs")));
             menuDataCapability.functionIDs = FilterFunctions(JSONArrayToString(jSONObject2.getJSONArray("FunctionIDs")));
-            EPLog.m313i("parseDefaultCapabilities", CommonDefine.f335OK);
+            EPLog.i("parseDefaultCapabilities", CommonDefine.f335OK);
             return menuDataCapability;
         } catch (JSONException unused) {
-            EPLog.m313i(JsonFactory.FORMAT_NAME_JSON, "cannnot parseDefaultCapabilities");
+            EPLog.i(JsonFactory.FORMAT_NAME_JSON, "cannnot parseDefaultCapabilities");
             return null;
         }
     }
@@ -239,7 +239,7 @@ public class MenudataAdapter {
             try {
                 arrayList.add((String) jSONArray.get(i));
             } catch (JSONException unused) {
-                EPLog.m313i(JsonFactory.FORMAT_NAME_JSON, "cannot JSONArrayToString");
+                EPLog.i(JsonFactory.FORMAT_NAME_JSON, "cannot JSONArrayToString");
             }
         }
         return arrayList;
@@ -314,7 +314,7 @@ public class MenudataAdapter {
 
     public MenuDataCapability capabilityForDeviceID(String str) {
         MenuDataCapability menuDataCapability;
-        EPLog.m313i("capabilityForSerialHeader", CommonDefine.f335OK);
+        EPLog.i("capabilityForSerialHeader", CommonDefine.f335OK);
         int i = 0;
         while (true) {
             if (i >= capabilities.size()) {
@@ -331,7 +331,7 @@ public class MenudataAdapter {
     }
 
     public ArrayList<MenuDataApp> appsForAppIDs(ArrayList<String> arrayList) {
-        EPLog.m313i("appsForAppIDs", CommonDefine.f335OK);
+        EPLog.i("appsForAppIDs", CommonDefine.f335OK);
         ArrayList<MenuDataApp> arrayList2 = new ArrayList<>();
         for (int i = 0; i < apps.size(); i++) {
             if (arrayList.contains(this.apps.get(i).appID)) {
@@ -342,7 +342,7 @@ public class MenudataAdapter {
     }
 
     public ArrayList<MenuDataFunction> functionsForFunctionIDs(ArrayList<String> arrayList) {
-        EPLog.m313i("functionsForFunctionIDs", CommonDefine.f335OK);
+        EPLog.i("functionsForFunctionIDs", CommonDefine.f335OK);
         ArrayList<MenuDataFunction> arrayList2 = new ArrayList<>();
         for (int i = 0; i < functions.size(); i++) {
             if (arrayList.contains(this.functions.get(i).functionID)) {
@@ -382,7 +382,7 @@ public class MenudataAdapter {
         }
 
         public Boolean isInstalled(Context context) {
-            EPLog.m313i("isInstalled", CommonDefine.f335OK);
+            EPLog.i("isInstalled", CommonDefine.f335OK);
             try {
                 PackageInfo packageInfo = context.getPackageManager().getPackageInfo(this.PackageName, 128);
                 if ("Creative".equals(this.appID) && 60000 > packageInfo.versionCode) {

+ 1 - 1
app/src/main/java/epson/print/Util/Utils.java

@@ -38,7 +38,7 @@ public class Utils implements CommonDefine {
     public boolean isNetworkAvailable(Context context) {
         ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Service.CONNECTIVITY_SERVICE);
         if (connectivityManager == null) {
-            EPLog.m318w("INTERNET", "couldn't get connectivity manager");
+            EPLog.w("INTERNET", "couldn't get connectivity manager");
         } else {
             NetworkInfo[] allNetworkInfo = connectivityManager.getAllNetworkInfo();
             if (allNetworkInfo != null) {

+ 16 - 16
app/src/main/java/epson/print/WebviewActivity.java

@@ -133,7 +133,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
         public void onPageFinished(WebView webView, String str) {
             boolean z;
             Map<String, ?> all;
-            EPLog.m305d(WebviewActivity.TAG, "onPageFinished: " + str);
+            EPLog.d(WebviewActivity.TAG, "onPageFinished: " + str);
             boolean unused = WebviewActivity.mIsFinish = true;
             boolean unused2 = WebviewActivity.mCanRefresh = true;
             boolean unused3 = WebviewActivity.mCanStop = false;
@@ -175,18 +175,18 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
                     WebviewActivity webviewActivity3 = WebviewActivity.this;
                     SharedPreferences.Editor unused8 = webviewActivity3.stateEditor = webviewActivity3.statePre.edit();
                     WebviewActivity.this.stateEditor.putString(String.valueOf(WebviewActivity.this.countUrl), str);
-                    EPLog.m313i("Save countUrl " + WebviewActivity.this.countUrl + " : ", str);
+                    EPLog.i("Save countUrl " + WebviewActivity.this.countUrl + " : ", str);
                     WebviewActivity.this.stateEditor.commit();
                     hashMap2.put("key", String.valueOf(WebviewActivity.this.countUrl));
                     hashMap2.put(BoxRequestsMetadata.UpdateItemMetadata.BoxMetadataUpdateTask.VALUE, str);
                     WebviewActivity.mListUrl.add(hashMap2);
                     WebviewActivity.mIsFistLoad = false;
                     for (int i2 = 0; i2 < WebviewActivity.mListUrl.size(); i2++) {
-                        EPLog.m313i(((String) ((HashMap) WebviewActivity.mListUrl.get(i2)).get("key")) + " : ", (String) ((HashMap) WebviewActivity.mListUrl.get(i2)).get(BoxRequestsMetadata.UpdateItemMetadata.BoxMetadataUpdateTask.VALUE));
+                        EPLog.i(((String) ((HashMap) WebviewActivity.mListUrl.get(i2)).get("key")) + " : ", (String) ((HashMap) WebviewActivity.mListUrl.get(i2)).get(BoxRequestsMetadata.UpdateItemMetadata.BoxMetadataUpdateTask.VALUE));
                     }
                 } else {
                     WebviewActivity.mIsFistLoad = false;
-                    EPLog.m313i("Link: " + str, " already exist");
+                    EPLog.i("Link: " + str, " already exist");
                 }
                 if (!str.startsWith("file://")) {
                     WebviewActivity webviewActivity4 = WebviewActivity.this;
@@ -214,7 +214,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
         }
 
         public void onReceivedSslError(WebView webView, final SslErrorHandler sslErrorHandler, SslError sslError) {
-            EPLog.m305d(WebviewActivity.TAG, "SSL error: " + sslError);
+            EPLog.d(WebviewActivity.TAG, "SSL error: " + sslError);
             if (!WebviewActivity.this.isFinishing()) {
                 AlertDialog.Builder builder = new AlertDialog.Builder(WebviewActivity.this);
                 builder.setIcon(R.drawable.ic_action_warning);
@@ -308,7 +308,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
                             WebviewActivity webviewActivity = WebviewActivity.this;
                             int unused = webviewActivity.mLastHeight = (((float) webviewActivity.mWebview.getContentHeight()) * access$2000);
                             WebviewActivity.myHandler.sendEmptyMessageDelayed(3, 5000);
-                            EPLog.m305d(WebviewActivity.TAG, "Waiting not change mLastHeight = " + WebviewActivity.mLastHeight);
+                            EPLog.d(WebviewActivity.TAG, "Waiting not change mLastHeight = " + WebviewActivity.mLastHeight);
                             return;
                         } else {
                             WebviewActivity.this.startPreviewWebThread();
@@ -533,7 +533,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
     }
 
     public void onClick(View view) {
-        EPLog.m313i(TAG, "onCLick()");
+        EPLog.i(TAG, "onCLick()");
         if (view.getId() == R.id.btn_clear_url) {
             if (mCanRefresh) {
                 mWebview.reload();
@@ -597,12 +597,12 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
             switch (itemId) {
                 case R.id.go_back /*2131231074*/:
                     String linkOfIndex = getLinkOfIndex(getIndexOfLink(this.strUrlIn) - 1);
-                    EPLog.m313i("Comeback to : ", linkOfIndex);
+                    EPLog.i("Comeback to : ", linkOfIndex);
                     mWebview.loadUrl(linkOfIndex);
                     break;
                 case R.id.go_next /*2131231075*/:
                     String linkOfIndex2 = getLinkOfIndex(getIndexOfLink(this.strUrlIn) + 1);
-                    EPLog.m313i("Forward to : ", linkOfIndex2);
+                    EPLog.i("Forward to : ", linkOfIndex2);
                     mWebview.loadUrl(linkOfIndex2);
                     break;
             }
@@ -797,7 +797,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
             bitmap.setDensity(i);
             mBitmap = bitmap;
             mExRate = d;
-            EPLog.m313i(WebviewActivity.TAG, "expand => " + d);
+            EPLog.i(WebviewActivity.TAG, "expand => " + d);
             return true;
         }
 
@@ -877,7 +877,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
         mAddImageView.clear();
         float scaleValue = getScaleValue();
         Rect rect = new Rect(0, 0, mWebview.getWidth(), (((float) mWebview.getContentHeight()) * scaleValue));
-        EPLog.m313i(TAG, "picture Rect = " + rect.toString() + " currentScale = " + scaleValue);
+        EPLog.i(TAG, "picture Rect = " + rect.toString() + " currentScale = " + scaleValue);
         if (rect.width() > 0 && rect.height() > 0) {
             mImageCreateThread = new ImageCreateThread();
             mImageCreateThread.setPicture(rect);
@@ -1012,7 +1012,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
                 }
 
                 protected void onPostExecute(Void voidR) {
-                    EPLog.m313i(WebviewActivity.TAG, "previewImage::onPostExecute() Share image: " + imagePath.toString());
+                    EPLog.i(WebviewActivity.TAG, "previewImage::onPostExecute() Share image: " + imagePath.toString());
                     WebviewActivity webviewActivity = WebviewActivity.this;
                     Intent unused = webviewActivity.mIntent = new Intent(webviewActivity, ActivityViewImageSelect.class);
                     WebviewActivity.mIntent.putExtra(ActivityViewImageSelect.LIST_ALBUM, imagePath);
@@ -1024,7 +1024,7 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
                 }
 
                 protected void onCancelled() {
-                    EPLog.m313i(WebviewActivity.TAG, "Cancel: OK");
+                    EPLog.i(WebviewActivity.TAG, "Cancel: OK");
                     if (WebviewActivity.this.checkImage) {
                         WebviewActivity.this.finish();
                     }
@@ -1103,15 +1103,15 @@ public class WebviewActivity extends ActivityIACommon implements CommonDefine, V
     }
 
     protected void onActivityResult(int i, int i2, Intent intent) {
-        EPLog.m305d("onActivityResult : requestCode = ", String.valueOf(i));
+        EPLog.d("onActivityResult : requestCode = ", String.valueOf(i));
         super.onActivityResult(i, i2, intent);
         switch (i) {
             case 2:
-                EPLog.m305d("onActivityResult : ACTION_PRINT_WEB = ", String.valueOf(this.isCustomAction));
+                EPLog.d("onActivityResult : ACTION_PRINT_WEB = ", String.valueOf(this.isCustomAction));
                 mAddImageView.clear();
                 ExternalFileUtils.getInstance(this).initTempViewDir();
                 if (this.isCustomAction) {
-                    EPLog.m305d("onActivityResult : resultCode = ", String.valueOf(i2));
+                    EPLog.d("onActivityResult : resultCode = ", String.valueOf(i2));
                     setResult(i2);
                     finish();
                     return;

+ 2 - 2
app/src/main/java/epson/print/copy/ActivityBase.java

@@ -526,14 +526,14 @@ class ActivityBase extends ActivityIACommon {
             this.presettings = ActivityBase.this.getSharedPreferences(CommonDefine.PREFS_INFO_COPY, 0);
             if (eCopyOptionItem.getChoiceType() == ECopyOptionItem.ECopyOptionItemChoiceType.ChoiceArray) {
                 String access$000 = ActivityBase.this.TAG;
-                EPLog.m313i(access$000, "cursetting:" + eCopyOptionItem.getSelectedChoice().name());
+                EPLog.i(access$000, "cursetting:" + eCopyOptionItem.getSelectedChoice().name());
                 this.editer = this.presettings.edit();
                 this.editer.putString(eCopyOptionItemKey.name(), eCopyOptionItem.getSelectedChoice().getParam().toString());
                 this.editer.commit();
                 return;
             }
             String access$0002 = ActivityBase.this.TAG;
-            EPLog.m313i(access$0002, "cursetting:" + String.valueOf(eCopyOptionItem.getSelectedValue()));
+            EPLog.i(access$0002, "cursetting:" + String.valueOf(eCopyOptionItem.getSelectedValue()));
             this.editer = this.presettings.edit();
             this.editer.putInt(eCopyOptionItemKey.name(), eCopyOptionItem.getSelectedValue());
             this.editer.commit();

+ 18 - 18
app/src/main/java/epson/print/copy/CopyActivity.java

@@ -56,16 +56,16 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
     private RadioGroup mCopyTypeGroup;
     Handler mHandler = new Handler(new Handler.Callback() {
         public boolean handleMessage(Message message) {
-            EPLog.m313i(CopyActivity.this.TAG, "HandlerCallback");
+            EPLog.i(CopyActivity.this.TAG, "HandlerCallback");
             switch (message.what) {
                 case 0:
-                    EPLog.m313i(CopyActivity.this.TAG, "PROBE_PRINTER");
+                    EPLog.i(CopyActivity.this.TAG, "PROBE_PRINTER");
                     CopyActivity copyActivity = CopyActivity.this;
                     ProbePrinter unused = copyActivity.task = new ProbePrinter();
                     CopyActivity.this.task.execute(new Void[0]);
                     return true;
                 case 1:
-                    EPLog.m313i(CopyActivity.this.TAG, "COMM_ERROR");
+                    EPLog.i(CopyActivity.this.TAG, "COMM_ERROR");
                     CopyActivity copyActivity2 = CopyActivity.this;
                     ActivityBase.errorDialog unused2 = copyActivity2.errordialog = new ActivityBase.errorDialog(copyActivity2);
                     CopyActivity.this.errordialog.showErrorDialog(CopyActivity.this.getString(R.string.EPS_PRNERR_COMM_TITLE), CopyActivity.this.getString(R.string.EPS_PRNERR_COMM5), ActivityBase.DialogButtons.Ok, new ActivityBase.IClose() {
@@ -75,7 +75,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                     });
                     return true;
                 case 2:
-                    EPLog.m313i(CopyActivity.this.TAG, "UPDATE_SETTING");
+                    EPLog.i(CopyActivity.this.TAG, "UPDATE_SETTING");
                     if (CopyActivity.this.optionContext == null) {
                         CopyActivity.this.fetchCopyOptionContext();
                         return true;
@@ -266,7 +266,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                 return;
             case R.id.copy_button /*2131230948*/:
                 String str = this.TAG;
-                EPLog.m313i(str, "NOW_PRINTER:" + printerId);
+                EPLog.i(str, "NOW_PRINTER:" + printerId);
                 this.presettings.saveCopyOptions(this.copyComponent.getCopyOptionItems());
                 this.copyProcess = new CopyProcess(this);
                 this.copyProcess.startCopy(getApplicationContext());
@@ -392,37 +392,37 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             switch (key) {
                 case ColorEffectsType:
                     String str = this.TAG;
-                    EPLog.m313i(str, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
+                    EPLog.i(str, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_color_info, next);
                     break;
                 case ScanContentType:
                     String str2 = this.TAG;
-                    EPLog.m313i(str2, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
+                    EPLog.i(str2, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_document_type_info, next);
                     break;
                 case PrintMediaType:
                     String str3 = this.TAG;
-                    EPLog.m313i(str3, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
+                    EPLog.i(str3, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_paper_type_info, next);
                     break;
                 case PrintMediaSize:
                     String str4 = this.TAG;
-                    EPLog.m313i(str4, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
+                    EPLog.i(str4, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_paper_size_info, next);
                     break;
                 case PrintMediaSource:
                     String str5 = this.TAG;
-                    EPLog.m313i(str5, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
+                    EPLog.i(str5, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_paper_source_info, next);
                     break;
                 case PrintQuality:
                     String str6 = this.TAG;
-                    EPLog.m313i(str6, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
+                    EPLog.i(str6, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_quality_info, next);
                     break;
                 case XScale:
                     String str7 = this.TAG;
-                    EPLog.m313i(str7, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
+                    EPLog.i(str7, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_scale_info, next);
                     break;
                 case XDensity:
@@ -536,7 +536,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
 
         /* access modifiers changed from: protected */
         public Boolean doInBackground(Void... voidArr) {
-            EPLog.m313i(CopyActivity.this.TAG, "ProbePrinter doInBackground");
+            EPLog.i(CopyActivity.this.TAG, "ProbePrinter doInBackground");
             this.mRepeatCopyAvailable = false;
             if ((CopyActivity.this.printerLocation != 1 && CopyActivity.this.printerLocation != 3) || ActivityBase.printerId == null) {
                 return false;
@@ -547,14 +547,14 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             }
             int doSetPrinter = CopyActivity.this.mPrinter.doSetPrinter();
             String access$200 = CopyActivity.this.TAG;
-            EPLog.m313i(access$200, "Set Printer result: " + doSetPrinter);
+            EPLog.i(access$200, "Set Printer result: " + doSetPrinter);
             if (doSetPrinter != 0) {
                 return false;
             }
             CopyActivity copyActivity = CopyActivity.this;
             String unused = copyActivity.ipAdress = copyActivity.mPrinter.doGetIp();
             String access$2002 = CopyActivity.this.TAG;
-            EPLog.m313i(access$2002, "IPAdress : " + CopyActivity.this.ipAdress);
+            EPLog.i(access$2002, "IPAdress : " + CopyActivity.this.ipAdress);
             CopyActivity copyActivity2 = CopyActivity.this;
             copyActivity2.bProbedPrinter = true;
             copyActivity2.systemSettings = new ECopyComponent.ICopySystemSettings() {
@@ -564,7 +564,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
 
                 public String getPrinterIPAddress() {
                     String access$200 = CopyActivity.this.TAG;
-                    EPLog.m313i(access$200, "getPrinterIPAddress : " + CopyActivity.this.ipAdress);
+                    EPLog.i(access$200, "getPrinterIPAddress : " + CopyActivity.this.ipAdress);
                     return CopyActivity.this.ipAdress;
                 }
             };
@@ -577,14 +577,14 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
 
         /* access modifiers changed from: protected */
         public void onCancelled() {
-            EPLog.m313i(CopyActivity.this.TAG, "ProbePrinter onCancelled");
+            EPLog.i(CopyActivity.this.TAG, "ProbePrinter onCancelled");
             super.onCancelled();
             CopyActivity.this.mPrinter.doCancelFindPrinter();
         }
 
         /* access modifiers changed from: protected */
         public void onPostExecute(Boolean bool) {
-            EPLog.m313i(CopyActivity.this.TAG, "ProbePrinter onPostExecute");
+            EPLog.i(CopyActivity.this.TAG, "ProbePrinter onPostExecute");
             CopyActivity.this.changeRepeatCopyButtonState(this.mRepeatCopyAvailable);
             if (bool.booleanValue()) {
                 CopyActivity.this.mHandler.sendEmptyMessage(2);

+ 2 - 2
app/src/main/java/epson/print/copy/CopyScaleActivity.java

@@ -34,7 +34,7 @@ public class CopyScaleActivity extends ActivityBase {
 
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        EPLog.m313i(this.TAG, "onCreate");
+        EPLog.i(this.TAG, "onCreate");
         setContentView((int) R.layout.copy_scale);
         Intent intent = getIntent();
         if (intent != null) {
@@ -55,7 +55,7 @@ public class CopyScaleActivity extends ActivityBase {
     }
 
     private void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
-        EPLog.m313i(this.TAG, "buildCopyOptions");
+        EPLog.i(this.TAG, "buildCopyOptions");
         Iterator<ECopyOptionItem> it = arrayList.iterator();
         while (it.hasNext()) {
             ECopyOptionItem next = it.next();

+ 2 - 2
app/src/main/java/epson/print/copy/CopySettingActivity.java

@@ -28,7 +28,7 @@ public class CopySettingActivity extends ActivityBase {
 
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        EPLog.m313i(this.TAG, "onCreate");
+        EPLog.i(this.TAG, "onCreate");
         setContentView((int) R.layout.copy_setting);
         Intent intent = getIntent();
         if (intent != null) {
@@ -59,7 +59,7 @@ public class CopySettingActivity extends ActivityBase {
     }
 
     private void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
-        EPLog.m313i(this.TAG, "buildCopyOptions");
+        EPLog.i(this.TAG, "buildCopyOptions");
         Iterator<ECopyOptionItem> it = arrayList.iterator();
         while (it.hasNext()) {
             ECopyOptionItem next = it.next();

+ 7 - 7
app/src/main/java/epson/print/ecclient/HttpApache.java

@@ -42,7 +42,7 @@ public class HttpApache extends HttpAccess {
             dispHttpRes("get return :: <" + this.mHttpRetCode + "> '" + this.mResString + "'\n");
             return 0;
         } catch (Exception e) {
-            EPLog.m318w("epson_connect", "error in HttpGet: " + e.toString());
+            EPLog.w("epson_connect", "error in HttpGet: " + e.toString());
             return -1100;
         }
     }
@@ -64,7 +64,7 @@ public class HttpApache extends HttpAccess {
             dispHttpRes("post return :: <" + this.mHttpRetCode + "> '" + this.mResString + "'\n");
             return 0;
         } catch (Exception e) {
-            EPLog.m318w("epson_connect", "error in HttpPost: " + e.toString());
+            EPLog.w("epson_connect", "error in HttpPost: " + e.toString());
             return -1100;
         }
     }
@@ -85,7 +85,7 @@ public class HttpApache extends HttpAccess {
             IAHttpClient.HttpResponse executeFile = this.mHttpClient.executeFile(httpPost);
             int responseCode = executeFile.getResponseCode();
             if (responseCode != 200) {
-                EPLog.m318w("epson_connect", "error in PostFile: status = <" + responseCode + ">");
+                EPLog.w("epson_connect", "error in PostFile: status = <" + responseCode + ">");
                 return -1100;
             }
             this.mResString = executeFile.getEntity().toString(CharEncoding.UTF_8);
@@ -93,7 +93,7 @@ public class HttpApache extends HttpAccess {
             dispHttpRes("post file return :: <" + this.mHttpRetCode + "> '" + this.mResString + "'\n");
             return 0;
         } catch (Exception e) {
-            EPLog.m318w("epson_connect", "exception in HttpPost: " + e.toString());
+            EPLog.w("epson_connect", "exception in HttpPost: " + e.toString());
             return -1100;
         }
     }
@@ -111,20 +111,20 @@ public class HttpApache extends HttpAccess {
             httpGet.setEntityFile(str2, 0, 0);
             IAHttpClient.HttpResponse executeFile = iAHttpClient.executeFile(httpGet);
             if (200 != executeFile.getResponseCode()) {
-                EPLog.m318w("epson_connect", "error in HttpGet(): ");
+                EPLog.w("epson_connect", "error in HttpGet(): ");
                 return -1100;
             }
             this.mHttpRetCode = executeFile.getResponseCode();
             dispHttpRes("getFile return :: <" + this.mHttpRetCode + ">\n");
             return 0;
         } catch (Exception e) {
-            EPLog.m318w("epson_connect", "error in HttpGet: " + e.toString());
+            EPLog.w("epson_connect", "error in HttpGet: " + e.toString());
             return -1100;
         }
     }
 
     public void cancel() {
-        EPLog.m313i("epson_connect", "cancel called()");
+        EPLog.i("epson_connect", "cancel called()");
         this.mCanceled = true;
         shutdown();
     }

+ 7 - 7
app/src/main/java/epson/print/imgsel/ImageThumbnailTask.java

@@ -28,21 +28,21 @@ public class ImageThumbnailTask extends AsyncTask<Void, ImageItem, Void> impleme
     /* access modifiers changed from: protected */
     public Void doInBackground(Void... voidArr) {
         Bitmap bitmap;
-        EPLog.m305d(TAG, "Enter doInBackground");
+        EPLog.d(TAG, "Enter doInBackground");
         ContentResolver resolver = getResolver();
         while (true) {
             ImageItem first = getFirst();
             if ((first != null || !this.finish) && !isCancelled()) {
                 if (first == null) {
                     try {
-                        EPLog.m305d(TAG, "Wait doInBackground");
+                        EPLog.d(TAG, "Wait doInBackground");
                         Thread.sleep(100);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
                     }
                 } else {
                     try {
-                        EPLog.m305d(TAG, "createThumbnail " + first.getPath());
+                        EPLog.d(TAG, "createThumbnail " + first.getPath());
                         bitmap = AltThumbnailCache.createThumbnail(first.getPath(), resolver, first.getDatabaseId());
                     } catch (IOException e2) {
                         e2.printStackTrace();
@@ -50,19 +50,19 @@ public class ImageThumbnailTask extends AsyncTask<Void, ImageItem, Void> impleme
                     }
                     publishProgress(new ImageItem[]{new ImageItem(bitmap, 0, first.getPath(), first.getDatabaseId())});
                     if (this.suspend) {
-                        EPLog.m305d(TAG, "Enter suspend");
+                        EPLog.d(TAG, "Enter suspend");
                         while (this.suspend && !isCancelled()) {
                             try {
                                 Thread.sleep(1000);
                             } catch (InterruptedException unused) {
                             }
                         }
-                        EPLog.m305d(TAG, "Leave suspend");
+                        EPLog.d(TAG, "Leave suspend");
                     }
                 }
             }
         }
-        EPLog.m305d(TAG, "Leave doInBackground");
+        EPLog.d(TAG, "Leave doInBackground");
         return null;
     }
 
@@ -111,7 +111,7 @@ public class ImageThumbnailTask extends AsyncTask<Void, ImageItem, Void> impleme
             java.lang.String r5 = r5.getPath()     // Catch:{ all -> 0x0038 }
             r2.append(r5)     // Catch:{ all -> 0x0038 }
             java.lang.String r5 = r2.toString()     // Catch:{ all -> 0x0038 }
-            epson.print.Util.EPLog.m305d(r1, r5)     // Catch:{ all -> 0x0038 }
+            epson.print.Util.EPLog.d(r1, r5)     // Catch:{ all -> 0x0038 }
             java.util.LinkedList<epson.print.ImageItem> r5 = r4.imageItems     // Catch:{ all -> 0x0038 }
             java.util.LinkedList<epson.print.ImageItem> r1 = r4.imageItems     // Catch:{ all -> 0x0038 }
             java.lang.Object r0 = r1.remove(r0)     // Catch:{ all -> 0x0038 }

+ 2 - 2
app/src/main/java/epson/print/imgsel/MediaStoreImageFinder.java

@@ -40,7 +40,7 @@ public abstract class MediaStoreImageFinder implements ImageFinder {
     }
 
     private List<ImageFolderInfo> getImageDirInfo(Cursor cursor, ImageFinder.Canceller canceller) {
-        EPLog.m305d(TAG, "Enter getImageDirInfo");
+        EPLog.d(TAG, "Enter getImageDirInfo");
         long currentTimeMillis = System.currentTimeMillis();
         int columnIndexOrThrow = cursor.getColumnIndexOrThrow("_data");
         int columnIndexOrThrow2 = cursor.getColumnIndexOrThrow("_id");
@@ -75,7 +75,7 @@ public abstract class MediaStoreImageFinder implements ImageFinder {
             }
             if (!cursor.moveToNext()) {
                 long currentTimeMillis2 = System.currentTimeMillis();
-                EPLog.m305d(TAG, "Leave getImageDirInfo time = " + (currentTimeMillis2 - currentTimeMillis) + " msec");
+                EPLog.d(TAG, "Leave getImageDirInfo time = " + (currentTimeMillis2 - currentTimeMillis) + " msec");
                 return convertTempMapToSortedList(hashMap);
             }
         }

+ 3 - 3
app/src/main/java/epson/print/pdf/pdfRender.java

@@ -192,7 +192,7 @@ public class pdfRender implements CommonDefine {
             try {
                 float GetPageSizeX = (float) adobePdfContainer.GetPageSizeX(i);
                 float GetPageSizeY = (float) this.mPdfFile.GetPageSizeY(i);
-                EPLog.m313i(TAG, new File(this.mPdfFilename).getName() + " - " + i + CommonDefine.SLASH + this.mTotalPage + ": " + GetPageSizeX + "x" + GetPageSizeY);
+                EPLog.i(TAG, new File(this.mPdfFilename).getName() + " - " + i + CommonDefine.SLASH + this.mTotalPage + ": " + GetPageSizeX + "x" + GetPageSizeY);
                 if (i == 1) {
                     if (GetPageSizeX > GetPageSizeY) {
                         this.mRotate = true;
@@ -215,7 +215,7 @@ public class pdfRender implements CommonDefine {
                 }
                 float f5 = GetPageSizeX * f4;
                 float f6 = f4 * GetPageSizeY;
-                EPLog.m313i(TAG, "scaledWidth = " + f5 + ",scaledHeight = " + f6);
+                EPLog.i(TAG, "scaledWidth = " + f5 + ",scaledHeight = " + f6);
                 System.gc();
                 this.mConvertedName = "";
                 if (i2 != 1) {
@@ -336,7 +336,7 @@ public class pdfRender implements CommonDefine {
             while (this.backgroundThread != null && this.backgroundThread.isAlive()) {
                 try {
                     Thread.sleep(2000);
-                    EPLog.m305d("Convert Preview", "convert4Print shutdown...");
+                    EPLog.d("Convert Preview", "convert4Print shutdown...");
                 } catch (InterruptedException | NullPointerException unused) {
                     return;
                 }

+ 2 - 2
app/src/main/java/epson/print/rpcopy/ActivityBase.java

@@ -531,14 +531,14 @@ class ActivityBase extends ActivityIACommon {
             this.presettings = getPreferences();
             if (eCopyOptionItem.getChoiceType() == ECopyOptionItem.ECopyOptionItemChoiceType.ChoiceArray) {
                 String access$000 = ActivityBase.this.TAG;
-                EPLog.m313i(access$000, "cursetting:" + eCopyOptionItem.getSelectedChoice().name());
+                EPLog.i(access$000, "cursetting:" + eCopyOptionItem.getSelectedChoice().name());
                 this.editer = this.presettings.edit();
                 this.editer.putString(eCopyOptionItemKey.name(), eCopyOptionItem.getSelectedChoice().getParam().toString());
                 this.editer.commit();
                 return;
             }
             String access$0002 = ActivityBase.this.TAG;
-            EPLog.m313i(access$0002, "cursetting:" + String.valueOf(eCopyOptionItem.getSelectedValue()));
+            EPLog.i(access$0002, "cursetting:" + String.valueOf(eCopyOptionItem.getSelectedValue()));
             this.editer = this.presettings.edit();
             this.editer.putInt(eCopyOptionItemKey.name(), eCopyOptionItem.getSelectedValue());
             this.editer.commit();

+ 17 - 17
app/src/main/java/epson/print/rpcopy/CopyActivity.java

@@ -52,16 +52,16 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
     public String ipAdress;
     Handler mHandler = new Handler(new Handler.Callback() {
         public boolean handleMessage(Message message) {
-            EPLog.m313i(CopyActivity.this.TAG, "HandlerCallback");
+            EPLog.i(CopyActivity.this.TAG, "HandlerCallback");
             switch (message.what) {
                 case 0:
-                    EPLog.m313i(CopyActivity.this.TAG, "PROBE_PRINTER");
+                    EPLog.i(CopyActivity.this.TAG, "PROBE_PRINTER");
                     CopyActivity copyActivity = CopyActivity.this;
                     ProbePrinter unused = copyActivity.task = new ProbePrinter();
                     CopyActivity.this.task.execute(new Void[0]);
                     return true;
                 case 1:
-                    EPLog.m313i(CopyActivity.this.TAG, "COMM_ERROR");
+                    EPLog.i(CopyActivity.this.TAG, "COMM_ERROR");
                     CopyActivity copyActivity2 = CopyActivity.this;
                     ActivityBase.errorDialog unused2 = copyActivity2.errordialog = new ActivityBase.errorDialog(copyActivity2);
                     CopyActivity.this.errordialog.showErrorDialog(CopyActivity.this.getString(R.string.EPS_PRNERR_COMM_TITLE), CopyActivity.this.getString(R.string.EPS_PRNERR_COMM5), ActivityBase.DialogButtons.Ok, new ActivityBase.IClose() {
@@ -71,7 +71,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                     });
                     return true;
                 case 2:
-                    EPLog.m313i(CopyActivity.this.TAG, "UPDATE_SETTING");
+                    EPLog.i(CopyActivity.this.TAG, "UPDATE_SETTING");
                     if (CopyActivity.this.mECopyOptionContext == null) {
                         CopyActivity.this.fetchCopyOptionContext();
                         return true;
@@ -281,7 +281,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
                 return;
             case R.id.copy_button /*2131230948*/:
                 String str = this.TAG;
-                EPLog.m313i(str, "NOW_PRINTER:" + printerId);
+                EPLog.i(str, "NOW_PRINTER:" + printerId);
                 this.presettings.saveCopyOptions(this.copyComponent.getCopyOptionItems());
                 this.copyProcess = new CopyProcess(this);
                 this.copyProcess.startCopy(getApplicationContext());
@@ -434,27 +434,27 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             switch (key) {
                 case ColorEffectsType:
                     String str = this.TAG;
-                    EPLog.m313i(str, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
+                    EPLog.i(str, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_color_info, next);
                     break;
                 case PrintMediaType:
                     String str2 = this.TAG;
-                    EPLog.m313i(str2, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
+                    EPLog.i(str2, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_paper_type_info, next);
                     break;
                 case PrintMediaSize:
                     String str3 = this.TAG;
-                    EPLog.m313i(str3, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
+                    EPLog.i(str3, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_paper_size_info, next);
                     break;
                 case PrintMediaSource:
                     String str4 = this.TAG;
-                    EPLog.m313i(str4, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
+                    EPLog.i(str4, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_paper_source_info, next);
                     break;
                 case PrintQuality:
                     String str5 = this.TAG;
-                    EPLog.m313i(str5, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
+                    EPLog.i(str5, "show " + key.name() + ":" + next.getSelectedChoice() + " setting");
                     updateSetting(R.id.copy_quality_info, next);
                     break;
                 case XDensity:
@@ -486,7 +486,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
     private void updateSetting(int i, ECopyOptionItem eCopyOptionItem) {
         TextView textView = (TextView) this.mLayout.findViewById(i);
         if (eCopyOptionItem.getSelectedChoice() == null) {
-            EPLog.m318w("CopyActivity", "updateSetting() choice == null");
+            EPLog.w("CopyActivity", "updateSetting() choice == null");
         } else {
             textView.setText(getDisplayString(eCopyOptionItem.getSelectedChoice().name()));
         }
@@ -578,7 +578,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
 
         /* access modifiers changed from: protected */
         public Boolean doInBackground(Void... voidArr) {
-            EPLog.m313i(CopyActivity.this.TAG, "ProbePrinter doInBackground");
+            EPLog.i(CopyActivity.this.TAG, "ProbePrinter doInBackground");
             if ((CopyActivity.this.printerLocation != 1 && CopyActivity.this.printerLocation != 3) || ActivityBase.printerId == null) {
                 return false;
             }
@@ -588,14 +588,14 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
             }
             int doSetPrinter = CopyActivity.this.mPrinter.doSetPrinter();
             String access$200 = CopyActivity.this.TAG;
-            EPLog.m313i(access$200, "Set Printer result: " + doSetPrinter);
+            EPLog.i(access$200, "Set Printer result: " + doSetPrinter);
             if (doSetPrinter != 0) {
                 return false;
             }
             CopyActivity copyActivity = CopyActivity.this;
             String unused = copyActivity.ipAdress = copyActivity.mPrinter.doGetIp();
             String access$2002 = CopyActivity.this.TAG;
-            EPLog.m313i(access$2002, "IPAdress : " + CopyActivity.this.ipAdress);
+            EPLog.i(access$2002, "IPAdress : " + CopyActivity.this.ipAdress);
             CopyActivity copyActivity2 = CopyActivity.this;
             copyActivity2.bProbedPrinter = true;
             copyActivity2.systemSettings = new ECopyComponent.ICopySystemSettings() {
@@ -605,7 +605,7 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
 
                 public String getPrinterIPAddress() {
                     String access$200 = CopyActivity.this.TAG;
-                    EPLog.m313i(access$200, "getPrinterIPAddress : " + CopyActivity.this.ipAdress);
+                    EPLog.i(access$200, "getPrinterIPAddress : " + CopyActivity.this.ipAdress);
                     return CopyActivity.this.ipAdress;
                 }
             };
@@ -617,14 +617,14 @@ public class CopyActivity extends ActivityBase implements View.OnClickListener {
 
         /* access modifiers changed from: protected */
         public void onCancelled() {
-            EPLog.m313i(CopyActivity.this.TAG, "ProbePrinter onCancelled");
+            EPLog.i(CopyActivity.this.TAG, "ProbePrinter onCancelled");
             super.onCancelled();
             CopyActivity.this.mPrinter.doCancelFindPrinter();
         }
 
         /* access modifiers changed from: protected */
         public void onPostExecute(Boolean bool) {
-            EPLog.m313i(CopyActivity.this.TAG, "ProbePrinter onPostExecute");
+            EPLog.i(CopyActivity.this.TAG, "ProbePrinter onPostExecute");
             if (bool.booleanValue()) {
                 CopyActivity.this.mHandler.sendEmptyMessage(2);
             } else {

+ 2 - 2
app/src/main/java/epson/print/rpcopy/CopySettingActivity.java

@@ -28,7 +28,7 @@ public class CopySettingActivity extends ActivityBase {
 
     public void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        EPLog.m313i(this.TAG, "onCreate");
+        EPLog.i(this.TAG, "onCreate");
         setContentView((int) R.layout.copy_setting);
         Intent intent = getIntent();
         if (intent != null) {
@@ -59,7 +59,7 @@ public class CopySettingActivity extends ActivityBase {
     }
 
     private void buildCopyOptions(ArrayList<ECopyOptionItem> arrayList) {
-        EPLog.m313i(this.TAG, "buildCopyOptions");
+        EPLog.i(this.TAG, "buildCopyOptions");
         Iterator<ECopyOptionItem> it = arrayList.iterator();
         while (it.hasNext()) {
             ECopyOptionItem next = it.next();

+ 3 - 3
app/src/main/java/epson/print/screen/ActivityIpPrinterSetting.java

@@ -43,7 +43,7 @@ public class ActivityIpPrinterSetting extends ActivityIACommon {
             Bundle data = message.getData();
             int i = message.what;
             if (i == 0) {
-                EPLog.m318w(ActivityIpPrinterSetting.TAG, "Recieve ADD_PRINTER");
+                EPLog.w(ActivityIpPrinterSetting.TAG, "Recieve ADD_PRINTER");
                 ActivityIpPrinterSetting.this.printerInfo.printerName = data.getString("name");
                 ActivityIpPrinterSetting.this.printerInfo.printerID = data.getString("id");
                 ActivityIpPrinterSetting.this.printerInfo.printerSerialNo = data.getString("serial_no");
@@ -51,7 +51,7 @@ public class ActivityIpPrinterSetting extends ActivityIACommon {
             } else if (i != 8) {
                 return false;
             } else {
-                EPLog.m318w(ActivityIpPrinterSetting.TAG, "Recieve ADD_SCANNER");
+                EPLog.w(ActivityIpPrinterSetting.TAG, "Recieve ADD_SCANNER");
                 ActivityIpPrinterSetting.this.printerInfo.scannerID = data.getString("id");
                 return false;
             }
@@ -175,7 +175,7 @@ public class ActivityIpPrinterSetting extends ActivityIACommon {
                         ActivityIpPrinterSetting.mScanner.escanWrapperReleaseDriver();
                     }
                     if (probeScannerByIp == -1306) {
-                        EPLog.m318w(ActivityIpPrinterSetting.TAG, "eScanLib return ESCAN_ERR_SCANNER_NOT_USEFUL");
+                        EPLog.w(ActivityIpPrinterSetting.TAG, "eScanLib return ESCAN_ERR_SCANNER_NOT_USEFUL");
                         probeScannerByIp = 0;
                     }
                     return Integer.valueOf(probeScannerByIp);

+ 5 - 5
app/src/main/java/epson/print/screen/PaperSourceInfo.java

@@ -32,7 +32,7 @@ public class PaperSourceInfo {
     }
 
     public void start(Context context, Handler handler) {
-        EPLog.m313i(TAG, "call start()");
+        EPLog.i(TAG, "call start()");
         if (this.paparInfoTask == null) {
             this.paparInfoTask = new PaparInfoTask();
             this.paparInfoTask.execute(new Object[]{context, handler});
@@ -40,7 +40,7 @@ public class PaperSourceInfo {
     }
 
     public void stop() {
-        EPLog.m313i(TAG, "call stop()");
+        EPLog.i(TAG, "call stop()");
         if (this.paparInfoTask != null) {
             this.mPrinter.doCancelFindPrinter();
             this.paparInfoTask.cancel(true);
@@ -113,7 +113,7 @@ public class PaperSourceInfo {
                 r8.append(r9)     // Catch:{ InterruptedException -> 0x0141 }
                 r8.append(r1)     // Catch:{ InterruptedException -> 0x0141 }
                 java.lang.String r1 = r8.toString()     // Catch:{ InterruptedException -> 0x0141 }
-                epson.print.Util.EPLog.m313i(r7, r1)     // Catch:{ InterruptedException -> 0x0141 }
+                epson.print.Util.EPLog.i(r7, r1)     // Catch:{ InterruptedException -> 0x0141 }
                 java.lang.Thread.sleep(r5)     // Catch:{ InterruptedException -> 0x0141 }
                 goto L_0x0025
             L_0x008b:
@@ -152,7 +152,7 @@ public class PaperSourceInfo {
                 r9 = r1[r2]     // Catch:{ InterruptedException -> 0x0141 }
                 r8.append(r9)     // Catch:{ InterruptedException -> 0x0141 }
                 java.lang.String r8 = r8.toString()     // Catch:{ InterruptedException -> 0x0141 }
-                epson.print.Util.EPLog.m313i(r7, r8)     // Catch:{ InterruptedException -> 0x0141 }
+                epson.print.Util.EPLog.i(r7, r8)     // Catch:{ InterruptedException -> 0x0141 }
                 if (r4 >= r2) goto L_0x00e5
                 goto L_0x0142
             L_0x00e5:
@@ -196,7 +196,7 @@ public class PaperSourceInfo {
                 r1 = r1[r0]     // Catch:{ InterruptedException -> 0x0141 }
                 r7.append(r1)     // Catch:{ InterruptedException -> 0x0141 }
                 java.lang.String r1 = r7.toString()     // Catch:{ InterruptedException -> 0x0141 }
-                epson.print.Util.EPLog.m313i(r4, r1)     // Catch:{ InterruptedException -> 0x0141 }
+                epson.print.Util.EPLog.i(r4, r1)     // Catch:{ InterruptedException -> 0x0141 }
             L_0x013c:
                 java.lang.Thread.sleep(r5)     // Catch:{ InterruptedException -> 0x0141 }
                 goto L_0x008b

+ 7 - 7
app/src/main/java/epson/print/screen/PrintProgress.java

@@ -424,7 +424,7 @@ public class PrintProgress extends Activity implements CommonDefine {
                 boolean r4 = r4.mCanceled
                 r0.append(r4)
                 java.lang.String r0 = r0.toString()
-                epson.print.Util.EPLog.m305d(r10, r0)
+                epson.print.Util.EPLog.d(r10, r0)
                 epson.print.service.IEpsonService r10 = epson.print.screen.PrintProgress.mEpsonService
                 if (r10 == 0) goto L_0x032b
                 java.lang.Object r10 = epson.print.screen.PrintProgress.mLock     // Catch:{ RemoteException -> 0x02fd }
@@ -457,7 +457,7 @@ public class PrintProgress extends Activity implements CommonDefine {
                 if (r10 != 0) goto L_0x02df
                 java.lang.String r10 = "PrintProgress"
                 java.lang.String r0 = "message FINISH: mEpsonService.confirmCancel(true) call"
-                epson.print.Util.EPLog.m305d(r10, r0)     // Catch:{ RemoteException -> 0x02fd }
+                epson.print.Util.EPLog.d(r10, r0)     // Catch:{ RemoteException -> 0x02fd }
                 epson.print.service.IEpsonService r10 = epson.print.screen.PrintProgress.mEpsonService     // Catch:{ RemoteException -> 0x02fd }
                 r10.confirmCancel(r2)     // Catch:{ RemoteException -> 0x02fd }
                 r0 = 1
@@ -468,7 +468,7 @@ public class PrintProgress extends Activity implements CommonDefine {
                 if (r10 == 0) goto L_0x0301
                 java.lang.String r10 = "PrintProgress"
                 java.lang.String r0 = "on message FINISH: sendEmptyMessageDelayed(FINISH...)"
-                epson.print.Util.EPLog.m305d(r10, r0)     // Catch:{ RemoteException -> 0x02fd }
+                epson.print.Util.EPLog.d(r10, r0)     // Catch:{ RemoteException -> 0x02fd }
                 epson.print.screen.PrintProgress r10 = epson.print.screen.PrintProgress.this     // Catch:{ RemoteException -> 0x02fd }
                 android.os.Handler r10 = r10.mHandler     // Catch:{ RemoteException -> 0x02fd }
                 r4 = 500(0x1f4, double:2.47E-321)
@@ -531,7 +531,7 @@ public class PrintProgress extends Activity implements CommonDefine {
                 r0.append(r1)
                 r0.append(r3)
                 java.lang.String r0 = r0.toString()
-                epson.print.Util.EPLog.m305d(r10, r0)
+                epson.print.Util.EPLog.d(r10, r0)
                 epson.print.screen.PrintProgress r10 = epson.print.screen.PrintProgress.this
                 android.content.Context r10 = r10.context
                 java.lang.String r0 = "printer"
@@ -595,7 +595,7 @@ public class PrintProgress extends Activity implements CommonDefine {
             L_0x03f7:
                 java.lang.String r10 = "Epson"
                 java.lang.String r0 = "Service or resource file not ready, please wait..."
-                epson.print.Util.EPLog.m313i(r10, r0)
+                epson.print.Util.EPLog.i(r10, r0)
                 epson.print.screen.PrintProgress r10 = epson.print.screen.PrintProgress.this
                 android.widget.TextView r10 = r10.mPercent
                 java.lang.StringBuilder r0 = new java.lang.StringBuilder
@@ -841,7 +841,7 @@ public class PrintProgress extends Activity implements CommonDefine {
                     startActivityForResult(intent, 2);
                 }
             }
-            EPLog.m313i("Epson", "printProgress.java: onCreate() finish");
+            EPLog.i("Epson", "printProgress.java: onCreate() finish");
         } catch (ClassCastException unused) {
             finish();
         }
@@ -1042,7 +1042,7 @@ public class PrintProgress extends Activity implements CommonDefine {
                         }
                         boolean unused2 = PrintProgress.this.mWaitEpsonServiceForFinish = true;
                         boolean unused3 = PrintProgress.this.mError = true;
-                        EPLog.m305d("PrintProgress", "cont/cancel dialog. cancel clicked");
+                        EPLog.d("PrintProgress", "cont/cancel dialog. cancel clicked");
                         PrintProgress.this.mHandler.sendEmptyMessage(5);
                     }
                 });

+ 4 - 4
app/src/main/java/epson/print/screen/PrintSetting.java

@@ -174,7 +174,7 @@ public class PrintSetting {
     public void saveSettings() {
         ContentValues contentValues;
         SharedPreferences.Editor editor;
-        EPLog.m305d("PrintSetting", "saveSettings() " + this.kind.name());
+        EPLog.d("PrintSetting", "saveSettings() " + this.kind.name());
         SharedPreferences sharedPreferences = this.settings;
         if (sharedPreferences == null) {
             contentValues = new ContentValues();
@@ -556,7 +556,7 @@ public class PrintSetting {
     }
 
     public void resetPageRange(int i, int i2) {
-        EPLog.m305d("PrintSetting", "resetPrintSettings()");
+        EPLog.d("PrintSetting", "resetPrintSettings()");
         SharedPreferences.Editor edit = this.settings.edit();
         this.printAll = true;
         this.startValue = i;
@@ -568,7 +568,7 @@ public class PrintSetting {
     }
 
     public void resetPrintSettings() {
-        EPLog.m305d("PrintSetting", "resetPrintSettings()");
+        EPLog.d("PrintSetting", "resetPrintSettings()");
         SharedPreferences.Editor edit = this.settings.edit();
         edit.putInt(epson.common.Constants.COPIES, 1);
         edit.putInt(epson.common.Constants.BRIGHTNESS, 0);
@@ -589,7 +589,7 @@ public class PrintSetting {
     }
 
     public void clearSettings() {
-        EPLog.m305d("PrintSetting", "clearSettings()");
+        EPLog.d("PrintSetting", "clearSettings()");
         SharedPreferences.Editor edit = this.settings.edit();
         edit.remove(epson.common.Constants.PAPER_SIZE);
         edit.remove(epson.common.Constants.PAPER_TYPE);

+ 8 - 8
app/src/main/java/epson/print/screen/PrinterFinder.java

@@ -199,20 +199,20 @@ public class PrinterFinder extends ActivityIACommon {
                                         try {
                                             httpResponse = iAHttpClient.execute(httpGet);
                                         } catch (IOException unused) {
-                                            EPLog.m305d("httpResponse", "IOException");
+                                            EPLog.d("httpResponse", "IOException");
                                             httpResponse = null;
                                         }
                                         if (httpResponse != null) {
                                             int responseCode = httpResponse.getResponseCode();
-                                            EPLog.m305d("Response", "res : " + responseCode);
+                                            EPLog.d("Response", "res : " + responseCode);
                                             if (200 == responseCode || (300 <= responseCode && responseCode < 400)) {
                                                 MyPrinter myPrinter = new MyPrinter(data.getString("name"), data.getString(escprLib.PRINTER_IP), data.getString("id"), (String) null);
                                                 myPrinter.setCommonDeviceName(data.getString("common_devicename"));
                                                 return new MyPrinter[]{myPrinter};
                                             } else if (404 == responseCode) {
-                                                EPLog.m305d("Response", "NotFound:" + buildURL);
+                                                EPLog.d("Response", "NotFound:" + buildURL);
                                             } else {
-                                                EPLog.m305d("Response", "Error:" + buildURL);
+                                                EPLog.d("Response", "Error:" + buildURL);
                                             }
                                         }
                                         return null;
@@ -256,7 +256,7 @@ public class PrinterFinder extends ActivityIACommon {
                 case 5:
                     if (!PrinterFinder.this.isDialogOpen) {
                         boolean unused4 = PrinterFinder.this.isDialogOpen = true;
-                        EPLog.m313i("mHandler", "curError = " + PrinterFinder.this.curError);
+                        EPLog.i("mHandler", "curError = " + PrinterFinder.this.curError);
                         PrinterFinder.this.showDialog(0);
                         break;
                     }
@@ -363,12 +363,12 @@ public class PrinterFinder extends ActivityIACommon {
         super.onResume();
         EPLog.m307e("Epson", "PrinterFinder.java call onResume()");
         this.mHandler.sendEmptyMessageDelayed(1, 100);
-        EPLog.m305d("PrinterFinder", "Send CHECK_PRINTER Message.");
+        EPLog.d("PrinterFinder", "Send CHECK_PRINTER Message.");
     }
 
     /* access modifiers changed from: protected */
     public void onPause() {
-        EPLog.m305d("SearchPrinterScr", "onPause");
+        EPLog.d("SearchPrinterScr", "onPause");
         super.onPause();
     }
 
@@ -377,7 +377,7 @@ public class PrinterFinder extends ActivityIACommon {
         if (i != 0) {
             return null;
         }
-        EPLog.m313i("DIALOG_INFORM", "curError = " + this.curError);
+        EPLog.i("DIALOG_INFORM", "curError = " + this.curError);
         int i2 = this.curError;
         if (!(i2 == -1100 && i2 == -11001)) {
             if (Utils.getPrefBoolean(getApplicationContext(), "PrintSetting", CommonDefine.RE_SEARCH)) {

+ 2 - 2
app/src/main/java/epson/print/screen/PrinterInfoDetail.java

@@ -45,7 +45,7 @@ public class PrinterInfoDetail extends ActivityIACommon {
     AbstractListBuilder mBuilder;
     Handler mHandler = new Handler(new Handler.Callback() {
         public boolean handleMessage(Message message) {
-            EPLog.m313i("handleMessage", "msg.what = " + message.what);
+            EPLog.i("handleMessage", "msg.what = " + message.what);
             PrinterInfoDetail printerInfoDetail = PrinterInfoDetail.this;
             PrintSetting printSetting = new PrintSetting(printerInfoDetail, printerInfoDetail.isDocumentSetting ? PrintSetting.Kind.document : PrintSetting.Kind.photo);
             printSetting.loadSettings();
@@ -236,7 +236,7 @@ public class PrinterInfoDetail extends ActivityIACommon {
         this.mBuilder.build();
         this.mBuilder.setResource(Integer.valueOf(getIntent().getExtras().getInt("curValue")));
         this.mBuilder.refresh();
-        EPLog.m313i("buildElements", "id = " + this.f405id);
+        EPLog.i("buildElements", "id = " + this.f405id);
         switch (this.f405id) {
             case R.id.apf_setting_layout /*2131230819*/:
                 setTitle(R.string.apf_setting_title);

+ 7 - 7
app/src/main/java/epson/print/screen/SearchPrinterScr.java

@@ -486,7 +486,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
                 int r1 = r1.curError
                 r0.append(r1)
                 java.lang.String r0 = r0.toString()
-                epson.print.Util.EPLog.m313i(r10, r0)
+                epson.print.Util.EPLog.i(r10, r0)
                 epson.print.screen.SearchPrinterScr r10 = epson.print.screen.SearchPrinterScr.this
                 r10.showDialog(r4)
                 goto L_0x0379
@@ -504,7 +504,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
             L_0x025f:
                 java.lang.String r0 = "SearchPrinterScr"
                 java.lang.String r1 = "cancelSearch for SELECT_PRINTER"
-                epson.print.Util.EPLog.m313i(r0, r1)
+                epson.print.Util.EPLog.i(r0, r1)
                 epson.print.screen.SearchPrinterScr r0 = epson.print.screen.SearchPrinterScr.this
                 r0.interruptSearch()
                 epson.print.screen.SearchPrinterScr r0 = epson.print.screen.SearchPrinterScr.this
@@ -1006,18 +1006,18 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
     /* access modifiers changed from: protected */
     public void onResume() {
         super.onResume();
-        EPLog.m305d(TAG, "onResume()");
+        EPLog.d(TAG, "onResume()");
         this.mActivityForegroundLifetime = true;
         dismissPrinterNotFoundDialog();
         if (this.printer_location == 1) {
             this.mHandler.sendEmptyMessageDelayed(1, 100);
-            EPLog.m305d(TAG, "Send CHECK_PRINTER Message.");
+            EPLog.d(TAG, "Send CHECK_PRINTER Message.");
         }
     }
 
     /* access modifiers changed from: protected */
     public void onPause() {
-        EPLog.m305d(TAG, "onPause()");
+        EPLog.d(TAG, "onPause()");
         super.onPause();
         this.mActivityForegroundLifetime = false;
         interruptSearch();
@@ -1117,7 +1117,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
 
     /* access modifiers changed from: private */
     public void interruptSearch() {
-        EPLog.m305d(TAG, "interruptSearch()");
+        EPLog.d(TAG, "interruptSearch()");
         this.mHandler.removeMessages(1);
         this.mHandler.removeMessages(14);
         this.mHandler.removeMessages(3);
@@ -1192,7 +1192,7 @@ public class SearchPrinterScr extends ActivityIACommon implements CustomTitleDia
         if (i != 0) {
             return null;
         }
-        EPLog.m313i(TAG, "DIALOG_INFORM curError = " + this.curError);
+        EPLog.i(TAG, "DIALOG_INFORM curError = " + this.curError);
         int i2 = this.curError;
         if (i2 == -1100 || i2 == -11001) {
             if (Utils.getPrefBoolean(getApplicationContext(), "PrintSetting", CommonDefine.RE_SEARCH)) {

+ 30 - 30
app/src/main/java/epson/print/screen/SettingScr.java

@@ -151,7 +151,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
 
         public void onNotifyContinueable(int i) throws RemoteException {
             if (!SettingScr.this.mFinishRequested) {
-                EPLog.m313i("IEpsonServiceCallback", "onNotifyContinueable code = " + i);
+                EPLog.i("IEpsonServiceCallback", "onNotifyContinueable code = " + i);
                 if (i == 0) {
                     SettingScr settingScr = SettingScr.this;
                     settingScr.isInfoAvai = true;
@@ -165,7 +165,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
 
         public void onNotifyError(int i, int i2, boolean z) throws RemoteException {
             if (!SettingScr.this.mFinishRequested) {
-                EPLog.m313i("IEpsonServiceCallback", "onNotifyError errorCode = " + i2);
+                EPLog.i("IEpsonServiceCallback", "onNotifyError errorCode = " + i2);
                 SettingScr settingScr = SettingScr.this;
                 settingScr.isInfoAvai = true;
                 int unused = settingScr.lang = settingScr.getPrinterLang();
@@ -222,7 +222,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
                 r14 = this;
                 java.lang.String r0 = "SettingScr"
                 java.lang.String r1 = "handleMessage call setScreenState = false"
-                epson.print.Util.EPLog.m313i(r0, r1)
+                epson.print.Util.EPLog.i(r0, r1)
                 epson.print.screen.SettingScr r0 = epson.print.screen.SettingScr.this
                 r1 = 0
                 java.lang.Boolean r2 = java.lang.Boolean.valueOf(r1)
@@ -275,7 +275,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
             L_0x0047:
                 java.lang.String r15 = "SettingScr"
                 java.lang.String r0 = "default"
-                epson.print.Util.EPLog.m313i(r15, r0)
+                epson.print.Util.EPLog.i(r15, r0)
                 epson.print.screen.SettingScr r15 = epson.print.screen.SettingScr.this
                 android.widget.TextView r15 = r15.printerName
                 epson.print.screen.SettingScr r0 = epson.print.screen.SettingScr.this
@@ -387,7 +387,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
             L_0x014d:
                 java.lang.String r15 = "SettingScr"
                 java.lang.String r0 = "GET_COLOR"
-                epson.print.Util.EPLog.m313i(r15, r0)
+                epson.print.Util.EPLog.i(r15, r0)
                 epson.print.screen.SettingScr r15 = epson.print.screen.SettingScr.this
                 int[] unused = r15.color_info = r7
                 epson.print.screen.SettingScr r15 = epson.print.screen.SettingScr.this     // Catch:{ RemoteException -> 0x018b }
@@ -510,7 +510,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
             L_0x0254:
                 java.lang.String r15 = "SettingScr"
                 java.lang.String r0 = "GET_PAPER_SOURCE"
-                epson.print.Util.EPLog.m313i(r15, r0)
+                epson.print.Util.EPLog.i(r15, r0)
                 epson.print.screen.SettingScr r15 = epson.print.screen.SettingScr.this
                 int[] unused = r15.paper_source_info = r7
                 epson.print.screen.SettingScr r15 = epson.print.screen.SettingScr.this     // Catch:{ RemoteException -> 0x02e2 }
@@ -675,7 +675,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
             L_0x03c7:
                 java.lang.String r15 = "SettingScr"
                 java.lang.String r0 = "GET_QUALITY"
-                epson.print.Util.EPLog.m313i(r15, r0)
+                epson.print.Util.EPLog.i(r15, r0)
                 epson.print.screen.SettingScr r15 = epson.print.screen.SettingScr.this
                 int[] unused = r15.info = r7
                 epson.print.screen.SettingScr r15 = epson.print.screen.SettingScr.this     // Catch:{ RemoteException -> 0x03ef }
@@ -794,7 +794,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
             L_0x04d8:
                 java.lang.String r15 = "SettingScr"
                 java.lang.String r0 = "GET_LAYOUT"
-                epson.print.Util.EPLog.m313i(r15, r0)
+                epson.print.Util.EPLog.i(r15, r0)
                 epson.print.screen.SettingScr r15 = epson.print.screen.SettingScr.this
                 int[] unused = r15.info = r7
                 epson.print.screen.SettingScr r15 = epson.print.screen.SettingScr.this     // Catch:{ RemoteException -> 0x0500 }
@@ -1028,7 +1028,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
             L_0x06f6:
                 java.lang.String r15 = "SettingScr"
                 java.lang.String r3 = "GET_PAPER_TYPE"
-                epson.print.Util.EPLog.m313i(r15, r3)
+                epson.print.Util.EPLog.i(r15, r3)
                 epson.print.screen.SettingScr r15 = epson.print.screen.SettingScr.this
                 int[] unused = r15.info = r7
                 epson.print.screen.SettingScr r15 = epson.print.screen.SettingScr.this     // Catch:{ RemoteException -> 0x077e }
@@ -1331,7 +1331,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
             L_0x09a7:
                 java.lang.String r15 = "SettingScr"
                 java.lang.String r3 = "GET_PAPER_SIZE"
-                epson.print.Util.EPLog.m313i(r15, r3)
+                epson.print.Util.EPLog.i(r15, r3)
                 epson.print.screen.SettingScr r15 = epson.print.screen.SettingScr.this
                 int[] unused = r15.info = r7
                 epson.print.screen.SettingScr r15 = epson.print.screen.SettingScr.this     // Catch:{ RemoteException -> 0x09c3 }
@@ -1669,7 +1669,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
             L_0x0ccb:
                 java.lang.String r15 = "SettingScr"
                 java.lang.String r0 = "GET_DUPLEX"
-                epson.print.Util.EPLog.m313i(r15, r0)
+                epson.print.Util.EPLog.i(r15, r0)
                 epson.print.screen.SettingScr r15 = epson.print.screen.SettingScr.this
                 int[] unused = r15.duplex_info = r7
                 epson.print.screen.SettingScr r15 = epson.print.screen.SettingScr.this     // Catch:{ RemoteException -> 0x0cee }
@@ -1814,7 +1814,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
             L_0x0e17:
                 java.lang.String r15 = "SettingScr"
                 java.lang.String r0 = "get Color setScreenState = true"
-                epson.print.Util.EPLog.m313i(r15, r0)
+                epson.print.Util.EPLog.i(r15, r0)
                 epson.print.screen.SettingScr r15 = epson.print.screen.SettingScr.this
                 android.os.Handler r15 = r15.mHandler
                 r15.sendEmptyMessage(r4)
@@ -2111,10 +2111,10 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
         File savedSupportedMedia = instance.getSavedSupportedMedia();
         File supportedMedia = instance.getSupportedMedia();
         File preSupportedMedia = instance.getPreSupportedMedia();
-        EPLog.m313i("PrintSetting", "call loadSupportedMedia");
+        EPLog.i("PrintSetting", "call loadSupportedMedia");
         try {
             if (!savedSupportedMedia.exists()) {
-                EPLog.m318w("loadSupportedMedia", savedSupportedMedia.getName() + " not exist");
+                EPLog.w("loadSupportedMedia", savedSupportedMedia.getName() + " not exist");
                 return false;
             }
             Utils.copyFile(savedSupportedMedia, supportedMedia);
@@ -2130,11 +2130,11 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
                 Utils.copyFile(savedAreaInfo, preAreaInfo);
                 return true;
             } catch (Exception e) {
-                EPLog.m318w("loadSupportedMedia", "failure " + e.getMessage());
+                EPLog.w("loadSupportedMedia", "failure " + e.getMessage());
                 return false;
             }
         } catch (Exception e2) {
-            EPLog.m318w("loadSupportedMedia", "failure " + e2.getMessage());
+            EPLog.w("loadSupportedMedia", "failure " + e2.getMessage());
             return false;
         }
     }
@@ -2142,7 +2142,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
     /* access modifiers changed from: private */
     public boolean updateSupportedMediaFile(boolean z) {
         ExternalFileUtils instance = ExternalFileUtils.getInstance(this);
-        EPLog.m313i("PrintSetting", "call updateSupportedMedia");
+        EPLog.i("PrintSetting", "call updateSupportedMedia");
         File supportedMedia = instance.getSupportedMedia();
         File preSupportedMedia = instance.getPreSupportedMedia();
         if (z) {
@@ -2172,7 +2172,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
                 if (areaInfo != null && areaInfo.exists()) {
                     areaInfo.delete();
                 }
-                EPLog.m318w("updateSupportedMediaFile", "failure " + e.getMessage());
+                EPLog.w("updateSupportedMediaFile", "failure " + e.getMessage());
                 return false;
             }
         } catch (Exception e2) {
@@ -2182,19 +2182,19 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
             if (preSupportedMedia != null && preSupportedMedia.exists()) {
                 preSupportedMedia.delete();
             }
-            EPLog.m318w("updateSupportedMediaFile", "failure " + e2.getMessage());
+            EPLog.w("updateSupportedMediaFile", "failure " + e2.getMessage());
             return false;
         }
     }
 
     private boolean saveSupportedMediaFile() {
         ExternalFileUtils instance = ExternalFileUtils.getInstance(this);
-        EPLog.m313i("PrintSetting", "call saveSupportedMedia");
+        EPLog.i("PrintSetting", "call saveSupportedMedia");
         File supportedMedia = instance.getSupportedMedia();
         File savedSupportedMedia = instance.getSavedSupportedMedia();
         try {
             if (!supportedMedia.exists()) {
-                EPLog.m318w("updateSupportedMediaFile", supportedMedia.getName() + " not exist");
+                EPLog.w("updateSupportedMediaFile", supportedMedia.getName() + " not exist");
                 return false;
             }
             Utils.copyFile(supportedMedia, savedSupportedMedia);
@@ -2204,21 +2204,21 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
             if (i == 1 || i == 3) {
                 try {
                     if (!areaInfo.exists()) {
-                        EPLog.m318w("updateSupportedMediaFile", areaInfo.getName() + " not exist");
+                        EPLog.w("updateSupportedMediaFile", areaInfo.getName() + " not exist");
                         return false;
                     }
                     Utils.copyFile(areaInfo, savedAreaInfo);
                 } catch (Exception e) {
-                    EPLog.m318w("saveSupportedMediaFile", "failure " + e.getMessage());
+                    EPLog.w("saveSupportedMediaFile", "failure " + e.getMessage());
                     return false;
                 }
             } else {
-                EPLog.m313i("PrintSetting", "delete AreaInfo");
+                EPLog.i("PrintSetting", "delete AreaInfo");
                 instance.removeAreaInfo();
             }
             return true;
         } catch (Exception e2) {
-            EPLog.m318w("saveSupportedMediaFile", "failure " + e2.getMessage());
+            EPLog.w("saveSupportedMediaFile", "failure " + e2.getMessage());
             return false;
         }
     }
@@ -2291,7 +2291,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
     public void onDestroy() {
         super.onDestroy();
         unbindEpsonService();
-        EPLog.m313i("SettingScr", "onDestroy");
+        EPLog.i("SettingScr", "onDestroy");
         this.mPaperSizeType.destructor();
     }
 
@@ -2539,7 +2539,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
     public void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
         String callingPackage = getCallingPackage();
-        EPLog.m313i(callingPackage, "requestCode = " + i + " resultCode = " + i2);
+        EPLog.i(callingPackage, "requestCode = " + i + " resultCode = " + i2);
         if (i != 0) {
             if (i != 4) {
                 if (i != 2) {
@@ -2869,11 +2869,11 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
-            EPLog.m305d("PrintSetting", "getPrinterLang called : ret = " + i);
+            EPLog.d("PrintSetting", "getPrinterLang called : ret = " + i);
             return i;
         }
         i = 1;
-        EPLog.m305d("PrintSetting", "getPrinterLang called : ret = " + i);
+        EPLog.d("PrintSetting", "getPrinterLang called : ret = " + i);
         return i;
     }
 
@@ -2982,7 +2982,7 @@ public class SettingScr extends ActivityIACommon implements View.OnClickListener
 
     /* access modifiers changed from: protected */
     public void onPause() {
-        EPLog.m305d("SettingScr", "onPause");
+        EPLog.d("SettingScr", "onPause");
         super.onPause();
         if (isFinishing()) {
             this.mFinishRequested = true;

+ 36 - 36
app/src/main/java/epson/print/service/EpsonService.java

@@ -136,7 +136,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             String unused2 = EpsonService.this.f407ip = str2;
             int unused3 = EpsonService.this.probeMethod = i;
             if (EpsonService.this.searchingPrinter != null) {
-                EPLog.m305d("EpsonService", "searchPrinters() search intterrupt()");
+                EPLog.d("EpsonService", "searchPrinters() search intterrupt()");
                 EpsonService.this.searchingPrinter.interrupt();
                 try {
                     EpsonService.this.searchingPrinter.join();
@@ -166,7 +166,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             }
             EpsonService.this.searchingPrinter.interrupt();
             try {
-                EPLog.m305d("EpsonService", "searchingPrinter.join() enter");
+                EPLog.d("EpsonService", "searchingPrinter.join() enter");
                 EpsonService.this.searchingPrinter.join(1000);
                 int i = 0;
                 while (true) {
@@ -175,15 +175,15 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                     }
                     int i2 = i + 1;
                     if (i > 60) {
-                        EPLog.m318w("EpsonService", "mSearchThread.join() timeout");
+                        EPLog.w("EpsonService", "mSearchThread.join() timeout");
                         break;
                     }
-                    EPLog.m305d("EpsonService", "retry doCancelFindPrinter() " + i2);
+                    EPLog.d("EpsonService", "retry doCancelFindPrinter() " + i2);
                     EpsonService.this.searchingPrinter.interrupt();
                     EpsonService.this.searchingPrinter.join(1000);
                     i = i2;
                 }
-                EPLog.m305d("EpsonService", "searchingPrinter.join() leave");
+                EPLog.d("EpsonService", "searchingPrinter.join() leave");
             } catch (InterruptedException e) {
                 e.printStackTrace();
             }
@@ -198,13 +198,13 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
 
         public int setCurPrinter(int i) throws RemoteException {
             int i2;
-            EPLog.m305d("EpsonService", "setCurPrinter(): " + i);
+            EPLog.d("EpsonService", "setCurPrinter(): " + i);
             cancelSearchPrinter();
             EPLog.m307e("Epson", "Finish cancelSearchPrinter()");
             synchronized (EpsonService.mLock) {
-                EPLog.m305d("EpsonService", "Start set_printer()");
+                EPLog.d("EpsonService", "Start set_printer()");
                 i2 = EpsonService.this.mEscprLib.set_printer(i);
-                EPLog.m305d("EpsonService", "setCurPrinter: result = " + i2);
+                EPLog.d("EpsonService", "setCurPrinter: result = " + i2);
             }
             return i2;
         }
@@ -435,7 +435,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                                     break;
                                 } else if (defaultPaperSize == paperSize[i2]) {
                                     i8 = paperSize[i2];
-                                    EPLog.m318w("EpsonService", "updatePrinterSettings paperSize = " + i8);
+                                    EPLog.w("EpsonService", "updatePrinterSettings paperSize = " + i8);
                                     i = i2;
                                     break;
                                 } else {
@@ -447,7 +447,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                         }
                         if (i2 >= paperSize.length) {
                             i8 = paperSize[0];
-                            EPLog.m318w("EpsonService", "updatePrinterSettings paperSize = " + i8);
+                            EPLog.w("EpsonService", "updatePrinterSettings paperSize = " + i8);
                             i = 0;
                         }
                         int[] paperType = getPaperType(i);
@@ -473,7 +473,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                                             break;
                                         } else if (defaultPaperType == paperType[i4]) {
                                             i9 = paperType[i4];
-                                            EPLog.m318w("EpsonService", "updatePrinterSettings paperType = " + i9);
+                                            EPLog.w("EpsonService", "updatePrinterSettings paperType = " + i9);
                                             i3 = i4;
                                             break;
                                         } else {
@@ -492,7 +492,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                                                 break;
                                             } else if (code == paperType[i4]) {
                                                 i9 = paperType[i4];
-                                                EPLog.m318w("EpsonService", "updatePrinterSettings paperType = " + i9);
+                                                EPLog.w("EpsonService", "updatePrinterSettings paperType = " + i9);
                                                 i3 = i4;
                                                 break;
                                             } else {
@@ -507,7 +507,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                                                 break;
                                             } else if (code2 == paperType[i4]) {
                                                 i9 = paperType[i4];
-                                                EPLog.m318w("EpsonService", "updatePrinterSettings paperType = " + i9);
+                                                EPLog.w("EpsonService", "updatePrinterSettings paperType = " + i9);
                                                 i3 = i4;
                                                 break;
                                             } else {
@@ -522,7 +522,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                                                     break;
                                                 } else if (code3 == paperType[i4]) {
                                                     i9 = paperType[i4];
-                                                    EPLog.m318w("EpsonService", "updatePrinterSettings paperType = " + i9);
+                                                    EPLog.w("EpsonService", "updatePrinterSettings paperType = " + i9);
                                                     i3 = i4;
                                                     break;
                                                 } else {
@@ -534,7 +534,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                                 }
                                 if (i4 >= paperType.length) {
                                     i9 = paperType[0];
-                                    EPLog.m318w("EpsonService", "updatePrinterSettings paperType = " + i9);
+                                    EPLog.w("EpsonService", "updatePrinterSettings paperType = " + i9);
                                     i3 = 0;
                                 }
                                 int[] layout = getLayout(i, i3);
@@ -551,11 +551,11 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                                         }
                                     }
                                     if (i20 >= layout.length) {
-                                        EPLog.m318w("EpsonService", "updatePrinterSettings layout = EPS_MLID_BORDERS");
+                                        EPLog.w("EpsonService", "updatePrinterSettings layout = EPS_MLID_BORDERS");
                                         i10 = 2;
                                     }
                                 } else {
-                                    EPLog.m318w("EpsonService", "updatePrinterSettings layout = EPS_MLID_BORDERS");
+                                    EPLog.w("EpsonService", "updatePrinterSettings layout = EPS_MLID_BORDERS");
                                     i10 = 2;
                                 }
                                 int[] quality = getQuality(i, i3);
@@ -573,10 +573,10 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                                     }
                                     if (i21 >= quality.length) {
                                         i5 = quality.length > 0 ? quality[0] : 2;
-                                        EPLog.m318w("EpsonService", "updatePrinterSettings quality = " + i5);
+                                        EPLog.w("EpsonService", "updatePrinterSettings quality = " + i5);
                                     }
                                 } else {
-                                    EPLog.m318w("EpsonService", "updatePrinterSettings quality = " + 2);
+                                    EPLog.w("EpsonService", "updatePrinterSettings quality = " + 2);
                                     i5 = 2;
                                 }
                                 int[] paperSource = getPaperSource(i, i3, 0);
@@ -594,15 +594,15 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                                     }
                                     if (i22 >= paperSource.length) {
                                         i6 = paperSource.length > 0 ? paperSource[0] : 0;
-                                        EPLog.m318w("EpsonService", "updatePrinterSettings paperSource = " + i6);
+                                        EPLog.w("EpsonService", "updatePrinterSettings paperSource = " + i6);
                                     }
                                 } else {
-                                    EPLog.m318w("EpsonService", "updatePrinterSettings paperSource = EPS_MPID_NOT_SPEC");
+                                    EPLog.w("EpsonService", "updatePrinterSettings paperSource = EPS_MPID_NOT_SPEC");
                                     i6 = 0;
                                 }
                                 int duplex = getDuplex(i, i3);
                                 if ((duplex == 0 || (i10 == 1 && (duplex & 2) != 0)) && i13 != 0) {
-                                    EPLog.m318w("EpsonService", "updatePrinterSettings duplex = EPS_DUPLEX_NONE");
+                                    EPLog.w("EpsonService", "updatePrinterSettings duplex = EPS_DUPLEX_NONE");
                                     i13 = 0;
                                 }
                                 int[] color = getColor(false, 0, i, i3);
@@ -620,10 +620,10 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                                     }
                                     if (i23 >= color.length) {
                                         i7 = color.length > 0 ? color[0] : 0;
-                                        EPLog.m318w("EpsonService", "updatePrinterSettings color = " + i7);
+                                        EPLog.w("EpsonService", "updatePrinterSettings color = " + i7);
                                     }
                                 } else {
-                                    EPLog.m318w("EpsonService", "updatePrinterSettings color = " + 0);
+                                    EPLog.w("EpsonService", "updatePrinterSettings color = " + 0);
                                     i7 = 0;
                                 }
                                 printSetting.paperSizeValue = i8;
@@ -637,11 +637,11 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                                 return 0;
                             }
                         }
-                        EPLog.m318w("EpsonService", "updatePrinterSettings Failed getPaperType");
+                        EPLog.w("EpsonService", "updatePrinterSettings Failed getPaperType");
                         return -1;
                     }
                 }
-                EPLog.m318w("EpsonService", "updatePrinterSettings Failed getPaperSize");
+                EPLog.w("EpsonService", "updatePrinterSettings Failed getPaperSize");
                 return -1;
             } catch (RemoteException e) {
                 e.printStackTrace();
@@ -706,7 +706,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                             if (i11 >= epsSupportedMedia.mSizeList.length) {
                                 i11 = i12;
                             } else if (defaultPaperSize == epsSupportedMedia.mSizeList[i11].mMediaSizeID) {
-                                EPLog.m318w("EpsonService", "EpsonConnectUpdatePrinterSettings paperSize_index = " + i11);
+                                EPLog.w("EpsonService", "EpsonConnectUpdatePrinterSettings paperSize_index = " + i11);
                                 z = false;
                             } else {
                                 i11++;
@@ -736,7 +736,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                         while (true) {
                             if (i14 < epsSupportedMedia.mSizeList[i11].mTypeList.length) {
                                 if (defaultPaperType == epsSupportedMedia.mSizeList[i11].mTypeList[i14].mMediaTypeId) {
-                                    EPLog.m318w("EpsonService", "EpsonConnectUpdatePrinterSettings paperType_index = " + i14);
+                                    EPLog.w("EpsonService", "EpsonConnectUpdatePrinterSettings paperType_index = " + i14);
                                     i2 = i14;
                                     z2 = false;
                                 } else {
@@ -843,7 +843,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
             int i15;
             int i16;
             int i17 = i;
-            EPLog.m305d("EpsonService", "EpsonConnectCreateJob() called.");
+            EPLog.d("EpsonService", "EpsonConnectCreateJob() called.");
             this.mEcClientLib.resetCancel();
             EpsonService.this.epsJobattrib.mMediaSizeIdx = i2;
             EpsonService.this.epsJobattrib.mMediaTypeIdx = i3;
@@ -892,12 +892,12 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         }
 
         public int EpsonConnectChangePrintSetting() {
-            EPLog.m305d("EpsonService", "EpsonConnectChangePrintSetting() called.");
+            EPLog.d("EpsonService", "EpsonConnectChangePrintSetting() called.");
             return this.mEcClientLib.ChangePrintSetting(EpsonService.this.epsJobattrib, EcClientLibUtil.quoteForJsonString(EpsonService.this.mailAddress), EcClientLibUtil.quoteForJsonString(EpsonService.this.accessKey), false);
         }
 
         public int EpsonConnectUploadFile(String str, int i) {
-            EPLog.m305d("EpsonService", "EpsonConnectUploadFile() called. - " + str);
+            EPLog.d("EpsonService", "EpsonConnectUploadFile() called. - " + str);
             int ensureLogin = ensureLogin(false);
             if (ensureLogin != 0) {
                 return ensureLogin;
@@ -906,19 +906,19 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         }
 
         public int EpsonConnectStartPrint(int i, int i2) {
-            EPLog.m305d("EpsonService", "EpsonConnectStartPrint() called.");
+            EPLog.d("EpsonService", "EpsonConnectStartPrint() called.");
             return this.mEcClientLib.StartPrint(i, i2);
         }
 
         public int EpsonConnectEndJob() {
-            EPLog.m305d("EpsonService", "EpsonConnectEndJob() called.");
+            EPLog.d("EpsonService", "EpsonConnectEndJob() called.");
             int EndJob = this.mEcClientLib.EndJob();
             this.mEcClientLib.resetCancel();
             return EndJob;
         }
 
         public int EpsonConnectCheckSupportedFileType(String str) {
-            EPLog.m305d("EpsonService", "EpsonConnectCheckSupportedFileType() called.");
+            EPLog.d("EpsonService", "EpsonConnectCheckSupportedFileType() called.");
             return 0;
         }
 
@@ -939,7 +939,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
         public int EpsonConnectGetPreview(int i, String str) {
             int DownloadPreview;
             synchronized (EpsonService.mConnect) {
-                EPLog.m305d("EpsonService", "EpsonConnectGetPreview() called.");
+                EPLog.d("EpsonService", "EpsonConnectGetPreview() called.");
                 DownloadPreview = this.mEcClientLib.DownloadPreview(i, str);
             }
             return DownloadPreview;
@@ -1011,7 +1011,7 @@ public class EpsonService extends Service implements ApfEpImageAdapter.ProgressC
                 dataOutputStream.write(bArr, 0, wrap.position());
                 wrap.clear();
                 dataOutputStream.close();
-                EPLog.m313i("EpsonService", "finishu output SUPPORTED_MEDIA for EC. filename = " + path + " sourceType = " + i2 + " filesize = " + file.length());
+                EPLog.i("EpsonService", "finishu output SUPPORTED_MEDIA for EC. filename = " + path + " sourceType = " + i2 + " filesize = " + file.length());
                 Utils.copyFile(file, new File(ExternalFileUtils.getInstance(EpsonService.this.getApplicationContext()).getSavedSupportedMedia().getPath()));
                 return 0;
             } catch (IOException e) {

+ 1 - 1
app/src/main/java/epson/print/storage/StorageProcessUploadActivity.java

@@ -156,7 +156,7 @@ public class StorageProcessUploadActivity extends StorageProcessActivity {
                                 UploadTask.this.uploaded = true;
                                 newCondition.signal();
                             } catch (Exception e) {
-                                EPLog.m318w("Storage", "onUploadComplete() exception <" + e.toString() + ">");
+                                EPLog.w("Storage", "onUploadComplete() exception <" + e.toString() + ">");
                             } catch (Throwable th) {
                                 reentrantLock.unlock();
                                 throw th;

+ 1 - 1
app/src/main/java/epson/print/storage/evernote/EvernoteRequest.java

@@ -163,7 +163,7 @@ public class EvernoteRequest {
 
         private void cancel() {
             canceled = true;
-            EPLog.m305d(EvernoteRequest.TAG, "Upload Canceled!!");
+            EPLog.d(EvernoteRequest.TAG, "Upload Canceled!!");
         }
     }
 

+ 1 - 1
app/src/main/java/epson/print/storage/evernote/EvernoteSignInActivity.java

@@ -26,7 +26,7 @@ public class EvernoteSignInActivity extends StorageSignInActivity {
                 showLoginErrorAndFinish();
                 return;
             }
-            EPLog.m313i(TAG, "REQUEST_CODE_OAUTH RESULT_OK");
+            EPLog.i(TAG, "REQUEST_CODE_OAUTH RESULT_OK");
             finish();
         }
     }

+ 1 - 1
app/src/main/java/epson/provider/SharedPreferencesProvider.java

@@ -49,7 +49,7 @@ public class SharedPreferencesProvider extends ContentProvider {
 
     public boolean onCreate() {
         String str = TAG;
-        EPLog.m305d(str, "onCreate " + Binder.getCallingPid() + ", " + Thread.currentThread().getName());
+        EPLog.d(str, "onCreate " + Binder.getCallingPid() + ", " + Thread.currentThread().getName());
         mPrefs = getContext().getSharedPreferences("PrintSetting", 0);
         if (matcher != null) {
             return true;

+ 1 - 1
app/src/main/java/epson/scan/activity/I2ScanAreaView.java

@@ -11,7 +11,7 @@ import android.graphics.Path;
 import android.graphics.PathEffect;
 import android.graphics.Rect;
 import android.support.p000v4.view.GestureDetectorCompat;
-import android.support.p000v4.view.ViewCompat;
+
 import android.text.TextPaint;
 import android.util.AttributeSet;
 import android.view.GestureDetector;

+ 1 - 1
app/src/main/java/epson/scan/activity/MailActivity.java

@@ -89,7 +89,7 @@ public class MailActivity extends ActivityIACommon implements View.OnClickListen
             fileAttachment = new File(saveFilePathArray.get(i));
             fileSizeInByte = Long.valueOf(fileAttachment.length());
             fileSizeInKb = (float) (fileSizeInByte.longValue() / PlaybackStateCompat.ACTION_PLAY_FROM_MEDIA_ID);
-            EPLog.m313i("Data", " " + fileSizeInKb);
+            EPLog.i("Data", " " + fileSizeInKb);
             totalFileSize = totalFileSize + fileSizeInKb;
         }
         if (totalFileSize > 500.0f) {

+ 27 - 27
app/src/main/java/epson/scan/activity/ScanActivity.java

@@ -117,7 +117,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
     private View.OnClickListener mButtonCancelScanListener = new View.OnClickListener() {
         public void onClick(View view) {
             String localClassName = ScanActivity.this.getLocalClassName();
-            EPLog.m313i(localClassName, "isStopScan = " + ScanActivity.this.isStopScan);
+            EPLog.i(localClassName, "isStopScan = " + ScanActivity.this.isStopScan);
             if (!ScanActivity.this.escan.isJobDone() && !ScanActivity.this.isStopScan) {
                 ScanActivity.this.hideScanningPop();
                 ScanActivity scanActivity = ScanActivity.this;
@@ -400,7 +400,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
                 epson.scan.activity.ScanActivity r9 = epson.scan.activity.ScanActivity.this
                 java.lang.String r9 = r9.getLocalClassName()
                 java.lang.String r1 = "end page, waiting..."
-                epson.print.Util.EPLog.m313i(r9, r1)
+                epson.print.Util.EPLog.i(r9, r1)
                 epson.scan.activity.ScanActivity r9 = epson.scan.activity.ScanActivity.this
                 int r9 = r9.convertCount
                 epson.scan.activity.ScanActivity r1 = epson.scan.activity.ScanActivity.this
@@ -420,7 +420,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
                 epson.scan.activity.ScanActivity r9 = epson.scan.activity.ScanActivity.this
                 java.lang.String r9 = r9.getLocalClassName()
                 java.lang.String r1 = "done add to list"
-                epson.print.Util.EPLog.m313i(r9, r1)
+                epson.print.Util.EPLog.i(r9, r1)
                 goto L_0x047f
             L_0x0093:
                 epson.scan.activity.ScanActivity r9 = epson.scan.activity.ScanActivity.this
@@ -465,7 +465,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
                 epson.scan.activity.ScanActivity r9 = epson.scan.activity.ScanActivity.this
                 java.lang.String r9 = r9.getCallingPackage()
                 java.lang.String r1 = "[EPSON SCAN] START SCAN"
-                epson.print.Util.EPLog.m313i(r9, r1)
+                epson.print.Util.EPLog.i(r9, r1)
                 epson.scan.activity.ScanActivity r9 = epson.scan.activity.ScanActivity.this
                 boolean unused = r9.isStopScan = r0
                 epson.scan.activity.ScanActivity r9 = epson.scan.activity.ScanActivity.this
@@ -486,11 +486,11 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
                 java.lang.String r2 = "display;"
                 int r3 = r1.orientation
                 java.lang.String r3 = java.lang.String.valueOf(r3)
-                epson.print.Util.EPLog.m313i(r2, r3)
+                epson.print.Util.EPLog.i(r2, r3)
                 java.lang.String r2 = "display;"
                 int r3 = r9.getRotation()
                 java.lang.String r3 = java.lang.String.valueOf(r3)
-                epson.print.Util.EPLog.m313i(r2, r3)
+                epson.print.Util.EPLog.i(r2, r3)
                 int r9 = r9.getRotation()
                 r2 = 9
                 r3 = 8
@@ -647,7 +647,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
                 int r2 = r2.error
                 r1.append(r2)
                 java.lang.String r1 = r1.toString()
-                epson.print.Util.EPLog.m313i(r9, r1)
+                epson.print.Util.EPLog.i(r9, r1)
                 epson.scan.activity.ScanActivity r9 = epson.scan.activity.ScanActivity.this
                 int r1 = r9.error
                 r9.setupErrorMessage(r1)
@@ -682,7 +682,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
                 epson.scan.activity.ScanActivity r9 = epson.scan.activity.ScanActivity.this
                 java.lang.String r9 = r9.getLocalClassName()
                 java.lang.String r1 = "scan, cancel find"
-                epson.print.Util.EPLog.m313i(r9, r1)
+                epson.print.Util.EPLog.i(r9, r1)
                 epson.scan.activity.ScanActivity r9 = epson.scan.activity.ScanActivity.this
                 epson.scan.lib.escanLib r9 = r9.escan
                 r9.escanWrapperCancelFindScanner()
@@ -705,11 +705,11 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
                 epson.scan.activity.ScanActivity r9 = epson.scan.activity.ScanActivity.this
                 java.lang.String r9 = r9.getLocalClassName()
                 java.lang.String r2 = "isCanselOK OK"
-                epson.print.Util.EPLog.m313i(r9, r2)
+                epson.print.Util.EPLog.i(r9, r2)
                 epson.scan.activity.ScanActivity r9 = epson.scan.activity.ScanActivity.this
                 java.lang.String r9 = r9.getLocalClassName()
                 java.lang.String r2 = "scan, cancel scan job"
-                epson.print.Util.EPLog.m313i(r9, r2)
+                epson.print.Util.EPLog.i(r9, r2)
                 epson.scan.activity.ScanActivity r9 = epson.scan.activity.ScanActivity.this
                 epson.scan.lib.escanLib r9 = r9.escan
                 r9.cancelScanJob()
@@ -718,7 +718,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
                 epson.scan.activity.ScanActivity r9 = epson.scan.activity.ScanActivity.this
                 java.lang.String r9 = r9.getLocalClassName()
                 java.lang.String r2 = "isCanselOK NO"
-                epson.print.Util.EPLog.m313i(r9, r2)
+                epson.print.Util.EPLog.i(r9, r2)
                 java.lang.Thread.sleep(r6)     // Catch:{ InterruptedException -> 0x033b }
                 goto L_0x033f
             L_0x033b:
@@ -780,7 +780,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
                 epson.scan.activity.ScanActivity r9 = epson.scan.activity.ScanActivity.this
                 java.lang.String r9 = r9.getLocalClassName()
                 java.lang.String r1 = "MESSAGE SCAN FINISHED!!!"
-                epson.print.Util.EPLog.m313i(r9, r1)
+                epson.print.Util.EPLog.i(r9, r1)
                 epson.scan.activity.ScanActivity r9 = epson.scan.activity.ScanActivity.this
                 epson.scan.lib.escanLib r1 = r9.escan
                 java.util.List r1 = r1.getListScannedFile()
@@ -1286,7 +1286,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
                                 }
                             }
                             if (ScanActivity.this.error == 0) {
-                                EPLog.m313i(ScanActivity.this.getLocalClassName(), "scan, done probe");
+                                EPLog.i(ScanActivity.this.getLocalClassName(), "scan, done probe");
                                 if (ScanActivity.this.escan.getListFoundScanner() == null || ScanActivity.this.escan.getListFoundScanner().size() < 1) {
                                     EPLog.m307e(ScanActivity.this.getLocalClassName(), "scan, ESCAN_ERR_SCANNER_NOT_FOUND");
                                     int unused8 = ScanActivity.this.error = -1300;
@@ -1307,10 +1307,10 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
                                 String unused11 = scanActivity6.usingScannerIp = scanActivity6.escan.getListFoundScanner().get(0).getIp();
                                 ScanActivity.this.escan.resetEscanLib();
                                 if (ScanActivity.this.escan.getListScannedFile() == null) {
-                                    EPLog.m313i(ScanActivity.this.getLocalClassName(), "scan, getListScannedFile == NULL");
+                                    EPLog.i(ScanActivity.this.getLocalClassName(), "scan, getListScannedFile == NULL");
                                     ScanActivity.this.escan.setListScannedFile(new ArrayList());
                                 } else if (!ScanContinueParam.isContinueScanning()) {
-                                    EPLog.m313i(ScanActivity.this.getLocalClassName(), "scan, getListScannedFile != NULL");
+                                    EPLog.i(ScanActivity.this.getLocalClassName(), "scan, getListScannedFile != NULL");
                                     ScanActivity.this.escan.getListScannedFile().clear();
                                     int unused12 = ScanActivity.this.previousTotalScanned = 0;
                                 }
@@ -1327,11 +1327,11 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
                                 ScanActivity scanActivity8 = ScanActivity.this;
                                 String access$3300 = scanActivity8.makeImageName(scanActivity8.extParam);
                                 String localClassName = ScanActivity.this.getLocalClassName();
-                                EPLog.m313i(localClassName, "scan, fname = " + access$3300);
+                                EPLog.i(localClassName, "scan, fname = " + access$3300);
                                 ScanActivity scanActivity9 = ScanActivity.this;
                                 int unused15 = scanActivity9.error = scanActivity9.escan.startScanJob(access$3300);
                                 String localClassName2 = ScanActivity.this.getLocalClassName();
-                                EPLog.m313i(localClassName2, "[ESCAN][DONE] escanLib().startScanJob - return - " + ScanActivity.this.error);
+                                EPLog.i(localClassName2, "[ESCAN][DONE] escanLib().startScanJob - return - " + ScanActivity.this.error);
                                 if (ScanActivity.this.error == 40) {
                                     boolean unused16 = ScanActivity.this.isStopScan = true;
                                     int unused17 = ScanActivity.this.error = 0;
@@ -1348,7 +1348,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
                                         return;
                                     }
                                 }
-                                EPLog.m313i(ScanActivity.this.getLocalClassName(), "END SCAN NORMALY.");
+                                EPLog.i(ScanActivity.this.getLocalClassName(), "END SCAN NORMALY.");
                                 ScanActivity.this.scanningProgressHandler.sendEmptyMessage(2);
                             } else if (!ScanActivity.this.isStopScan) {
                                 ScanActivity.this.scanningProgressHandler.sendEmptyMessage(-1);
@@ -1477,7 +1477,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
             linearLayout.setVisibility(View.VISIBLE);
             findViewById(R.id.llScanFunctionBar).invalidate();
         }
-        EPLog.m313i(TAG, "addFlags : FLAG_KEEP_SCREEN_ON ");
+        EPLog.i(TAG, "addFlags : FLAG_KEEP_SCREEN_ON ");
         getWindow().addFlags(128);
     }
 
@@ -1487,7 +1487,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
             linearLayout.setVisibility(View.GONE);
             findViewById(R.id.llScanFunctionBar).invalidate();
         }
-        EPLog.m313i(TAG, "clearFlags : FLAG_KEEP_SCREEN_ON ");
+        EPLog.i(TAG, "clearFlags : FLAG_KEEP_SCREEN_ON ");
         getWindow().clearFlags(128);
     }
 
@@ -1687,7 +1687,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
                 public void onClick(DialogInterface dialogInterface, int i) {
                     boolean unused = ScanActivity.this.isConfirmCancel = true;
                     String localClassName = ScanActivity.this.getLocalClassName();
-                    EPLog.m313i(localClassName, "yes pressed, isConfirmCancel = " + ScanActivity.this.isConfirmCancel);
+                    EPLog.i(localClassName, "yes pressed, isConfirmCancel = " + ScanActivity.this.isConfirmCancel);
                     if (!ScanActivity.this.escan.isJobDone()) {
                         ScanActivity.this.showScanningPop();
                     }
@@ -1739,7 +1739,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
             hideScanningPop();
         } else {
             mButtonScanListener.onClick(this.btnScan);
-            EPLog.m305d(TAG, "Send CHECK_PRINTER Message.");
+            EPLog.d(TAG, "Send CHECK_PRINTER Message.");
         }
     }
 
@@ -1788,7 +1788,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
                     }
                     if (this.bAutoStartScan) {
                         mButtonScanListener.onClick(this.btnScan);
-                        EPLog.m305d(TAG, "Send CHECK_PRINTER Message.");
+                        EPLog.d(TAG, "Send CHECK_PRINTER Message.");
                     }
                 }
             }
@@ -1868,7 +1868,7 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
     private Bitmap showBitmap(String str) {
         Bitmap bitmap;
         isDecoding = true;
-        EPLog.m313i(getCallingPackage(), "start decode for preview ");
+        EPLog.i(getCallingPackage(), "start decode for preview ");
         File file = new File(str);
         if (file.exists() && file.isFile()) {
             try {
@@ -1878,17 +1878,17 @@ public class ScanActivity extends ScanBaseView implements ScanContinueParam.Scan
             } catch (OutOfMemoryError e2) {
                 e2.printStackTrace();
             }
-            EPLog.m313i(getCallingPackage(), "end decode for preview ");
+            EPLog.i(getCallingPackage(), "end decode for preview ");
             return bitmap;
         }
         bitmap = null;
-        EPLog.m313i(getCallingPackage(), "end decode for preview ");
+        EPLog.i(getCallingPackage(), "end decode for preview ");
         return bitmap;
     }
 
     private void displayPreview(Bitmap bitmap) {
         if (!this.escan.isJobDone()) {
-            EPLog.m313i(EpsoniPrintSharedActivity.ACTIVITY_SCAN, "update UI");
+            EPLog.i(EpsoniPrintSharedActivity.ACTIVITY_SCAN, "update UI");
             setBm(bitmap);
             setBmRectF(this.area);
             scanArea.postInvalidate();

+ 5 - 5
app/src/main/java/epson/scan/activity/ScanBaseView.java

@@ -12,7 +12,7 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.os.Build;
 import android.os.Handler;
-import android.support.p000v4.view.ViewCompat;
+
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.EditText;
@@ -458,7 +458,7 @@ public class ScanBaseView extends ActivityIACommon {
             _pBaseBottomRight = ScanBaseView.this.getmBot();
             if (!ScanBaseView.this.isDisplayResult && ScanBaseView.this.getBm() != null) {
                 if (Build.VERSION.SDK_INT >= 14) {
-                    EPLog.m313i("drawScanArea", "14");
+                    EPLog.i("drawScanArea", "14");
                     Bitmap bm = ScanBaseView.this.getBm();
                     RectF bmRectF = ScanBaseView.this.getBmRectF();
                     Bitmap createScaledBitmap = Bitmap.createScaledBitmap(bm, bmRectF.width(), bmRectF.height(), true);
@@ -573,7 +573,7 @@ public class ScanBaseView extends ActivityIACommon {
             }
             if (ScanBaseView.this.bLongTouch) {
                 String localClassName = ScanBaseView.this.getLocalClassName();
-                EPLog.m313i(localClassName, "mWhere = " + ScanBaseView.mWhere);
+                EPLog.i(localClassName, "mWhere = " + ScanBaseView.mWhere);
                 if (ScanBaseView.mWhere == 0 && ScanBaseView.this.bmCenter == null) {
                     ScanBaseView.this.bmCenter = BitmapFactory.decodeResource(getResources(), R.drawable.area_center, ScanBaseView.this._bmOption);
                 }
@@ -735,7 +735,7 @@ public class ScanBaseView extends ActivityIACommon {
 
     public void detectTheTouchPoint() {
         if (mTouch.x > Math.max(mTop.x, mBot.x) || mTouch.x < Math.min(mTop.x, mBot.x) || mTouch.y > Math.max(mTop.y, mBot.y) || mTouch.y < Math.min(mTop.y, mBot.y)) {
-            EPLog.m313i(getLocalClassName(), "touche out");
+            EPLog.i(getLocalClassName(), "touche out");
             if ((Math.abs(Math.min(mTop.x, mBot.x) - mTouch.x) >= SCAN_AREA_HOTSPOT_SIZE && Math.abs(mTouch.x - Math.max(mTop.x, mBot.x)) >= SCAN_AREA_HOTSPOT_SIZE) || (Math.abs(Math.min(mTop.y, mBot.y) - mTouch.y) >= SCAN_AREA_HOTSPOT_SIZE && Math.abs(mTouch.y - Math.max(mTop.y, mBot.y)) >= SCAN_AREA_HOTSPOT_SIZE)) {
                 mWhere = 2;
             } else if (mTop.x >= mBot.x || mTop.y >= mBot.y) {
@@ -770,7 +770,7 @@ public class ScanBaseView extends ActivityIACommon {
                 mWhere = 1;
             }
         } else {
-            EPLog.m313i(getLocalClassName(), "touche in");
+            EPLog.i(getLocalClassName(), "touche in");
             if (mTop.x >= mBot.x || mTop.y >= mBot.y) {
                 if (mTop.x >= mBot.x || mTop.y <= mBot.y) {
                     if (mTop.x <= mBot.x || mTop.y <= mBot.y) {

+ 5 - 5
app/src/main/java/epson/scan/activity/ScanSearchActivity.java

@@ -161,7 +161,7 @@ public class ScanSearchActivity extends ActivityIACommon implements CustomTitleD
         tvResult.setText(getString(R.string.lbl_scanner_search_processing));
         mListEmptyMessageTextView = (TextView) mLayout.findViewById(R.id.list_empty_message);
         mListView = (ListView) mLayout.findViewById(16908298);
-        EPLog.m313i("epson.scan.activity.ScanSearchActivity", "builElements");
+        EPLog.i("epson.scan.activity.ScanSearchActivity", "builElements");
         buildElements();
         setNotFoundPrinterButton();
         setActionBar(R.string.title_addprint, true);
@@ -353,7 +353,7 @@ public class ScanSearchActivity extends ActivityIACommon implements CustomTitleD
     }
 
     protected void onDestroy() {
-        EPLog.m313i("epson.scan.activity.ScanSearchActivity", "Destroy search screen");
+        EPLog.i("epson.scan.activity.ScanSearchActivity", "Destroy search screen");
         interruptSearch();
         mBuilder.destructor();
         super.onDestroy();
@@ -437,7 +437,7 @@ public class ScanSearchActivity extends ActivityIACommon implements CustomTitleD
         mScannerFindCancelRequested = true;
         mHandler.removeMessages(1);
         mHandler.removeMessages(12);
-        EPLog.m313i("epson.scan.activity.ScanSettingsActivity", "Cancel search scanner");
+        EPLog.i("epson.scan.activity.ScanSettingsActivity", "Cancel search scanner");
         mHandler.removeMessages(8);
         mHandler.removeMessages(6);
         SearchWiFiDirectPrinterTask searchWiFiDirectPrinterTask = searchWiFiDirectPrinter;
@@ -566,12 +566,12 @@ public class ScanSearchActivity extends ActivityIACommon implements CustomTitleD
                 mHandler.removeMessages(1);
                 mHandler.sendEmptyMessageDelayed(1, 100);
             }
-            EPLog.m305d("ScanSearchActivity", "Send CHECK_PRINTER Message.");
+            EPLog.d("ScanSearchActivity", "Send CHECK_PRINTER Message.");
         }
     }
 
     protected void onPause() {
-        EPLog.m305d("SearchPrinterScr", "onPause");
+        EPLog.d("SearchPrinterScr", "onPause");
         super.onPause();
         mActivityForegroundLifetime = false;
         interruptSearch();

+ 3 - 3
app/src/main/java/epson/scan/activity/ScanSettingsActivity.java

@@ -241,7 +241,7 @@ public class ScanSettingsActivity extends ActivityIACommon {
     }
 
     private void getScannerSavedSettings() {
-        EPLog.m313i("epson.scan.activity.ScanSettingsActivity", "Start get saved option");
+        EPLog.i("epson.scan.activity.ScanSettingsActivity", "Start get saved option");
         loadRefScannerName();
         loadRefScannerSourceSetting();
         loadRefScannerColorSetting();
@@ -429,7 +429,7 @@ public class ScanSettingsActivity extends ActivityIACommon {
                         break;
                 }
             }
-            EPLog.m313i(getLocalClassName(), "back to settings");
+            EPLog.i(getLocalClassName(), "back to settings");
         } else if (i2 == 1) {
             onScannerSelectResult(-1, intent);
         } else {
@@ -596,7 +596,7 @@ public class ScanSettingsActivity extends ActivityIACommon {
 
     protected void onStop() {
         super.onStop();
-        EPLog.m313i(getLocalClassName(), "scannsetting screen, onStop");
+        EPLog.i(getLocalClassName(), "scannsetting screen, onStop");
         progressGetOption.setVisibility(View.GONE);
         AlertDialog alertDialog = errorDialog;
         if (alertDialog != null && alertDialog.isShowing()) {

+ 2 - 2
app/src/main/java/epson/scan/activity/ScanSettingsAdvanceDetailActivity.java

@@ -53,8 +53,8 @@ public class ScanSettingsAdvanceDetailActivity extends ActivityIACommon {
     };
     private AdapterView.OnItemClickListener mListOptionClick2 = new AdapterView.OnItemClickListener() {
         public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
-            EPLog.m313i("mListOptionClick2", "[position]" + i);
-            EPLog.m313i("mListOptionClick2", "[id]" + j);
+            EPLog.i("mListOptionClick2", "[position]" + i);
+            EPLog.i("mListOptionClick2", "[id]" + j);
             int unused = ScanSettingsAdvanceDetailActivity.this.lastAdfRotate = i;
             switch (i) {
                 case 0:

+ 2 - 2
app/src/main/java/epson/scan/activity/ScanSettingsDetailActivity.java

@@ -72,8 +72,8 @@ public class ScanSettingsDetailActivity extends ActivityIACommon {
     };
     private AdapterView.OnItemClickListener mListOptionClick2 = new AdapterView.OnItemClickListener() {
         public void onItemClick(AdapterView<?> adapterView, View view, int i, long j) {
-            EPLog.m313i("mListOptionClick2", "[position]" + i);
-            EPLog.m313i("mListOptionClick2", "[id]" + j);
+            EPLog.i("mListOptionClick2", "[position]" + i);
+            EPLog.i("mListOptionClick2", "[id]" + j);
             int unused = ScanSettingsDetailActivity.this.lastAdfGuid = i;
             switch (i) {
                 case 0:

+ 1 - 1
app/src/main/java/epson/scan/lib/ScanSettingHelper.java

@@ -181,7 +181,7 @@ public class ScanSettingHelper {
         String prefString = Utils.getPrefString(context, epson.common.Constants.SCAN_REFS_USED_SCANNER_PATH, epson.common.Constants.SCAN_REFS_SCANNER_ID);
         int prefInt = Utils.getPrefInt(context, epson.common.Constants.SCAN_REFS_USED_SCANNER_PATH, epson.common.Constants.SCAN_REFS_SCANNER_LOCATION);
         if (prefString == null || !prefString.equals(scannerInfo.getScannerId()) || prefInt != scannerInfo.getLocation()) {
-            EPLog.m305d(TAG, "changeScanner scannerId=" + scannerInfo.getScannerId());
+            EPLog.d(TAG, "changeScanner scannerId=" + scannerInfo.getScannerId());
             saveAllUserSettingsToRef(context, scannerInfo);
             saveSupportedOptionToRef(context, scannerInfo);
             String curConnectInfo = WiFiDirectManager.getCurConnectInfo(context, MacAddrUtils.getMacAddressFromScannerId(scannerInfo.getScannerId()));

+ 11 - 11
app/src/main/java/epson/scan/lib/escanLib.java

@@ -122,14 +122,14 @@ public class escanLib implements Parcelable, EscanLibInterface {
 
     private void updateStatusCB(int[] iArr) {
         status = iArr;
-        EPLog.m313i("escanLib.java", "ESCAN SCAN status = " + status[0] + PreferencesConstants.COOKIE_DELIMITER + status[1] + PreferencesConstants.COOKIE_DELIMITER + status[2]);
+        EPLog.i("escanLib.java", "ESCAN SCAN status = " + status[0] + PreferencesConstants.COOKIE_DELIMITER + status[1] + PreferencesConstants.COOKIE_DELIMITER + status[2]);
     }
 
     private void findScannerCB() {
         String str = scanner;
         if (str != null && str.length() > 0) {
             String name = getClass().getName();
-            EPLog.m313i(name, "EXTRACT Scanner information: " + scanner);
+            EPLog.i(name, "EXTRACT Scanner information: " + scanner);
             String[] split = scanner.split("\\|\\|");
             f414si = new ScannerInfo();
             f414si.setModelName(split[1]);
@@ -207,14 +207,14 @@ public class escanLib implements Parcelable, EscanLibInterface {
     }
 
     private void javaDebugCB(String str) {
-        EPLog.m313i(getClass().getName(), str.toString());
+        EPLog.i(getClass().getName(), str.toString());
     }
 
     private void newFileNotifyCB(String str) {
         listScannedFile.add(str.toString());
         mEscIVersionList.add(-1);
         String name = getClass().getName();
-        EPLog.m313i(name, "newFileNotifyCB() call, Scan new file: " + str.toString() + ", totals: " + listScannedFile.size());
+        EPLog.i(name, "newFileNotifyCB() call, Scan new file: " + str.toString() + ", totals: " + listScannedFile.size());
         isCanselOK = true;
     }
 
@@ -230,7 +230,7 @@ public class escanLib implements Parcelable, EscanLibInterface {
         resetEscanLib();
         resetIPAdressCheck();
         int escanProbeScannerById = escanProbeScannerById(120, str.toCharArray(), str2.toCharArray());
-        EPLog.m313i("EPSON escanLib", "scanners.probeScannerById() error = " + String.valueOf(escanProbeScannerById));
+        EPLog.i("EPSON escanLib", "scanners.probeScannerById() error = " + String.valueOf(escanProbeScannerById));
         return escanProbeScannerById;
     }
 
@@ -257,16 +257,16 @@ public class escanLib implements Parcelable, EscanLibInterface {
         isCanselOK = false;
         error = escanWrapperSetImageName(str);
         if (this.error != 0) {
-            EPLog.m313i("EPSON escanLib", "scanners.escanWrapperSetImageName(scannedImageNamePath) error = " + String.valueOf(this.error));
+            EPLog.i("EPSON escanLib", "scanners.escanWrapperSetImageName(scannedImageNamePath) error = " + String.valueOf(this.error));
             return error;
         }
-        EPLog.m313i("EPSON escanLib", escanJobAttrib[0] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[1] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[2] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[3] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[4] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[5] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[6] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[7] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[8] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[9] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[10] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[11] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[12]);
+        EPLog.i("EPSON escanLib", escanJobAttrib[0] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[1] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[2] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[3] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[4] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[5] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[6] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[7] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[8] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[9] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[10] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[11] + PreferencesConstants.COOKIE_DELIMITER + escanJobAttrib[12]);
         error = escanWrapperStartJob(escanJobAttrib);
         if (this.error != 0) {
-            EPLog.m313i("EPSON escanLib", "scanners.escanWrapperStartJob(escanJobAttrib) error = " + String.valueOf(this.error));
+            EPLog.i("EPSON escanLib", "scanners.escanWrapperStartJob(escanJobAttrib) error = " + String.valueOf(this.error));
             return error;
         }
-        EPLog.m313i("**** isAdfRotate = ", String.valueOf(this.isAdfRotate));
+        EPLog.i("**** isAdfRotate = ", String.valueOf(this.isAdfRotate));
         error = doScan(0, 0, 0, isAdfRotate, ScanContinueParam.getAvailableScanPageCount());
         escanWrapperEndJob();
         isScanning = false;
@@ -282,7 +282,7 @@ public class escanLib implements Parcelable, EscanLibInterface {
         escanSupportOption = new int[7];
         escanSupportResolution = new int[64];
         error = escanWrapperGetSupportedOption(this.escanSupportOption, escanSupportResolution);
-        EPLog.m313i("epson.print.escanLib", "getSupportedOption: " + escanSupportOption[1] + PreferencesConstants.COOKIE_DELIMITER + escanSupportOption[2] + PreferencesConstants.COOKIE_DELIMITER + escanSupportOption[3] + PreferencesConstants.COOKIE_DELIMITER + escanSupportOption[4] + PreferencesConstants.COOKIE_DELIMITER + escanSupportOption[5] + PreferencesConstants.COOKIE_DELIMITER + escanSupportOption[6]);
+        EPLog.i("epson.print.escanLib", "getSupportedOption: " + escanSupportOption[1] + PreferencesConstants.COOKIE_DELIMITER + escanSupportOption[2] + PreferencesConstants.COOKIE_DELIMITER + escanSupportOption[3] + PreferencesConstants.COOKIE_DELIMITER + escanSupportOption[4] + PreferencesConstants.COOKIE_DELIMITER + escanSupportOption[5] + PreferencesConstants.COOKIE_DELIMITER + escanSupportOption[6]);
         return error;
     }
 
@@ -308,7 +308,7 @@ public class escanLib implements Parcelable, EscanLibInterface {
             isAdfRotate = false;
         }
         escanJobAttrib[12] = Utils.getPrefInt(context, Constants.SCAN_REFS_USED_SCANNER_PATH, Constants.SCAN_REFS_SETTINGS_ADF_PAPER_GUIDE);
-        EPLog.m313i("makeJobAttribute", "**** PAPER_GUIDE =  " + escanJobAttrib[12]);
+        EPLog.i("makeJobAttribute", "**** PAPER_GUIDE =  " + escanJobAttrib[12]);
     }
 
     public void setScanArea(Context context, SharedParamScan sharedParamScan) {

+ 1 - 1
app/src/main/java/epson/server/screens/StorageServer.java

@@ -240,7 +240,7 @@ public class StorageServer extends ActivityIACommon implements CommonDefine {
 
     public void onBackPressed() {
         super.onBackPressed();
-        EPLog.m313i("StorageServer ", "(onBackPressed)");
+        EPLog.i("StorageServer ", "(onBackPressed)");
         ExternalFileUtils.getInstance(this).initDownloadDir();
     }
 }

+ 9 - 9
app/src/main/java/epson/server/screens/UploadScreen.java

@@ -64,12 +64,12 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
             if (i == 0) {
                 UploadScreen.this.setScreenState(false);
             } else if (i == 16) {
-                EPLog.m313i("createUploadThread", "5:" + UploadScreen.this.isSaved);
+                EPLog.i("createUploadThread", "5:" + UploadScreen.this.isSaved);
                 if (UploadScreen.this.isSaved) {
                     UploadScreen.this.setResult(-1, UploadScreen.this.getIntent());
                     UploadScreen.this.finish();
                 } else {
-                    EPLog.m313i("createUploadThread", "6:" + UploadScreen.this.isSaved);
+                    EPLog.i("createUploadThread", "6:" + UploadScreen.this.isSaved);
                     UploadScreen uploadScreen = UploadScreen.this;
                     uploadScreen.errorDialog = new ErrorDialog(uploadScreen, R.style.AppTheme_Translucent, 4, 0, false);
                     UploadScreen.this.errorDialog.show();
@@ -136,10 +136,10 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
             public void onCheckedChanged(RadioGroup radioGroup, int i) {
                 if (i == R.id.jpeg_type) {
                     String unused = UploadScreen.mFileType = Constants.JPEG_TYPE;
-                    EPLog.m313i("checkedId", "....." + UploadScreen.mFileType);
+                    EPLog.i("checkedId", "....." + UploadScreen.mFileType);
                 } else if (i == R.id.pdf_type) {
                     String unused2 = UploadScreen.mFileType = Constants.PDF_TYPE;
-                    EPLog.m313i("checkedId", "....." + UploadScreen.mFileType);
+                    EPLog.i("checkedId", "....." + UploadScreen.mFileType);
                 }
             }
         });
@@ -373,17 +373,17 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
                             UploadScreen.this.addMediaStorage(file5.getAbsolutePath());
                         }
                     } else {
-                        EPLog.m313i("createUploadThread", "1");
+                        EPLog.i("createUploadThread", "1");
                         UploadScreen uploadScreen2 = UploadScreen.this;
                         String absolutePath2 = ((File) UploadScreen.mSaveFiles.get(0)).getAbsolutePath();
                         File createTempFile2 = MyUtility.createTempFile(uploadScreen2, absolutePath2, UploadScreen.this.currentFileName + ".jpg");
-                        EPLog.m313i("createUploadThread", ExifInterface.GPS_MEASUREMENT_2D + createTempFile2);
+                        EPLog.i("createUploadThread", ExifInterface.GPS_MEASUREMENT_2D + createTempFile2);
                         if (createTempFile2 != null) {
                             File file7 = new File(CommonDefine.EPSONIPRINT_FOLDER + UploadScreen.this.currentFileName + ".jpg");
                             StringBuilder sb = new StringBuilder();
                             sb.append(ExifInterface.GPS_MEASUREMENT_3D);
                             sb.append(file7);
-                            EPLog.m313i("createUploadThread", sb.toString());
+                            EPLog.i("createUploadThread", sb.toString());
                             if (file7.exists() && !UploadScreen.mIsRename) {
                                 int i4 = 1;
                                 while (true) {
@@ -405,7 +405,7 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
                                 createTempFile2.delete();
                             }
                             UploadScreen.this.isSaved = true;
-                            EPLog.m313i("createUploadThread", "4:" + UploadScreen.this.isSaved);
+                            EPLog.i("createUploadThread", "4:" + UploadScreen.this.isSaved);
                         }
                     }
                     UploadScreen.mSaveFiles.clear();
@@ -418,7 +418,7 @@ public class UploadScreen extends ActivityIACommon implements CommonDefine {
     }
 
     private void addMediaStorage(String str) {
-        EPLog.m313i(TAG, "MediaScannerConnection.scanFile path=" + str);
+        EPLog.i(TAG, "MediaScannerConnection.scanFile path=" + str);
         MediaScannerConnection.scanFile(this, new String[]{str}, (String[]) null, (MediaScannerConnection.OnScanCompletedListener) null);
     }
 

+ 14 - 14
app/src/main/java/epson/support/DeviceInformationActivity.java

@@ -66,7 +66,7 @@ public class DeviceInformationActivity extends ActivityIACommon {
             boolean z = false;
             switch (message.what) {
                 case 0:
-                    EPLog.m313i(TAG, "UPDATE_PRINTER_STATUS");
+                    EPLog.i(TAG, "UPDATE_PRINTER_STATUS");
                     int[] mStatus = mPrinter.getMPrinterInfor().getMStatus();
                     EpLog.d("status " + mStatus[0]);
                     if (i == 1 && WiFiDirectManager.getConnectInfo(getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_PRINTER) != null) {
@@ -84,10 +84,10 @@ public class DeviceInformationActivity extends ActivityIACommon {
                     }
                     setPrinterInfo(str, z);
                     String access$000 = TAG;
-                    EPLog.m313i(access$000, "Stt title: " + str);
+                    EPLog.i(access$000, "Stt title: " + str);
                     break;
                 case 1:
-                    EPLog.m313i(TAG, "PROBE_ERROR");
+                    EPLog.i(TAG, "PROBE_ERROR");
                     if (i != 1 || WiFiDirectManager.getConnectInfo(getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_PRINTER) == null) {
                         str2 = getString(R.string.comm_error);
                     } else {
@@ -95,42 +95,42 @@ public class DeviceInformationActivity extends ActivityIACommon {
                     }
                     setPrinterInfo(str2, false);
                     String access$0002 = TAG;
-                    EPLog.m313i(access$0002, "Stt title: " + str2);
+                    EPLog.i(access$0002, "Stt title: " + str2);
                     break;
                 case 2:
-                    EPLog.m313i(TAG, "STATUS_ERROR");
+                    EPLog.i(TAG, "STATUS_ERROR");
                     int[] intArray = message.getData().getIntArray("STATUS_ERROR");
                     if (i != 1 || WiFiDirectManager.getConnectInfo(getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_PRINTER) == null) {
                         if (intArray == null) {
                             DeviceInformationActivity deviceInformationActivity = DeviceInformationActivity.this;
                             setPrinterInfo(getString(R.string.upon_error), true);
                             String access$0003 = TAG;
-                            EPLog.m313i(access$0003, "Stt titlef: " + getString(R.string.upon_error));
+                            EPLog.i(access$0003, "Stt titlef: " + getString(R.string.upon_error));
                             break;
                         } else {
                             String access$0004 = TAG;
-                            EPLog.m313i(access$0004, "statusError[0] : " + intArray[0]);
+                            EPLog.i(access$0004, "statusError[0] : " + intArray[0]);
                             String access$0005 = TAG;
-                            EPLog.m313i(access$0005, "statusError[1] : " + intArray[1]);
+                            EPLog.i(access$0005, "statusError[1] : " + intArray[1]);
                             if (intArray[0] != 2 && intArray[0] != 1 && intArray[0] != 3) {
                                 if (intArray[0] != 4 || (intArray[1] != 102 && intArray[1] != -1300)) {
                                     DeviceInformationActivity deviceInformationActivity2 = DeviceInformationActivity.this;
                                     deviceInformationActivity2.setPrinterInfo(deviceInformationActivity2.getString(R.string.upon_error), true);
                                     String access$0006 = TAG;
-                                    EPLog.m313i(access$0006, "Stt title: " + getString(R.string.upon_error));
+                                    EPLog.i(access$0006, "Stt title: " + getString(R.string.upon_error));
                                     break;
                                 } else {
                                     DeviceInformationActivity deviceInformationActivity3 = DeviceInformationActivity.this;
                                     deviceInformationActivity3.setPrinterInfo(deviceInformationActivity3.getString(R.string.comm_error), false);
                                     String access$0007 = TAG;
-                                    EPLog.m313i(access$0007, "Stt title: " + getString(R.string.comm_error));
+                                    EPLog.i(access$0007, "Stt title: " + getString(R.string.comm_error));
                                     break;
                                 }
                             } else {
                                 DeviceInformationActivity deviceInformationActivity4 = DeviceInformationActivity.this;
                                 deviceInformationActivity4.setPrinterInfo(deviceInformationActivity4.getString(R.string.printer_ready), true);
                                 String access$0008 = TAG;
-                                EPLog.m313i(access$0008, "Stt title: " + getString(R.string.printer_ready));
+                                EPLog.i(access$0008, "Stt title: " + getString(R.string.printer_ready));
                                 break;
                             }
                         }
@@ -138,12 +138,12 @@ public class DeviceInformationActivity extends ActivityIACommon {
                         DeviceInformationActivity deviceInformationActivity5 = DeviceInformationActivity.this;
                         deviceInformationActivity5.setPrinterInfo(deviceInformationActivity5.getString(R.string.wifi_direct_status), true);
                         String access$0009 = TAG;
-                        EPLog.m313i(access$0009, "Stt title: " + getString(R.string.printer_ready));
+                        EPLog.i(access$0009, "Stt title: " + getString(R.string.printer_ready));
                         break;
                     }
                     break;
                 default:
-                    EPLog.m313i("IprintHome", DirectorySelecterActivity.PARAM_DEFAULT_DIR);
+                    EPLog.i("IprintHome", DirectorySelecterActivity.PARAM_DEFAULT_DIR);
                     DeviceInformationActivity deviceInformationActivity6 = DeviceInformationActivity.this;
                     deviceInformationActivity6.setPrinterInfo(deviceInformationActivity6.getString(R.string.printer_not_select), false);
                     break;
@@ -177,7 +177,7 @@ public class DeviceInformationActivity extends ActivityIACommon {
 
     private void stopProbePrinter() {
         if (this.task != null) {
-            EPLog.m313i(this.TAG, "stopProbePrinter");
+            EPLog.i(this.TAG, "stopProbePrinter");
             mPrinter.doCancelFindPrinter();
             task.cancel(true);
             task = null;

BIN
app/src/main/res/drawable-hdpi-v4/abc_list_pressed_holo_dark.9.png


BIN
app/src/main/res/drawable-hdpi-v4/abc_tab_indicator_mtrl_alpha.9.png


+ 0 - 1
settings.gradle

@@ -1,3 +1,2 @@
-include ':guidelib'
 include ':app'
 rootProject.name = "Print"

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