0

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

@@ -41,6 +41,8 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.fragment.app.FragmentActivity;
+
 import com.epson.cameracopy.alt.UiCommon;
 import com.epson.cameracopy.device.CameraPreviewControl;
 import com.epson.cameracopy.printlayout.DocumentSizeInfo;
@@ -55,6 +57,7 @@ import epson.print.ActivityIACommon;
 import epson.print.ActivityRequestPermissions;
 
 import epson.print.CommonDefine;
+import epson.print.R;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
@@ -1400,43 +1403,4 @@ public class CropImageActivity extends ActivityIACommon implements View.OnClickL
             return correctionParam;
         }
     }
-
-    /* renamed from: com.epson.cameracopy.ui.CropImageActivity$EPxLog */
-    static class EPxLog {
-        EPxLog() {
-        }
-
-        /* renamed from: d */
-        public static final void m58d(String str, String str2) {
-            Log.d(str, str2);
-        }
-
-        /* renamed from: e */
-        public static final void m59e(String str, String str2) {
-            if (Debug.isDebuggerConnected()) {
-                Log.e(str, str2);
-            }
-        }
-
-        /* renamed from: i */
-        public static final void m60i(String str, String str2) {
-            if (Debug.isDebuggerConnected()) {
-                Log.i(str, str2);
-            }
-        }
-
-        /* renamed from: v */
-        public static final void m61v(String str, String str2) {
-            if (Debug.isDebuggerConnected()) {
-                Log.v(str, str2);
-            }
-        }
-
-        /* renamed from: w */
-        public static final void m62w(String str, String str2) {
-            if (Debug.isDebuggerConnected()) {
-                Log.w(str, str2);
-            }
-        }
-    }
 }

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

@@ -18,8 +18,6 @@ import android.graphics.drawable.BitmapDrawable;
 import android.os.Debug;
 import android.os.Handler;
 import android.os.Message;
-import android.support.p000v4.internal.view.SupportMenu;
-import android.support.p000v4.view.InputDeviceCompat;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -28,6 +26,9 @@ import android.view.MotionEvent;
 import android.view.ScaleGestureDetector;
 import android.view.View;
 
+import androidx.core.internal.view.SupportMenu;
+import androidx.core.view.InputDeviceCompat;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -62,8 +63,8 @@ public class ImageCollectView extends View {
     private int mViewMode = 0;
     private final GestureDetector.SimpleOnGestureListener onGestureDetectorListener = new GestureDetector.SimpleOnGestureListener() {
         public boolean onDoubleTap(MotionEvent motionEvent) {
-            ImageCollectView.this.ResetScalePos(true);
-            ImageCollectView.this.invalidate();
+            ResetScalePos(true);
+            invalidate();
             return super.onDoubleTap(motionEvent);
         }
 
@@ -105,14 +106,14 @@ public class ImageCollectView extends View {
         }
 
         public boolean onScale(ScaleGestureDetector scaleGestureDetector) {
-            ImageCollectView.this.SetScale(scaleGestureDetector.getScaleFactor());
-            ImageCollectView.this.invalidate();
+            SetScale(scaleGestureDetector.getScaleFactor());
+            invalidate();
             return true;
         }
 
         public void onScaleEnd(ScaleGestureDetector scaleGestureDetector) {
-            ImageCollectView.this.SetScale(scaleGestureDetector.getScaleFactor());
-            ImageCollectView.this.invalidate();
+            SetScale(scaleGestureDetector.getScaleFactor());
+            invalidate();
             super.onScaleEnd(scaleGestureDetector);
         }
     };
@@ -496,7 +497,7 @@ public class ImageCollectView extends View {
     }
 
     public void MessageOff() {
-        mData.mTimerCropImageCropCircle.TimerOff();
+        mData.mTimerOff();
     }
 
     public void ReleaseResource() {
@@ -504,7 +505,7 @@ public class ImageCollectView extends View {
         ReleaseMask();
         PathEffectData pathEffectData = mPathEffectData;
         if (pathEffectData != null) {
-            pathEffectData.Cleanup();
+            Cleanup();
         }
     }
 
@@ -593,30 +594,30 @@ public class ImageCollectView extends View {
             if (z) {
                 int i6 = mViewMode;
                 if (i6 == 0) {
-                    if (mGetCropPoint && mData.f133d[this.INVERT[mOrient]].dcm.mPointPreviewCrop[3].y != 0.0f) {
+                    if (mGetCropPoint && mData.f133d[INVERT[mOrient]].dcm.mPointPreviewCrop[3].y != 0.0f) {
                         for (int i7 = 0; i7 < 4; i7++) {
-                            mData.f133d[mOrient].dcm.mPointPreviewCrop[i7].x = ((mData.f133d[this.INVERT[mOrient]].dcm.mPointPreviewCrop[i7].x - mData.f133d[this.INVERT[mOrient]].mPointPreviewImageOffset.x) * f4) + mData.f133d[mOrient].mPointPreviewImageOffset.x;
-                            mData.f133d[mOrient].dcm.mPointPreviewCrop[i7].y = ((mData.f133d[this.INVERT[mOrient]].dcm.mPointPreviewCrop[i7].y - mData.f133d[this.INVERT[mOrient]].mPointPreviewImageOffset.y) * f4) + mData.f133d[mOrient].mPointPreviewImageOffset.y;
+                            mData.f133d[mOrient].dcm.mPointPreviewCrop[i7].x = ((mData.f133d[INVERT[mOrient]].dcm.mPointPreviewCrop[i7].x - mData.f133d[INVERT[mOrient]].mPointPreviewImageOffset.x) * f4) + mData.f133d[mOrient].mPointPreviewImageOffset.x;
+                            mData.f133d[mOrient].dcm.mPointPreviewCrop[i7].y = ((mData.f133d[INVERT[mOrient]].dcm.mPointPreviewCrop[i7].y - mData.f133d[INVERT[mOrient]].mPointPreviewImageOffset.y) * f4) + mData.f133d[mOrient].mPointPreviewImageOffset.y;
                         }
                         DataCropImage dataCropImage = mData.f133d[mOrient].dcm;
-                        mData.f133d[this.INVERT[mOrient]].dcm.mSelectArea = -1;
+                        mData.f133d[INVERT[mOrient]].dcm.mSelectArea = -1;
                         dataCropImage.mSelectArea = -1;
                     }
                 } else if (i6 == 1) {
-                    mData.f133d[mOrient].ddp[mViewMode].mScale[1] = mData.f133d[this.INVERT[mOrient]].ddp[mViewMode].mScale[1];
-                    mData.f133d[mOrient].ddp[mViewMode].mScale[0] = mData.f133d[this.INVERT[mOrient]].ddp[mViewMode].mScale[0];
-                    mData.f133d[mOrient].ddp[mViewMode].mPointMoveDeff[1].x = mData.f133d[this.INVERT[mOrient]].ddp[mViewMode].mPointMoveDeff[1].x * f4;
-                    mData.f133d[mOrient].ddp[mViewMode].mPointMoveDeff[1].y = mData.f133d[this.INVERT[mOrient]].ddp[mViewMode].mPointMoveDeff[1].y * f4;
-                    mData.f133d[mOrient].ddp[mViewMode].mPointMoveDeff[0].x = mData.f133d[this.INVERT[mOrient]].ddp[mViewMode].mPointMoveDeff[0].x * f4;
-                    mData.f133d[mOrient].ddp[mViewMode].mPointMoveDeff[0].y = mData.f133d[this.INVERT[mOrient]].ddp[mViewMode].mPointMoveDeff[0].y * f4;
+                    mData.f133d[mOrient].ddp[mViewMode].mScale[1] = mData.f133d[INVERT[mOrient]].ddp[mViewMode].mScale[1];
+                    mData.f133d[mOrient].ddp[mViewMode].mScale[0] = mData.f133d[INVERT[mOrient]].ddp[mViewMode].mScale[0];
+                    mData.f133d[mOrient].ddp[mViewMode].mPointMoveDeff[1].x = mData.f133d[INVERT[mOrient]].ddp[mViewMode].mPointMoveDeff[1].x * f4;
+                    mData.f133d[mOrient].ddp[mViewMode].mPointMoveDeff[1].y = mData.f133d[INVERT[mOrient]].ddp[mViewMode].mPointMoveDeff[1].y * f4;
+                    mData.f133d[mOrient].ddp[mViewMode].mPointMoveDeff[0].x = mData.f133d[INVERT[mOrient]].ddp[mViewMode].mPointMoveDeff[0].x * f4;
+                    mData.f133d[mOrient].ddp[mViewMode].mPointMoveDeff[0].y = mData.f133d[INVERT[mOrient]].ddp[mViewMode].mPointMoveDeff[0].y * f4;
                     DrawPreviewImageCalcMatrix(new Matrix());
                     DrawPreviewImagePointCheck(true);
                 }
             }
             if (z2 && f4 != 0.0f && mViewMode == 3) {
                 if (z) {
-                    mData.f133d[mOrient].dca.mPointArray = ClontPointArray(mData.f133d[this.INVERT[mOrient]].dca.mPointArray);
-                    mData.f133d[mOrient].dca.mPointEdgeArray = ClontPointArray(mData.f133d[this.INVERT[mOrient]].dca.mPointEdgeArray);
+                    mData.f133d[mOrient].dca.mPointArray = ClontPointArray(mData.f133d[INVERT[mOrient]].dca.mPointArray);
+                    mData.f133d[mOrient].dca.mPointEdgeArray = ClontPointArray(mData.f133d[INVERT[mOrient]].dca.mPointEdgeArray);
                 }
                 if (mData.f133d[mOrient].dca.mPointArray != null) {
                     for (List<PointF> it : mData.f133d[mOrient].dca.mPointArray) {
@@ -694,7 +695,7 @@ public class ImageCollectView extends View {
 
     private void DrawColorAdjustmentAll(Canvas canvas) {
         DrawPreviewImage(canvas);
-        mData.mPaintDragEdge.setPathEffect(mPathEffectData.BlinkingIndex((RectF) null));
+        mData.mPaintDragEdge.setPathEffect(mBlinkingIndex((RectF) null));
         canvas.drawRect(mData.f133d[mOrient].mRectPreviewImage, mData.mPaintDragEdge);
     }
 
@@ -747,7 +748,7 @@ public class ImageCollectView extends View {
                 }
             } else if (mData.f133d[mOrient].dca.mPointEdgeArray != null && !mData.f133d[mOrient].dca.mPointEdgeArray.isEmpty()) {
                 Path path3 = new Path();
-                mData.mPaintDragEdge.setPathEffect(mPathEffectData.BlinkingIndex((RectF) null));
+                mData.mPaintDragEdge.setPathEffect(mBlinkingIndex((RectF) null));
                 for (List next2 : mData.f133d[mOrient].dca.mPointEdgeArray) {
                     if (next2.size() > 0) {
                         PointF pointF5 = (PointF) next2.get(0);
@@ -905,14 +906,14 @@ public class ImageCollectView extends View {
             case 0:
                 float x = motionEvent.getX();
                 float y = motionEvent.getY();
-                mData.mTimerCropImageCropCircle.TimerOff();
+                mData.mTimerOff();
                 int TouchEventCropImageHitCheck2 = TouchEventCropImageHitCheck(x, y, true);
                 if (TouchEventCropImageHitCheck2 > -1) {
                     mData.f133d[mOrient].dcm.mPointPreviewTouch.set(x, y);
                     mData.f133d[mOrient].dcm.mSelectArea = TouchEventCropImageHitCheck2;
                     return;
                 } else if (mData.f133d[mOrient].dcm.mSelectArea > -1 && (TouchEventCropImageHitCheck = TouchEventCropImageHitCheck(x, y, false)) > -1) {
-                    mData.mTimerCropImageCropCircle.TimerOn(this);
+                    mData.mTimerOn(this);
                     mData.f133d[mOrient].dcm.mPointPreviewTouch.set(x, y);
                     mData.f133d[mOrient].dcm.mSelectArea = TouchEventCropImageHitCheck;
                     return;
@@ -922,7 +923,7 @@ public class ImageCollectView extends View {
             case 1:
             case 3:
                 if (mData.f133d[mOrient].dcm.mSelectArea > -1) {
-                    mData.mTimerCropImageCropCircle.TimerOn(this);
+                    mData.mTimerOn(this);
                     return;
                 }
                 return;
@@ -1195,9 +1196,9 @@ public class ImageCollectView extends View {
         private Handler mHandlerTimerCropImageTextMessage = new Handler() {
             public void handleMessage(Message message) {
                 if (message.what == 501) {
-                    ImageCollectView.mData.mShowTextMessage = false;
-                    if (TimerCropImageTextMessage.mView != null) {
-                        TimerCropImageTextMessage.mView.invalidate();
+                    mData.mShowTextMessage = false;
+                    if (mView != null) {
+                        mView.invalidate();
                     }
                 }
             }
@@ -1228,7 +1229,7 @@ public class ImageCollectView extends View {
                                 break;
                             }
                             try {
-                                if (TimerCropImageTextMessage.mBreak) {
+                                if (mBreak) {
                                     break;
                                 }
                                 Thread.sleep(200);
@@ -1237,8 +1238,8 @@ public class ImageCollectView extends View {
                                 e.printStackTrace();
                             }
                         }
-                        if (TimerCropImageTextMessage.mHandlerTimerCropImageTextMessage != null) {
-                            TimerCropImageTextMessage.mHandlerTimerCropImageTextMessage.sendEmptyMessage(501);
+                        if (mHandlerTimerCropImageTextMessage != null) {
+                            mHandlersendEmptyMessage(501);
                         }
                     }
                 });
@@ -1254,9 +1255,9 @@ public class ImageCollectView extends View {
         private Handler mHandlerTimerCropImageCropCircle = new Handler() {
             public void handleMessage(Message message) {
                 if (message.what == 500) {
-                    ImageCollectView.mData.f133d[ImageCollectView.mOrient].dcm.mSelectArea = -1;
-                    if (TimerCropImageCropCircle.mView != null) {
-                        TimerCropImageCropCircle.mView.invalidate();
+                    mData.f133d[mOrient].dcm.mSelectArea = -1;
+                    if (mView != null) {
+                        mView.invalidate();
                     }
                 }
             }
@@ -1294,19 +1295,19 @@ public class ImageCollectView extends View {
             mBreak = false;
             mTimer = new Thread(new Runnable() {
                 public void run() {
-                    while (!TimerCropImageCropCircle.mBreak) {
+                    while (!mBreak) {
                         try {
                             Thread.sleep(100);
                         } catch (InterruptedException e) {
                             e.printStackTrace();
                         }
-                        long unused = TimerCropImageCropCircle.mNewTime = System.currentTimeMillis();
-                        if (TimerCropImageCropCircle.mStartTime + ((long) i) <= TimerCropImageCropCircle.mNewTime) {
+                        long unused = mNewTime = System.currentTimeMillis();
+                        if (mStartTime + ((long) i) <= mNewTime) {
                             break;
                         }
                     }
-                    if (!TimerCropImageCropCircle.mBreak && TimerCropImageCropCircle.mHandlerTimerCropImageCropCircle != null) {
-                        TimerCropImageCropCircle.mHandlerTimerCropImageCropCircle.sendEmptyMessage(500);
+                    if (!mBreak && mHandlerTimerCropImageCropCircle != null) {
+                        mHandlersendEmptyMessage(500);
                     }
                 }
             });
@@ -1323,13 +1324,13 @@ public class ImageCollectView extends View {
         private boolean mBreak = false;
         private Handler mHandlerPathEffectData = new Handler() {
             public void handleMessage(Message message) {
-                if (message.what != PathEffectData.MSG_INVALIDATE_VIEW || PathEffectData.mView == null) {
+                if (message.what != MSG_INVALIDATE_VIEW || mView == null) {
                     return;
                 }
-                if (PathEffectData.mRectDirty.isEmpty()) {
-                    PathEffectData.mView.invalidate();
+                if (mRectDirty.isEmpty()) {
+                    mView.invalidate();
                 } else {
-                    PathEffectData.mView.invalidate(PathEffectData.mRectDirty);
+                    mView.invalidate(mRectDirty);
                 }
             }
         };
@@ -1344,8 +1345,8 @@ public class ImageCollectView extends View {
 
         public PathEffectData(View view) {
             mPathEffectList[0] = new DashPathEffect(new float[]{5.0f, 5.0f}, 8.0f);
-            mPathEffectList[1] = new DashPathEffect(new float[]{5.0f, 5.0f}, ImageCollectView.VIEW_MARGINE);
-            mPathEffectList[2] = new DashPathEffect(new float[]{5.0f, 5.0f}, ImageCollectView.SCALE_RANGE_MAX);
+            mPathEffectList[1] = new DashPathEffect(new float[]{5.0f, 5.0f}, VIEW_MARGINE);
+            mPathEffectList[2] = new DashPathEffect(new float[]{5.0f, 5.0f}, SCALE_RANGE_MAX);
             mPathEffectList[3] = new DashPathEffect(new float[]{5.0f, 5.0f}, 2.0f);
             mPathEffectList[4] = new DashPathEffect(new float[]{5.0f, 5.0f}, 0.0f);
             mView = view;
@@ -1407,15 +1408,15 @@ public class ImageCollectView extends View {
             mBreak = false;
             mTimer = new Thread(new Runnable() {
                 public void run() {
-                    while (!PathEffectData.mBreak) {
+                    while (!mBreak) {
                         try {
                             Thread.sleep(100);
                         } catch (InterruptedException e) {
                             e.printStackTrace();
                         }
-                        long unused = PathEffectData.mNewTime = System.currentTimeMillis();
-                        PathEffectData.mHandlerPathEffectData.sendEmptyMessage(PathEffectData.MSG_INVALIDATE_VIEW);
-                        if (PathEffectData.mStartTime + ((long) i) <= PathEffectData.mNewTime) {
+                        long unused = mNewTime = System.currentTimeMillis();
+                        mHandlersendEmptyMessage(MSG_INVALIDATE_VIEW);
+                        if (mStartTime + ((long) i) <= mNewTime) {
                             return;
                         }
                     }
@@ -1424,43 +1425,4 @@ public class ImageCollectView extends View {
             mTimer.start();
         }
     }
-
-    /* renamed from: com.epson.cameracopy.ui.ImageCollectView$EPxLog */
-    static class EPxLog {
-        EPxLog() {
-        }
-
-        /* renamed from: d */
-        public static final void m63d(String str, String str2) {
-            Log.d(str, str2);
-        }
-
-        /* renamed from: e */
-        public static final void m64e(String str, String str2) {
-            if (Debug.isDebuggerConnected()) {
-                Log.e(str, str2);
-            }
-        }
-
-        /* renamed from: i */
-        public static final void m65i(String str, String str2) {
-            if (Debug.isDebuggerConnected()) {
-                Log.i(str, str2);
-            }
-        }
-
-        /* renamed from: v */
-        public static final void m66v(String str, String str2) {
-            if (Debug.isDebuggerConnected()) {
-                Log.v(str, str2);
-            }
-        }
-
-        /* renamed from: w */
-        public static final void m67w(String str, String str2) {
-            if (Debug.isDebuggerConnected()) {
-                Log.w(str, str2);
-            }
-        }
-    }
 }

app/src/main/java/epson/colorcorrection/ImageCollect.java

@@ -1463,44 +1463,6 @@ public class ImageCollect {
         }
     }
 
-    static class EPxLog {
-        EPxLog() {
-        }
-
-        /* renamed from: d */
-        public static final void m298d(String str, String str2) {
-            Log.d(str, str2);
-        }
-
-        /* renamed from: e */
-        public static final void m299e(String str, String str2) {
-            if (Debug.isDebuggerConnected()) {
-                Log.e(str, str2);
-            }
-        }
-
-        /* renamed from: i */
-        public static final void m300i(String str, String str2) {
-            if (Debug.isDebuggerConnected()) {
-                Log.i(str, str2);
-            }
-        }
-
-        /* renamed from: v */
-        public static final void m301v(String str, String str2) {
-            if (Debug.isDebuggerConnected()) {
-                Log.v(str, str2);
-            }
-        }
-
-        /* renamed from: w */
-        public static final void m302w(String str, String str2) {
-            if (Debug.isDebuggerConnected()) {
-                Log.w(str, str2);
-            }
-        }
-    }
-
     private static void LogMemory(String str) {
         Runtime runtime = Runtime.getRuntime();
         float f = (float) runtime.totalMemory();

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

@@ -15,7 +15,7 @@ import epson.print.R;
 
 import java.util.ArrayList;
 
-public class BatteryInfoAdapter extends ArrayAdapter<BatteryInfoList> {
+public class BatteryInfoAdapter extends ArrayAdapter<BatteryInfoAdapter.BatteryInfoList> {
     private LayoutInflater mInflater;
     private ArrayList<BatteryInfoList> mItems;
     private int mResourceId;

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

@@ -4,6 +4,9 @@ package epson.maintain;
 import android.support.annotation.VisibleForTesting;
 import android.support.media.ExifInterface;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.Closeable;
@@ -24,137 +27,14 @@ public class EfuReader {
     /* JADX WARNING: Removed duplicated region for block: B:37:0x0062 A[SYNTHETIC, Splitter:B:37:0x0062] */
     /* Code decompiled incorrectly, please refer to instructions dump. */
     public static void unzipOnlyOneEntry(@android.support.annotation.NonNull java.lang.String r3, @android.support.annotation.NonNull java.lang.String r4) throws java.io.IOException {
-        /*
-            java.util.zip.ZipFile r0 = new java.util.zip.ZipFile
-            r0.<init>(r3)
-            int r3 = r0.size()
-            r1 = 1
-            if (r3 != r1) goto L_0x007d
-            java.util.Enumeration r3 = r0.entries()
-            boolean r1 = r3.hasMoreElements()
-            if (r1 == 0) goto L_0x0075
-            java.lang.Object r3 = r3.nextElement()     // Catch:{ NoSuchElementException -> 0x006e }
-            java.util.zip.ZipEntry r3 = (java.util.zip.ZipEntry) r3     // Catch:{ NoSuchElementException -> 0x006e }
-            boolean r1 = r3.isDirectory()
-            if (r1 != 0) goto L_0x0066
-            r1 = 0
-            java.io.BufferedInputStream r2 = new java.io.BufferedInputStream     // Catch:{ all -> 0x0059 }
-            java.io.InputStream r3 = r0.getInputStream(r3)     // Catch:{ all -> 0x0059 }
-            r2.<init>(r3)     // Catch:{ all -> 0x0059 }
-            java.io.BufferedOutputStream r3 = new java.io.BufferedOutputStream     // Catch:{ all -> 0x0057 }
-            java.io.FileOutputStream r0 = new java.io.FileOutputStream     // Catch:{ all -> 0x0057 }
-            r0.<init>(r4)     // Catch:{ all -> 0x0057 }
-            r3.<init>(r0)     // Catch:{ all -> 0x0057 }
-            r4 = 4096(0x1000, float:5.74E-42)
-            byte[] r4 = new byte[r4]     // Catch:{ all -> 0x0054 }
-        L_0x003a:
-            r0 = -1
-            int r1 = r2.read(r4)     // Catch:{ IOException -> 0x004d }
-            if (r0 == r1) goto L_0x0046
-            r0 = 0
-            r3.write(r4, r0, r1)     // Catch:{ IOException -> 0x004d }
-            goto L_0x003a
-        L_0x0046:
-            r3.close()
-            r2.close()     // Catch:{ IOException -> 0x004c }
-        L_0x004c:
-            return
-        L_0x004d:
-            r4 = move-exception
-            epson.maintain.EfuReader$WriteException r0 = new epson.maintain.EfuReader$WriteException     // Catch:{ all -> 0x0054 }
-            r0.<init>(r4)     // Catch:{ all -> 0x0054 }
-            throw r0     // Catch:{ all -> 0x0054 }
-        L_0x0054:
-            r4 = move-exception
-            r1 = r3
-            goto L_0x005b
-        L_0x0057:
-            r4 = move-exception
-            goto L_0x005b
-        L_0x0059:
-            r4 = move-exception
-            r2 = r1
-        L_0x005b:
-            if (r1 == 0) goto L_0x0060
-            r1.close()
-        L_0x0060:
-            if (r2 == 0) goto L_0x0065
-            r2.close()     // Catch:{ IOException -> 0x0065 }
-        L_0x0065:
-            throw r4
-        L_0x0066:
-            java.io.IOException r3 = new java.io.IOException
-            java.lang.String r4 = "zip no entry."
-            r3.<init>(r4)
-            throw r3
-        L_0x006e:
-            r3 = move-exception
-            java.io.IOException r4 = new java.io.IOException
-            r4.<init>(r3)
-            throw r4
-        L_0x0075:
-            java.io.IOException r3 = new java.io.IOException
-            java.lang.String r4 = "zip no entry."
-            r3.<init>(r4)
-            throw r3
-        L_0x007d:
-            java.io.IOException r3 = new java.io.IOException
-            java.lang.StringBuilder r4 = new java.lang.StringBuilder
-            r4.<init>()
-            java.lang.String r1 = "entry != 1 <"
-            r4.append(r1)
-            int r0 = r0.size()
-            r4.append(r0)
-            java.lang.String r0 = ">"
-            r4.append(r0)
-            java.lang.String r4 = r4.toString()
-            r3.<init>(r4)
-            throw r3
-        */
+
         throw new UnsupportedOperationException("Method not decompiled: epson.maintain.EfuReader.unzipOnlyOneEntry(java.lang.String, java.lang.String):void");
     }
 
     /* JADX WARNING: Removed duplicated region for block: B:22:0x0031  */
     /* Code decompiled incorrectly, please refer to instructions dump. */
     public void writeOnlyOneFirmwareData(java.io.File r3, java.io.File r4) throws java.io.IOException {
-        /*
-            r2 = this;
-            boolean r0 = epson.maintain.EfuReader.RcxFileReader.checkHeaderId(r3)
-            if (r0 != 0) goto L_0x0035
-            r0 = 0
-            epson.maintain.EfuReader$RcxFileReader r1 = new epson.maintain.EfuReader$RcxFileReader     // Catch:{ all -> 0x002d }
-            r1.<init>(r3)     // Catch:{ all -> 0x002d }
-            boolean r3 = r1.readHeader()     // Catch:{ all -> 0x002b }
-            if (r3 == 0) goto L_0x0025
-            boolean r3 = r2.checkHeaderData(r1)     // Catch:{ all -> 0x002b }
-            if (r3 == 0) goto L_0x001f
-            r1.writeOnlyOneFirmwareData(r4)     // Catch:{ all -> 0x002b }
-            r1.close()
-            return
-        L_0x001f:
-            java.io.IOException r3 = new java.io.IOException     // Catch:{ all -> 0x002b }
-            r3.<init>()     // Catch:{ all -> 0x002b }
-            throw r3     // Catch:{ all -> 0x002b }
-        L_0x0025:
-            java.io.IOException r3 = new java.io.IOException     // Catch:{ all -> 0x002b }
-            r3.<init>()     // Catch:{ all -> 0x002b }
-            throw r3     // Catch:{ all -> 0x002b }
-        L_0x002b:
-            r3 = move-exception
-            goto L_0x002f
-        L_0x002d:
-            r3 = move-exception
-            r1 = r0
-        L_0x002f:
-            if (r1 == 0) goto L_0x0034
-            r1.close()
-        L_0x0034:
-            throw r3
-        L_0x0035:
-            java.io.IOException r3 = new java.io.IOException
-            r3.<init>()
-            throw r3
-        */
+
         throw new UnsupportedOperationException("Method not decompiled: epson.maintain.EfuReader.writeOnlyOneFirmwareData(java.io.File, java.io.File):void");
     }
 
@@ -194,44 +74,7 @@ public class EfuReader {
         /* JADX WARNING: Removed duplicated region for block: B:27:0x0028 A[SYNTHETIC, Splitter:B:27:0x0028] */
         /* Code decompiled incorrectly, please refer to instructions dump. */
         private static byte[] getFileByte(java.io.File r5, int r6) {
-            /*
-                byte[] r0 = new byte[r6]
-                r1 = 0
-                java.io.FileInputStream r2 = new java.io.FileInputStream     // Catch:{ IOException -> 0x0025, all -> 0x001e }
-                r2.<init>(r5)     // Catch:{ IOException -> 0x0025, all -> 0x001e }
-                r5 = 0
-            L_0x0009:
-                int r3 = r6 - r5
-                int r3 = r2.read(r0, r5, r3)     // Catch:{ IOException -> 0x001c, all -> 0x0019 }
-                r4 = -1
-                if (r3 == r4) goto L_0x0015
-                int r5 = r5 + r3
-                if (r5 < r6) goto L_0x0009
-            L_0x0015:
-                r2.close()     // Catch:{ IOException -> 0x0018 }
-            L_0x0018:
-                return r0
-            L_0x0019:
-                r5 = move-exception
-                r1 = r2
-                goto L_0x001f
-            L_0x001c:
-                goto L_0x0026
-            L_0x001e:
-                r5 = move-exception
-            L_0x001f:
-                if (r1 == 0) goto L_0x0024
-                r1.close()     // Catch:{ IOException -> 0x0024 }
-            L_0x0024:
-                throw r5
-            L_0x0025:
-                r2 = r1
-            L_0x0026:
-                if (r2 == 0) goto L_0x002b
-                r2.close()     // Catch:{ IOException -> 0x002b }
-            L_0x002b:
-                return r1
-            */
+
             throw new UnsupportedOperationException("Method not decompiled: epson.maintain.EfuReader.RcxFileReader.getFileByte(java.io.File, int):byte[]");
         }
 
@@ -247,51 +90,7 @@ public class EfuReader {
         /* JADX WARNING: Exception block dominator not found, dom blocks: [] */
         /* Code decompiled incorrectly, please refer to instructions dump. */
         public boolean readHeader() {
-            /*
-                r6 = this;
-                java.util.HashMap<java.lang.String, java.lang.String> r0 = r6.mSectionAKeyAndValue
-                r0.clear()
-                r0 = -1
-                r6.mHeaderEndPosition = r0
-                r0 = 0
-                java.lang.String r1 = ""
-            L_0x000c:
-                java.io.RandomAccessFile r2 = r6.f333is     // Catch:{ IOException | OutOfMemoryError -> 0x0048, all -> 0x0046 }
-                java.lang.String r2 = r6.getNextLine(r2)     // Catch:{ IOException | OutOfMemoryError -> 0x0048, all -> 0x0046 }
-                r3 = 1
-                if (r2 == 0) goto L_0x003d
-                boolean r4 = isCommentLine(r2)     // Catch:{ IOException | OutOfMemoryError -> 0x0048, all -> 0x0046 }
-                if (r4 == 0) goto L_0x001c
-                goto L_0x000c
-            L_0x001c:
-                java.lang.String r4 = isSectionSeparator(r2)     // Catch:{ IOException | OutOfMemoryError -> 0x0048, all -> 0x0046 }
-                if (r4 == 0) goto L_0x0024
-                r1 = r4
-                goto L_0x000c
-            L_0x0024:
-                java.lang.String[] r2 = isKeyAndValueData(r2)     // Catch:{ IOException | OutOfMemoryError -> 0x0048, all -> 0x0046 }
-                if (r2 != 0) goto L_0x002b
-                goto L_0x000c
-            L_0x002b:
-                java.lang.String r4 = "A"
-                boolean r4 = r4.equals(r1)     // Catch:{ IOException | OutOfMemoryError -> 0x0048, all -> 0x0046 }
-                if (r4 == 0) goto L_0x000c
-                java.util.HashMap<java.lang.String, java.lang.String> r4 = r6.mSectionAKeyAndValue     // Catch:{ IOException | OutOfMemoryError -> 0x0048, all -> 0x0046 }
-                r5 = r2[r0]     // Catch:{ IOException | OutOfMemoryError -> 0x0048, all -> 0x0046 }
-                r2 = r2[r3]     // Catch:{ IOException | OutOfMemoryError -> 0x0048, all -> 0x0046 }
-                r4.put(r5, r2)     // Catch:{ IOException | OutOfMemoryError -> 0x0048, all -> 0x0046 }
-                goto L_0x000c
-            L_0x003d:
-                java.io.RandomAccessFile r1 = r6.f333is     // Catch:{ IOException | OutOfMemoryError -> 0x0048, all -> 0x0046 }
-                long r1 = r1.getFilePointer()     // Catch:{ IOException | OutOfMemoryError -> 0x0048, all -> 0x0046 }
-                r6.mHeaderEndPosition = r1     // Catch:{ IOException | OutOfMemoryError -> 0x0048, all -> 0x0046 }
-                return r3
-            L_0x0046:
-                r0 = move-exception
-                throw r0
-            L_0x0048:
-                return r0
-            */
+
             throw new UnsupportedOperationException("Method not decompiled: epson.maintain.EfuReader.RcxFileReader.readHeader():boolean");
         }
 
@@ -370,143 +169,13 @@ public class EfuReader {
         @android.support.annotation.VisibleForTesting
         /* Code decompiled incorrectly, please refer to instructions dump. */
         static void writeRemainingData(@android.support.annotation.NonNull java.io.RandomAccessFile r3, long r4, @android.support.annotation.NonNull java.io.File r6) throws java.io.IOException {
-            /*
-                r0 = 0
-                java.io.BufferedOutputStream r1 = new java.io.BufferedOutputStream     // Catch:{ IOException -> 0x002d }
-                java.io.FileOutputStream r2 = new java.io.FileOutputStream     // Catch:{ IOException -> 0x002d }
-                r2.<init>(r6)     // Catch:{ IOException -> 0x002d }
-                r1.<init>(r2)     // Catch:{ IOException -> 0x002d }
-                r3.seek(r4)     // Catch:{ IOException -> 0x0028, all -> 0x0025 }
-                writeRemainingData(r3, r1)     // Catch:{ IOException -> 0x0028, all -> 0x0025 }
-                r1.close()     // Catch:{ IOException -> 0x0015 }
-                return
-            L_0x0015:
-                r3 = move-exception
-                boolean r4 = r6.exists()
-                if (r4 == 0) goto L_0x001f
-                r6.delete()
-            L_0x001f:
-                epson.maintain.EfuReader$WriteException r4 = new epson.maintain.EfuReader$WriteException
-                r4.<init>(r3)
-                throw r4
-            L_0x0025:
-                r3 = move-exception
-                r0 = r1
-                goto L_0x0038
-            L_0x0028:
-                r3 = move-exception
-                r0 = r1
-                goto L_0x002e
-            L_0x002b:
-                r3 = move-exception
-                goto L_0x0038
-            L_0x002d:
-                r3 = move-exception
-            L_0x002e:
-                boolean r4 = r6.exists()     // Catch:{ all -> 0x002b }
-                if (r4 == 0) goto L_0x0037
-                r6.delete()     // Catch:{ all -> 0x002b }
-            L_0x0037:
-                throw r3     // Catch:{ all -> 0x002b }
-            L_0x0038:
-                if (r0 == 0) goto L_0x004e
-                r0.close()     // Catch:{ IOException -> 0x003e }
-                goto L_0x004e
-            L_0x003e:
-                r3 = move-exception
-                boolean r4 = r6.exists()
-                if (r4 == 0) goto L_0x0048
-                r6.delete()
-            L_0x0048:
-                epson.maintain.EfuReader$WriteException r4 = new epson.maintain.EfuReader$WriteException
-                r4.<init>(r3)
-                throw r4
-            L_0x004e:
-                throw r3
-            */
+
             throw new UnsupportedOperationException("Method not decompiled: epson.maintain.EfuReader.RcxFileReader.writeRemainingData(java.io.RandomAccessFile, long, java.io.File):void");
         }
 
-        /* JADX WARNING: Code restructure failed: missing block: B:21:0x002f, code lost:
-            r8.delete();
-         */
-        /* JADX WARNING: Code restructure failed: missing block: B:24:?, code lost:
-            r1.close();
-         */
-        /* JADX WARNING: Code restructure failed: missing block: B:27:0x003c, code lost:
-            if (r8.exists() == false) goto L_?;
-         */
-        /* JADX WARNING: Code restructure failed: missing block: B:38:?, code lost:
-            return false;
-         */
-        /* JADX WARNING: Code restructure failed: missing block: B:39:?, code lost:
-            return false;
-         */
-        /* JADX WARNING: Code restructure failed: missing block: B:40:?, code lost:
-            return false;
-         */
-        /* JADX WARNING: Failed to process nested try/catch */
-        /* JADX WARNING: Missing exception handler attribute for start block: B:18:0x0029 */
-        /* JADX WARNING: Removed duplicated region for block: B:21:0x002f A[Catch:{ all -> 0x0027 }] */
-        /* JADX WARNING: Removed duplicated region for block: B:23:0x0034 A[SYNTHETIC, Splitter:B:23:0x0034] */
-        /* JADX WARNING: Removed duplicated region for block: B:29:0x0042 A[SYNTHETIC, Splitter:B:29:0x0042] */
-        /* JADX WARNING: Removed duplicated region for block: B:38:? A[RETURN, SYNTHETIC] */
-        /* Code decompiled incorrectly, please refer to instructions dump. */
+
         static boolean searchDataAndWriteRemaining(@android.support.annotation.NonNull java.io.RandomAccessFile r4, long r5, @android.support.annotation.NonNull byte[] r7, @android.support.annotation.NonNull java.io.File r8) {
-            /*
-                r0 = 0
-                r1 = 0
-                java.io.BufferedOutputStream r2 = new java.io.BufferedOutputStream     // Catch:{ IOException -> 0x0029 }
-                java.io.FileOutputStream r3 = new java.io.FileOutputStream     // Catch:{ IOException -> 0x0029 }
-                r3.<init>(r8)     // Catch:{ IOException -> 0x0029 }
-                r2.<init>(r3)     // Catch:{ IOException -> 0x0029 }
-                seekDataPosition(r4, r5, r7)     // Catch:{ IOException -> 0x0025, all -> 0x0022 }
-                writeRemainingData(r4, r2)     // Catch:{ IOException -> 0x0025, all -> 0x0022 }
-                r4 = 1
-                r2.close()     // Catch:{ IOException -> 0x0018 }
-                r0 = 1
-                goto L_0x003f
-            L_0x0018:
-                boolean r4 = r8.exists()
-                if (r4 == 0) goto L_0x003f
-            L_0x001e:
-                r8.delete()
-                goto L_0x003f
-            L_0x0022:
-                r4 = move-exception
-                r1 = r2
-                goto L_0x0040
-            L_0x0025:
-                r1 = r2
-                goto L_0x0029
-            L_0x0027:
-                r4 = move-exception
-                goto L_0x0040
-            L_0x0029:
-                boolean r4 = r8.exists()     // Catch:{ all -> 0x0027 }
-                if (r4 == 0) goto L_0x0032
-                r8.delete()     // Catch:{ all -> 0x0027 }
-            L_0x0032:
-                if (r1 == 0) goto L_0x003f
-                r1.close()     // Catch:{ IOException -> 0x0038 }
-                goto L_0x003f
-            L_0x0038:
-                boolean r4 = r8.exists()
-                if (r4 == 0) goto L_0x003f
-                goto L_0x001e
-            L_0x003f:
-                return r0
-            L_0x0040:
-                if (r1 == 0) goto L_0x004f
-                r1.close()     // Catch:{ IOException -> 0x0046 }
-                goto L_0x004f
-            L_0x0046:
-                boolean r5 = r8.exists()
-                if (r5 == 0) goto L_0x004f
-                r8.delete()
-            L_0x004f:
-                throw r4
-            */
+
             throw new UnsupportedOperationException("Method not decompiled: epson.maintain.EfuReader.RcxFileReader.searchDataAndWriteRemaining(java.io.RandomAccessFile, long, byte[], java.io.File):boolean");
         }
 

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

@@ -3,6 +3,8 @@ package epson.maintain;
 
 import android.support.annotation.VisibleForTesting;
 
+import androidx.annotation.Nullable;
+
 import java.util.HashMap;
 
 public class FirmInfFile {
@@ -42,139 +44,15 @@ public class FirmInfFile {
         return mInfFileVersion;
     }
 
-    /* JADX WARNING: Code restructure failed: missing block: B:27:0x0042, code lost:
-        return false;
-     */
-    /* Code decompiled incorrectly, please refer to instructions dump. */
     public synchronized boolean checkInfFileVersion(byte[] r4) {
-        /*
-            r3 = this;
-            monitor-enter(r3)
-            r0 = 0
-            r3.mInfFileVersion = r0     // Catch:{ all -> 0x0043 }
-            boolean r4 = r3.parseInfFile(r4)     // Catch:{ all -> 0x0043 }
-            if (r4 != 0) goto L_0x000c
-            monitor-exit(r3)
-            return r0
-        L_0x000c:
-            java.util.HashMap<java.lang.String, java.lang.String> r4 = r3.mUpdateInf     // Catch:{ all -> 0x0043 }
-            java.lang.String r1 = "VERMAIN"
-            boolean r4 = r4.containsKey(r1)     // Catch:{ all -> 0x0043 }
-            if (r4 == 0) goto L_0x0041
-            java.util.HashMap<java.lang.String, java.lang.String> r4 = r3.mUpdateInf     // Catch:{ all -> 0x0043 }
-            java.lang.String r1 = "VERNET"
-            boolean r4 = r4.containsKey(r1)     // Catch:{ all -> 0x0043 }
-            if (r4 != 0) goto L_0x0021
-            goto L_0x0041
-        L_0x0021:
-            java.util.HashMap<java.lang.String, java.lang.String> r4 = r3.mUpdateInf     // Catch:{ all -> 0x0043 }
-            java.lang.String r1 = "URLROM1"
-            boolean r4 = r4.containsKey(r1)     // Catch:{ all -> 0x0043 }
-            r1 = 1
-            if (r4 == 0) goto L_0x0030
-            r3.mInfFileVersion = r1     // Catch:{ all -> 0x0043 }
-            monitor-exit(r3)
-            return r1
-        L_0x0030:
-            java.util.HashMap<java.lang.String, java.lang.String> r4 = r3.mUpdateInf     // Catch:{ all -> 0x0043 }
-            java.lang.String r2 = "URLROMEFU"
-            boolean r4 = r4.containsKey(r2)     // Catch:{ all -> 0x0043 }
-            if (r4 == 0) goto L_0x003f
-            r4 = 2
-            r3.mInfFileVersion = r4     // Catch:{ all -> 0x0043 }
-            monitor-exit(r3)
-            return r1
-        L_0x003f:
-            monitor-exit(r3)
-            return r0
-        L_0x0041:
-            monitor-exit(r3)
-            return r0
-        L_0x0043:
-            r4 = move-exception
-            monitor-exit(r3)
-            throw r4
-        */
+
         throw new UnsupportedOperationException("Method not decompiled: epson.maintain.FirmInfFile.checkInfFileVersion(byte[]):boolean");
     }
 
-    /* access modifiers changed from: package-private */
-    /* JADX WARNING: Code restructure failed: missing block: B:29:0x0071, code lost:
-        return false;
-     */
     @android.support.annotation.VisibleForTesting
     /* Code decompiled incorrectly, please refer to instructions dump. */
     public synchronized boolean parseInfFile(byte[] r10) {
-        /*
-            r9 = this;
-            monitor-enter(r9)
-            r0 = 0
-            if (r10 == 0) goto L_0x0070
-            int r1 = r10.length     // Catch:{ all -> 0x006d }
-            r2 = 4
-            if (r1 >= r2) goto L_0x0009
-            goto L_0x0070
-        L_0x0009:
-            int r1 = r10.length     // Catch:{ all -> 0x006d }
-            int r1 = r1 - r2
-            byte[] r1 = new byte[r1]     // Catch:{ all -> 0x006d }
-            int r3 = r1.length     // Catch:{ all -> 0x006d }
-            java.lang.System.arraycopy(r10, r2, r1, r0, r3)     // Catch:{ all -> 0x006d }
-            java.lang.String r10 = new java.lang.String     // Catch:{ all -> 0x006d }
-            r10.<init>(r1)     // Catch:{ all -> 0x006d }
-            java.lang.String r1 = ";\r\n"
-            java.lang.String[] r10 = r10.split(r1)     // Catch:{ all -> 0x006d }
-            java.util.HashMap<java.lang.String, java.lang.String> r1 = r9.mUpdateInf     // Catch:{ all -> 0x006d }
-            r1.clear()     // Catch:{ all -> 0x006d }
-            r9.mRomNum = r0     // Catch:{ all -> 0x006d }
-            int r1 = r10.length     // Catch:{ all -> 0x006d }
-            r2 = 0
-        L_0x0025:
-            r3 = 1
-            if (r2 >= r1) goto L_0x006b
-            r4 = r10[r2]     // Catch:{ all -> 0x006d }
-            java.lang.String r5 = ":"
-            int r5 = r4.indexOf(r5)     // Catch:{ all -> 0x006d }
-            r6 = -1
-            if (r5 != r6) goto L_0x0034
-            goto L_0x0068
-        L_0x0034:
-            java.lang.String r7 = r4.substring(r0, r5)     // Catch:{ all -> 0x006d }
-            int r5 = r5 + 1
-            int r8 = r4.length()     // Catch:{ all -> 0x006d }
-            java.lang.String r4 = r4.substring(r5, r8)     // Catch:{ all -> 0x006d }
-            boolean r5 = epson.maintain.FirmwareManager.DEV_FWUPDATE     // Catch:{ all -> 0x006d }
-            if (r5 == 0) goto L_0x0056
-            java.lang.String r5 = "URLROM"
-            int r5 = r7.indexOf(r5)     // Catch:{ all -> 0x006d }
-            if (r5 == r6) goto L_0x0056
-            java.lang.String r5 = "https://epsonpfu.ebz.epson.net"
-            java.lang.String r8 = "https://epsonpfu-stg.ebz.epson.net"
-            java.lang.String r4 = r4.replaceAll(r5, r8)     // Catch:{ all -> 0x006d }
-        L_0x0056:
-            java.lang.String r5 = "URLROM"
-            int r5 = r7.indexOf(r5)     // Catch:{ all -> 0x006d }
-            if (r5 == r6) goto L_0x0063
-            int r5 = r9.mRomNum     // Catch:{ all -> 0x006d }
-            int r5 = r5 + r3
-            r9.mRomNum = r5     // Catch:{ all -> 0x006d }
-        L_0x0063:
-            java.util.HashMap<java.lang.String, java.lang.String> r3 = r9.mUpdateInf     // Catch:{ all -> 0x006d }
-            r3.put(r7, r4)     // Catch:{ all -> 0x006d }
-        L_0x0068:
-            int r2 = r2 + 1
-            goto L_0x0025
-        L_0x006b:
-            monitor-exit(r9)
-            return r3
-        L_0x006d:
-            r10 = move-exception
-            monitor-exit(r9)
-            throw r10
-        L_0x0070:
-            monitor-exit(r9)
-            return r0
-        */
+
         throw new UnsupportedOperationException("Method not decompiled: epson.maintain.FirmInfFile.parseInfFile(byte[]):boolean");
     }
 

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

@@ -1,14 +1,13 @@
 package epson.maintain.activity;
 
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
 import android.os.AsyncTask;
 import android.os.Bundle;
-
-
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.Observer;
+
 import epson.common.DialogProgress;
 import epson.common.DialogProgressViewModel;
 import epson.print.ActivityIACommon;
@@ -44,7 +43,7 @@ public class EccPrintLog extends ActivityIACommon implements DialogProgress.Dial
         EPLog.m313i(LOG_TAG, "onCreate() start");
         super.onCreate(bundle);
         setContentView(R.layout.epsonconnect_print_log);
-        mModelDialog = (DialogProgressViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressViewModel.class);
+        mModelDialog = (DialogProgressViewModel) ViewModelProviders.of((FragmentActivity) this).get(DialogProgressViewModel.class);
         mModelDialog.getDialogJob().observe(this, new Observer() {
             public final void onChanged(Object obj) {
                 EccPrintLog.lambda$onCreate$0(EccPrintLog.this, (Deque) obj);

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

@@ -1,6 +1,5 @@
 package epson.maintain.activity;
 
-/* compiled from: EccPrintLog */
 class EccPrintLogException extends Exception {
     public static final int ECC_LIB_INITIAL_ERROR = 10;
     private static final long serialVersionUID = 1;

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

@@ -1,6 +1,5 @@
 package epson.maintain.activity;
-
-import android.arch.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModel;
 
 public class EccPrintLogViewModel extends ViewModel {
     private String[] mTitleAndMessage;

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

@@ -3,6 +3,8 @@ package epson.print;
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import androidx.annotation.NonNull;
+
 
 @Deprecated
 public class ScanFileNumber {

app/src/main/java/epson/print/storage/box/BoxNetClient.java

@@ -3,6 +3,9 @@ package epson.print.storage.box;
 import android.app.Activity;
 import android.content.Context;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.box.androidsdk.content.BoxApiFile;
 import com.box.androidsdk.content.BoxApiFolder;
 import com.box.androidsdk.content.BoxApiSearch;
@@ -29,6 +32,8 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 
 import epson.print.IprintApplication;
+import epson.print.R;
+import epson.print.storage.StorageServiceClient;
 
 public class BoxNetClient extends StorageServiceClient {
     private static BoxNetClient sBoxClient;

app/src/main/java/epson/print/storage/onedrive/OneDriveClient.java

@@ -5,6 +5,8 @@ import android.content.Context;
 import android.os.AsyncTask;
 import android.support.p000v4.app.NotificationCompat;
 
+import androidx.annotation.NonNull;
+
 import com.box.androidsdk.content.models.BoxRepresentation;
 import com.epson.iprint.storage.StorageItem;
 import com.epson.iprint.storage.StorageSecureStore;
@@ -35,6 +37,7 @@ import java.util.Collections;
 import java.util.List;
 
 import epson.print.CommonDefine;
+import epson.print.R;
 import epson.server.utils.Define;
 
 public class OneDriveClient extends StorageServiceClient {
@@ -297,7 +300,7 @@ public class OneDriveClient extends StorageServiceClient {
         }
     }
 
-    private void getOneDriveClient(Activity activity, final OneDriveAuthenticator.OnOneDriveAuthenticatorListener onOneDriveAuthenticatorListener) {
+    public void getOneDriveClient(Activity activity, final OneDriveAuthenticator.OnOneDriveAuthenticatorListener onOneDriveAuthenticatorListener) {
         OneDriveAuthenticator.getOneDriveClient(activity, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
             public void onNotifyOneDriveClient(IOneDriveClient iOneDriveClient) {
                 IOneDriveClient unused = OneDriveClient.this.oneDriveClient = iOneDriveClient;

app/src/main/java/epson/print/storage/onedrive/OneDriveStorageProcessUploadActivity.java

@@ -2,6 +2,7 @@ package epson.print.storage.onedrive;
 
 import android.content.Context;
 import android.content.Intent;
+import android.view.View;
 import android.widget.Button;
 
 import com.epson.iprint.storage.StorageProcessActivity;
@@ -9,6 +10,9 @@ import com.epson.iprint.storage.StorageProcessUploadActivity;
 import com.epson.iprint.storage.StorageServiceClient;
 import com.onedrive.sdk.extensions.IOneDriveClient;
 
+import epson.print.R;
+import epson.print.storage.StorageProcessUploadActivity;
+
 
 public class OneDriveStorageProcessUploadActivity extends StorageProcessUploadActivity {
     protected static final String TAG = "OneDriveStorageProcessUploadActivity";
@@ -38,16 +42,16 @@ public class OneDriveStorageProcessUploadActivity extends StorageProcessUploadAc
                 new Thread() {
                     public void run() {
                         super.run();
-                        OneDriveStorageProcessUploadActivity.mStorageServiceClient.getOneDriveClient(OneDriveStorageProcessUploadActivity.this, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
+                        mStorageServiceClient.getOneDriveClient(this, new OneDriveAuthenticator.OnOneDriveAuthenticatorListener() {
                             public void onNotifyOneDriveClient(IOneDriveClient iOneDriveClient) {
-                                OneDriveStorageProcessUploadActivity.this.findViewById(R.id.folder_content_layout_for_upload).setVisibility(View.VISIBLE);
+                                findViewById(R.id.folder_content_layout_for_upload).setVisibility(View.VISIBLE);
                                 if (iOneDriveClient == null) {
-                                    OneDriveStorageProcessUploadActivity.mStorageServiceClient.revokeSignedInData(OneDriveStorageProcessUploadActivity.this);
-                                    OneDriveStorageProcessUploadActivity.this.updateSignInStatus();
-                                } else if (OneDriveStorageProcessUploadActivity.mExpired) {
-                                    OneDriveStorageProcessUploadActivity.mExpired = false;
-                                    OneDriveStorageProcessUploadActivity.mStorageServiceClient.resetUploadProcessError();
-                                    ((Button) OneDriveStorageProcessUploadActivity.this.findViewById(R.id.save_button)).performClick();
+                                    mStorageServiceClient.revokeSignedInData(this);
+                                    updateSignInStatus();
+                                } else if (mExpired) {
+                                    mExpired = false;
+                                    mStorageServiceClient.resetUploadProcessError();
+                                    ((Button) findViewById(R.id.save_button)).performClick();
                                 }
                             }
                         });

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

@@ -30,7 +30,7 @@ import epson.scan.lib.CancelableScannerProbe;
 import epson.scan.lib.EscanLibException;
 import epson.scan.lib.I1ScanParams;
 
-public class I2ScanTask extends AsyncTask<Void, Void, TaskError> {
+public class I2ScanTask extends AsyncTask<Void, Void, I2ScanTask.TaskError> {
     private static final String LOG_TAG = "I2ScanTask";
     private Context mApplicationContext;
     private volatile boolean mCancelRequested;

app/src/main/java/epson/scan/lib/CancelableScannerProbe.java

@@ -23,348 +23,13 @@ public class CancelableScannerProbe {
         	at jadx.core.dex.visitors.regions.RegionMakerVisitor.visit(RegionMakerVisitor.java:52)
         */
     public java.lang.String probeScanner_test(epson.scan.activity.ScannerPropertyWrapper r7, android.content.Context r8) {
-        /*
-            r6 = this;
-            r0 = 0
-            r6.mEscanLib = r0
-            r1 = 0
-            monitor-enter(r6)     // Catch:{ all -> 0x00d2 }
-            epson.scan.lib.escanLib r2 = new epson.scan.lib.escanLib     // Catch:{ all -> 0x00cf }
-            r2.<init>()     // Catch:{ all -> 0x00cf }
-            r6.mEscanLib = r2     // Catch:{ all -> 0x00cf }
-            monitor-exit(r6)     // Catch:{ all -> 0x00cf }
-            r2 = 0
-        L_0x000e:
-            epson.scan.lib.escanLib r3 = r6.mEscanLib     // Catch:{ all -> 0x00cd }
-            int r3 = r3.escanWrapperInitDriver(r8)     // Catch:{ all -> 0x00cd }
-            r4 = -1050(0xfffffffffffffbe6, float:NaN)
-            r5 = 1
-            if (r3 == r4) goto L_0x0035
-            if (r3 == 0) goto L_0x0033
-            monitor-enter(r6)
-            r6.mProbingScanner = r1     // Catch:{ all -> 0x0030 }
-            monitor-exit(r6)     // Catch:{ all -> 0x0030 }
-            epson.scan.lib.escanLib r7 = r6.mEscanLib
-            if (r7 == 0) goto L_0x0028
-            if (r2 == 0) goto L_0x0028
-            r7.escanWrapperReleaseDriver()
-        L_0x0028:
-            monitor-enter(r6)
-            r6.mEscanLib = r0     // Catch:{ all -> 0x002d }
-            monitor-exit(r6)     // Catch:{ all -> 0x002d }
-            return r0
-        L_0x002d:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x002d }
-            throw r7
-        L_0x0030:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x0030 }
-            throw r7
-        L_0x0033:
-            r2 = 1
-            goto L_0x003a
-        L_0x0035:
-            epson.scan.lib.escanLib r3 = r6.mEscanLib     // Catch:{ all -> 0x00cd }
-            r3.escanWrapperReleaseDriver()     // Catch:{ all -> 0x00cd }
-        L_0x003a:
-            if (r2 == 0) goto L_0x000e
-            java.lang.String r8 = r7.getIp()     // Catch:{ all -> 0x00cd }
-            java.lang.String r3 = r7.getScannerId()     // Catch:{ all -> 0x00cd }
-            monitor-enter(r6)     // Catch:{ all -> 0x00cd }
-            r6.mProbingScanner = r5     // Catch:{ all -> 0x00ca }
-            monitor-exit(r6)     // Catch:{ all -> 0x00ca }
-            if (r8 == 0) goto L_0x00ac
-            boolean r4 = r8.isEmpty()     // Catch:{ all -> 0x00cd }
-            if (r4 != 0) goto L_0x00ac
-            epson.scan.lib.escanLib r4 = r6.mEscanLib     // Catch:{ all -> 0x00cd }
-            int r4 = r4.probeScannerByIp(r3, r8)     // Catch:{ all -> 0x00cd }
-            if (r4 != 0) goto L_0x0070
-            monitor-enter(r6)
-            r6.mProbingScanner = r1     // Catch:{ all -> 0x006d }
-            monitor-exit(r6)     // Catch:{ all -> 0x006d }
-            epson.scan.lib.escanLib r7 = r6.mEscanLib
-            if (r7 == 0) goto L_0x0065
-            if (r2 == 0) goto L_0x0065
-            r7.escanWrapperReleaseDriver()
-        L_0x0065:
-            monitor-enter(r6)
-            r6.mEscanLib = r0     // Catch:{ all -> 0x006a }
-            monitor-exit(r6)     // Catch:{ all -> 0x006a }
-            return r8
-        L_0x006a:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x006a }
-            throw r7
-        L_0x006d:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x006d }
-            throw r7
-        L_0x0070:
-            int r7 = r7.getLocation()     // Catch:{ all -> 0x00cd }
-            if (r7 == r5) goto L_0x008e
-            monitor-enter(r6)
-            r6.mProbingScanner = r1     // Catch:{ all -> 0x008b }
-            monitor-exit(r6)     // Catch:{ all -> 0x008b }
-            epson.scan.lib.escanLib r7 = r6.mEscanLib
-            if (r7 == 0) goto L_0x0083
-            if (r2 == 0) goto L_0x0083
-            r7.escanWrapperReleaseDriver()
-        L_0x0083:
-            monitor-enter(r6)
-            r6.mEscanLib = r0     // Catch:{ all -> 0x0088 }
-            monitor-exit(r6)     // Catch:{ all -> 0x0088 }
-            return r0
-        L_0x0088:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x0088 }
-            throw r7
-        L_0x008b:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x008b }
-            throw r7
-        L_0x008e:
-            epson.scan.lib.escanLib r7 = r6.mEscanLib     // Catch:{ all -> 0x00cd }
-            java.lang.String r7 = localProbeById(r7, r3, r8)     // Catch:{ all -> 0x00cd }
-            monitor-enter(r6)
-            r6.mProbingScanner = r1     // Catch:{ all -> 0x00a9 }
-            monitor-exit(r6)     // Catch:{ all -> 0x00a9 }
-            epson.scan.lib.escanLib r8 = r6.mEscanLib
-            if (r8 == 0) goto L_0x00a1
-            if (r2 == 0) goto L_0x00a1
-            r8.escanWrapperReleaseDriver()
-        L_0x00a1:
-            monitor-enter(r6)
-            r6.mEscanLib = r0     // Catch:{ all -> 0x00a6 }
-            monitor-exit(r6)     // Catch:{ all -> 0x00a6 }
-            return r7
-        L_0x00a6:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x00a6 }
-            throw r7
-        L_0x00a9:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x00a9 }
-            throw r7
-        L_0x00ac:
-            epson.scan.lib.escanLib r7 = r6.mEscanLib     // Catch:{ all -> 0x00cd }
-            java.lang.String r7 = localProbeById(r7, r3, r8)     // Catch:{ all -> 0x00cd }
-            monitor-enter(r6)
-            r6.mProbingScanner = r1     // Catch:{ all -> 0x00c7 }
-            monitor-exit(r6)     // Catch:{ all -> 0x00c7 }
-            epson.scan.lib.escanLib r8 = r6.mEscanLib
-            if (r8 == 0) goto L_0x00bf
-            if (r2 == 0) goto L_0x00bf
-            r8.escanWrapperReleaseDriver()
-        L_0x00bf:
-            monitor-enter(r6)
-            r6.mEscanLib = r0     // Catch:{ all -> 0x00c4 }
-            monitor-exit(r6)     // Catch:{ all -> 0x00c4 }
-            return r7
-        L_0x00c4:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x00c4 }
-            throw r7
-        L_0x00c7:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x00c7 }
-            throw r7
-        L_0x00ca:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x00ca }
-            throw r7     // Catch:{ all -> 0x00cd }
-        L_0x00cd:
-            r7 = move-exception
-            goto L_0x00d4
-        L_0x00cf:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x00cf }
-            throw r7     // Catch:{ all -> 0x00d2 }
-        L_0x00d2:
-            r7 = move-exception
-            r2 = 0
-        L_0x00d4:
-            monitor-enter(r6)
-            r6.mProbingScanner = r1     // Catch:{ all -> 0x00e9 }
-            monitor-exit(r6)     // Catch:{ all -> 0x00e9 }
-            epson.scan.lib.escanLib r8 = r6.mEscanLib
-            if (r8 == 0) goto L_0x00e1
-            if (r2 == 0) goto L_0x00e1
-            r8.escanWrapperReleaseDriver()
-        L_0x00e1:
-            monitor-enter(r6)
-            r6.mEscanLib = r0     // Catch:{ all -> 0x00e6 }
-            monitor-exit(r6)     // Catch:{ all -> 0x00e6 }
-            throw r7
-        L_0x00e6:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x00e6 }
-            throw r7
-        L_0x00e9:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x00e9 }
-            throw r7
-        */
+
         throw new UnsupportedOperationException("Method not decompiled: epson.scan.lib.CancelableScannerProbe.probeScanner_test(epson.scan.activity.ScannerPropertyWrapper, android.content.Context):java.lang.String");
     }
 
-    /*  JADX ERROR: IndexOutOfBoundsException in pass: RegionMakerVisitor
-        java.lang.IndexOutOfBoundsException: Index: 0, Size: 0
-        	at java.util.ArrayList.rangeCheck(ArrayList.java:657)
-        	at java.util.ArrayList.get(ArrayList.java:433)
-        	at jadx.core.dex.nodes.InsnNode.getArg(InsnNode.java:101)
-        	at jadx.core.dex.visitors.regions.RegionMaker.traverseMonitorExits(RegionMaker.java:611)
-        	at jadx.core.dex.visitors.regions.RegionMaker.traverseMonitorExits(RegionMaker.java:619)
-        	at jadx.core.dex.visitors.regions.RegionMaker.traverseMonitorExits(RegionMaker.java:619)
-        	at jadx.core.dex.visitors.regions.RegionMaker.traverseMonitorExits(RegionMaker.java:619)
-        	at jadx.core.dex.visitors.regions.RegionMaker.processMonitorEnter(RegionMaker.java:561)
-        	at jadx.core.dex.visitors.regions.RegionMaker.traverse(RegionMaker.java:133)
-        	at jadx.core.dex.visitors.regions.RegionMaker.makeRegion(RegionMaker.java:86)
-        	at jadx.core.dex.visitors.regions.RegionMaker.processHandlersOutBlocks(RegionMaker.java:1008)
-        	at jadx.core.dex.visitors.regions.RegionMaker.processTryCatchBlocks(RegionMaker.java:978)
-        	at jadx.core.dex.visitors.regions.RegionMakerVisitor.visit(RegionMakerVisitor.java:52)
-        */
+
     public java.lang.String probeScanner(epson.scan.activity.ScannerPropertyWrapper r7, android.content.Context r8) throws epson.scan.lib.EscanLibException {
-        /*
-            r6 = this;
-            r0 = 0
-            r6.mEscanLib = r0
-            r1 = 0
-            monitor-enter(r6)     // Catch:{ all -> 0x009b }
-            epson.scan.lib.escanLib r2 = new epson.scan.lib.escanLib     // Catch:{ all -> 0x0098 }
-            r2.<init>()     // Catch:{ all -> 0x0098 }
-            r6.mEscanLib = r2     // Catch:{ all -> 0x0098 }
-            monitor-exit(r6)     // Catch:{ all -> 0x0098 }
-            r2 = 0
-        L_0x000e:
-            epson.scan.lib.escanLib r3 = r6.mEscanLib     // Catch:{ all -> 0x0096 }
-            int r3 = r3.escanWrapperInitDriver(r8)     // Catch:{ all -> 0x0096 }
-            r4 = -1050(0xfffffffffffffbe6, float:NaN)
-            r5 = 1
-            if (r3 == r4) goto L_0x0035
-            if (r3 == 0) goto L_0x0033
-            monitor-enter(r6)
-            r6.mProbingScanner = r1     // Catch:{ all -> 0x0030 }
-            monitor-exit(r6)     // Catch:{ all -> 0x0030 }
-            epson.scan.lib.escanLib r7 = r6.mEscanLib
-            if (r7 == 0) goto L_0x0028
-            if (r2 == 0) goto L_0x0028
-            r7.escanWrapperReleaseDriver()
-        L_0x0028:
-            monitor-enter(r6)
-            r6.mEscanLib = r0     // Catch:{ all -> 0x002d }
-            monitor-exit(r6)     // Catch:{ all -> 0x002d }
-            return r0
-        L_0x002d:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x002d }
-            throw r7
-        L_0x0030:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x0030 }
-            throw r7
-        L_0x0033:
-            r2 = 1
-            goto L_0x003a
-        L_0x0035:
-            epson.scan.lib.escanLib r3 = r6.mEscanLib     // Catch:{ all -> 0x0096 }
-            r3.escanWrapperReleaseDriver()     // Catch:{ all -> 0x0096 }
-        L_0x003a:
-            if (r2 == 0) goto L_0x000e
-            java.lang.String r8 = r7.getIp()     // Catch:{ all -> 0x0096 }
-            java.lang.String r3 = r7.getScannerId()     // Catch:{ all -> 0x0096 }
-            monitor-enter(r6)     // Catch:{ all -> 0x0096 }
-            r6.mProbingScanner = r5     // Catch:{ all -> 0x0093 }
-            monitor-exit(r6)     // Catch:{ all -> 0x0093 }
-            int r7 = r7.getLocation()     // Catch:{ all -> 0x0096 }
-            r4 = 3
-            if (r7 != r4) goto L_0x0075
-            epson.scan.lib.escanLib r7 = r6.mEscanLib     // Catch:{ all -> 0x0096 }
-            int r7 = r7.probeScannerByIp(r3, r8)     // Catch:{ all -> 0x0096 }
-            if (r7 != 0) goto L_0x006f
-            monitor-enter(r6)
-            r6.mProbingScanner = r1     // Catch:{ all -> 0x006c }
-            monitor-exit(r6)     // Catch:{ all -> 0x006c }
-            epson.scan.lib.escanLib r7 = r6.mEscanLib
-            if (r7 == 0) goto L_0x0064
-            if (r2 == 0) goto L_0x0064
-            r7.escanWrapperReleaseDriver()
-        L_0x0064:
-            monitor-enter(r6)
-            r6.mEscanLib = r0     // Catch:{ all -> 0x0069 }
-            monitor-exit(r6)     // Catch:{ all -> 0x0069 }
-            return r8
-        L_0x0069:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x0069 }
-            throw r7
-        L_0x006c:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x006c }
-            throw r7
-        L_0x006f:
-            epson.scan.lib.EscanLibException r8 = new epson.scan.lib.EscanLibException     // Catch:{ all -> 0x0096 }
-            r8.<init>(r7)     // Catch:{ all -> 0x0096 }
-            throw r8     // Catch:{ all -> 0x0096 }
-        L_0x0075:
-            epson.scan.lib.escanLib r7 = r6.mEscanLib     // Catch:{ all -> 0x0096 }
-            java.lang.String r7 = localProbeById(r7, r3, r8)     // Catch:{ all -> 0x0096 }
-            monitor-enter(r6)
-            r6.mProbingScanner = r1     // Catch:{ all -> 0x0090 }
-            monitor-exit(r6)     // Catch:{ all -> 0x0090 }
-            epson.scan.lib.escanLib r8 = r6.mEscanLib
-            if (r8 == 0) goto L_0x0088
-            if (r2 == 0) goto L_0x0088
-            r8.escanWrapperReleaseDriver()
-        L_0x0088:
-            monitor-enter(r6)
-            r6.mEscanLib = r0     // Catch:{ all -> 0x008d }
-            monitor-exit(r6)     // Catch:{ all -> 0x008d }
-            return r7
-        L_0x008d:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x008d }
-            throw r7
-        L_0x0090:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x0090 }
-            throw r7
-        L_0x0093:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x0093 }
-            throw r7     // Catch:{ all -> 0x0096 }
-        L_0x0096:
-            r7 = move-exception
-            goto L_0x009d
-        L_0x0098:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x0098 }
-            throw r7     // Catch:{ all -> 0x009b }
-        L_0x009b:
-            r7 = move-exception
-            r2 = 0
-        L_0x009d:
-            monitor-enter(r6)
-            r6.mProbingScanner = r1     // Catch:{ all -> 0x00b2 }
-            monitor-exit(r6)     // Catch:{ all -> 0x00b2 }
-            epson.scan.lib.escanLib r8 = r6.mEscanLib
-            if (r8 == 0) goto L_0x00aa
-            if (r2 == 0) goto L_0x00aa
-            r8.escanWrapperReleaseDriver()
-        L_0x00aa:
-            monitor-enter(r6)
-            r6.mEscanLib = r0     // Catch:{ all -> 0x00af }
-            monitor-exit(r6)     // Catch:{ all -> 0x00af }
-            throw r7
-        L_0x00af:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x00af }
-            throw r7
-        L_0x00b2:
-            r7 = move-exception
-            monitor-exit(r6)     // Catch:{ all -> 0x00b2 }
-            throw r7
-        */
+
         throw new UnsupportedOperationException("Method not decompiled: epson.scan.lib.CancelableScannerProbe.probeScanner(epson.scan.activity.ScannerPropertyWrapper, android.content.Context):java.lang.String");
     }
 

app/src/main/java/epson/server/utils/MyUtility.java

@@ -20,7 +20,7 @@ import java.net.URL;
 import java.net.URLConnection;
 
 public final class MyUtility {
-    public static File createTempFile(Context context, String str, String str2) {
+    public static File createTempFile(Context context, String str, String str2) throws IOException {
         if (str2.indexOf(CommonDefine.SLASH) != -1 || str2.indexOf("\\") != -1) {
             return null;
         }