liuyuqi-dellpc 3 years ago
parent
commit
1941115e97
40 changed files with 7 additions and 679 deletions
  1. 0 1
      app/src/main/java/com/epson/cameracopy/ui/CropImageActivity.java
  2. 0 2
      app/src/main/java/com/epson/cameracopy/ui/PrintPreviewActivity.java
  3. 0 1
      app/src/main/java/com/epson/iprint/prtlogger/Analytics.java
  4. 0 2
      app/src/main/java/com/epson/iprint/prtlogger/AnalyticsPreferences.java
  5. 0 1
      app/src/main/java/com/epson/memcardacc/EscprLibPrinter.java
  6. 0 1
      app/src/main/java/com/epson/mobilephone/common/ble/BleAsyncTask.java
  7. 0 1
      app/src/main/java/com/epson/mobilephone/common/ble/BleScanWork.java
  8. 0 1
      app/src/main/java/com/epson/mobilephone/common/ble/BleWork.java
  9. 0 2
      app/src/main/java/com/epson/mobilephone/common/ble/BleWorkActivity.java
  10. 0 1
      app/src/main/java/com/epson/mobilephone/common/ble/DeviceAdapter.java
  11. 0 2
      app/src/main/java/com/epson/mobilephone/common/ble/ProbePrinter.java
  12. 0 3
      app/src/main/java/com/epson/mobilephone/common/ble/util/BLEUtility.java
  13. 0 1
      app/src/main/java/com/epson/mobilephone/common/escpr/EscprLib.java
  14. 0 1
      app/src/main/java/com/epson/mobilephone/common/maintain/MaintainPrinter.java
  15. 0 1
      app/src/main/java/com/epson/mobilephone/common/maintain2/MaintainPrinter2.java
  16. 0 2
      app/src/main/java/com/epson/mobilephone/common/usb/UsbPrintDriver.java
  17. 0 1
      app/src/main/java/com/epson/mobilephone/common/usb/UsbPrinter.java
  18. 0 1
      app/src/main/java/com/epson/mobilephone/common/usb/UsbReciever.java
  19. 0 242
      app/src/main/java/epson/common/EpLog.java
  20. 2 0
      app/src/main/java/epson/common/OsAssistant.java
  21. 0 75
      app/src/main/java/epson/common/ReviewInvitationDialog.java
  22. 0 52
      app/src/main/java/epson/common/ReviewInvitationViewModel.java
  23. 0 52
      app/src/main/java/epson/common/StoreReview.java
  24. 5 207
      app/src/main/java/epson/common/Utils.java
  25. 0 1
      app/src/main/java/epson/epsonconnectregistration/ECAvailableCheckTask.java
  26. 0 2
      app/src/main/java/epson/epsonconnectregistration/ECBaseTask.java
  27. 0 2
      app/src/main/java/epson/epsonconnectregistration/ECConfigurationTask.java
  28. 0 2
      app/src/main/java/epson/epsonconnectregistration/SoapAUTHENTICATIONDataInfo.java
  29. 0 2
      app/src/main/java/epson/epsonconnectregistration/SoapConfigDataParser.java
  30. 0 1
      app/src/main/java/epson/epsonconnectregistration/SoapWEBSETUPDataInfo.java
  31. 0 2
      app/src/main/java/epson/maintain/activity/LogUrl.java
  32. 0 1
      app/src/main/java/epson/maintain/activity/MaintainActivity.java
  33. 0 1
      app/src/main/java/epson/maintain/activity/MaintainPrinterSearchActivity.java
  34. 0 2
      app/src/main/java/epson/print/ActivityDocsPrintPreview.java
  35. 0 2
      app/src/main/java/epson/print/ActivityPrintWeb.java
  36. 0 3
      app/src/main/java/epson/print/ActivityViewImageSelect.java
  37. 0 2
      app/src/main/java/epson/print/IprintApplication.java
  38. 0 1
      app/src/main/java/epson/print/IprintHome.java
  39. 0 1
      app/src/main/java/epson/provider/SharedPreferencesProvider.java
  40. 0 1
      app/src/main/java/epson/support/DeviceInformationActivity.java

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

@@ -45,7 +45,6 @@ import com.epson.cameracopy.alt.UiCommon;
 import com.epson.cameracopy.device.CameraPreviewControl;
 import com.epson.cameracopy.printlayout.DocumentSizeInfo;
 import com.epson.cameracopy.printlayout.RegistedDocumentSizeList;
-import com.epson.mobilephone.common.EpLog;
 
 import epson.colorcorrection.ImageCollect;
 import epson.common.DialogProgress;

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

@@ -35,8 +35,6 @@ import androidx.annotation.Nullable;
 import com.epson.cameracopy.printlayout.ImageAndLayout;
 import com.epson.cameracopy.printlayout.ManuscriptSize;
 import com.epson.cameracopy.printlayout.PreviewView;
-import com.epson.mobilephone.common.ReviewInvitationDialog;
-import com.epson.mobilephone.common.ReviewInvitationViewModel;
 import com.epson.mobilephone.common.escpr.MediaInfo;
 import com.epson.mobilephone.common.wifidirect.NfcTagUtils;
 

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

@@ -6,7 +6,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.box.androidsdk.content.BoxConstants;
-import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
 
 

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

@@ -3,8 +3,6 @@ package com.epson.iprint.prtlogger;
 import android.content.Context;
 
 
-import com.epson.mobilephone.common.EpLog;
-
 import epson.provider.SharedPreferencesProvider;
 
 public class AnalyticsPreferences {

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

@@ -2,7 +2,6 @@ package com.epson.memcardacc;
 
 import android.content.Context;
 
-import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.maintain2.MaintainPrinter2;
 
 import epson.print.MyPrinter;

+ 0 - 1
app/src/main/java/com/epson/mobilephone/common/ble/BleAsyncTask.java

@@ -9,7 +9,6 @@ import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.HandlerThread;
 
-import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.ble.util.BLEUtility;
 import com.epson.mobilephone.common.ble.util.ScannedDevice;
 

+ 0 - 1
app/src/main/java/com/epson/mobilephone/common/ble/BleScanWork.java

@@ -17,7 +17,6 @@ import android.os.ParcelUuid;
 import android.support.annotation.RequiresApi;
 import android.util.SparseArray;
 
-import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.ble.util.BLEUtility;
 import com.epson.mobilephone.common.ble.util.BLEUuid;
 import com.epson.mobilephone.common.ble.util.ScannedDevice;

+ 0 - 1
app/src/main/java/com/epson/mobilephone/common/ble/BleWork.java

@@ -15,7 +15,6 @@ import android.os.Build;
 import android.os.Handler;
 
 
-import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.ble.util.BLEUtility;
 import com.epson.mobilephone.common.ble.util.BLEUuid;
 import com.epson.mobilephone.common.ble.util.ScannedDevice;

+ 0 - 2
app/src/main/java/com/epson/mobilephone/common/ble/BleWorkActivity.java

@@ -24,8 +24,6 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 
 import com.epson.iprint.prtlogger.Analytics;
-import com.epson.mobilephone.common.EpLog;
-import com.epson.mobilephone.common.ble.BleWork;
 import com.epson.mobilephone.common.ble.util.BLEUtility;
 import com.epson.mobilephone.common.ble.util.ScannedDevice;
 

+ 0 - 1
app/src/main/java/com/epson/mobilephone/common/ble/DeviceAdapter.java

@@ -11,7 +11,6 @@ import android.widget.ArrayAdapter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.ble.util.ScannedDevice;
 
 import epson.print.IprintApplication;

+ 0 - 2
app/src/main/java/com/epson/mobilephone/common/ble/ProbePrinter.java

@@ -11,8 +11,6 @@ import android.os.Message;
 import android.os.RemoteException;
 import android.support.media.ExifInterface;
 
-import com.epson.mobilephone.common.EpLog;
-import com.epson.mobilephone.common.ble.BleWorkActivity;
 import com.epson.mobilephone.common.maintain2.MaintainPrinter2;
 import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
 

+ 0 - 3
app/src/main/java/com/epson/mobilephone/common/ble/util/BLEUtility.java

@@ -3,9 +3,6 @@ package com.epson.mobilephone.common.ble.util;
 import android.bluetooth.BluetoothManager;
 import android.content.Context;
 
-
-import com.epson.mobilephone.common.EpLog;
-
 public class BLEUtility {
     public static final int GATT_BUSY = 132;
     public static final int GATT_DB_FULL = 131;

+ 0 - 1
app/src/main/java/com/epson/mobilephone/common/escpr/EscprLib.java

@@ -7,7 +7,6 @@ import android.os.Handler;
 import android.os.Message;
 
 import com.box.androidsdk.content.models.BoxUser;
-import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.maintain.EPS_SUPPLY_INFO;
 import com.epson.mobilephone.common.maintain2.BatteryInfo;
 import com.epson.mobilephone.common.maintain2.BatteryInfoEx;

+ 0 - 1
app/src/main/java/com/epson/mobilephone/common/maintain/MaintainPrinter.java

@@ -2,7 +2,6 @@ package com.epson.mobilephone.common.maintain;
 
 import android.content.Context;
 
-import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.escpr.EscprLib;
 
 public class MaintainPrinter {

+ 0 - 1
app/src/main/java/com/epson/mobilephone/common/maintain2/MaintainPrinter2.java

@@ -2,7 +2,6 @@ package com.epson.mobilephone.common.maintain2;
 
 import android.content.Context;
 
-import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.escpr.EscprLib;
 
 import java.util.EnumMap;

+ 0 - 2
app/src/main/java/com/epson/mobilephone/common/usb/UsbPrintDriver.java

@@ -7,8 +7,6 @@ import android.hardware.usb.UsbEndpoint;
 import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbManager;
 
-import com.epson.mobilephone.common.EpLog;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 

+ 0 - 1
app/src/main/java/com/epson/mobilephone/common/usb/UsbPrinter.java

@@ -7,7 +7,6 @@ import android.hardware.usb.UsbInterface;
 import android.hardware.usb.UsbManager;
 import android.os.Build;
 
-import com.epson.mobilephone.common.EpLog;
 import com.evernote.edam.limits.Constants;
 
 public class UsbPrinter {

+ 0 - 1
app/src/main/java/com/epson/mobilephone/common/usb/UsbReciever.java

@@ -7,7 +7,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.hardware.usb.UsbDevice;
 
-import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.PrintingLib.define.Constants;
 
 import java.util.Iterator;

+ 0 - 242
app/src/main/java/epson/common/EpLog.java

@@ -1,242 +0,0 @@
-package com.epson.mobilephone.common;
-
-import android.os.Debug;
-import android.support.p000v4.media.session.PlaybackStateCompat;
-import android.util.Log;
-
-import epson.print.CommonDefine;
-
-import java.text.DecimalFormat;
-
-public final class EpLog {
-    public static final String TAG = "Epson App";
-    private static boolean isDebug = false;
-
-    private static String null2str(String str) {
-        return str == null ? "(null)" : str;
-    }
-
-    private EpLog() {
-    }
-
-    public static void setDebuggable(boolean z) {
-        if (z) {
-            isDebug = true;
-        } else {
-            isDebug = false;
-        }
-    }
-
-    /* renamed from: v */
-    public static void m79v() {
-        if (isDebug) {
-            Log.v("Epson App", getMetaInfo());
-        }
-    }
-
-    /* renamed from: v */
-    public static void m80v(String str) {
-        if (isDebug) {
-            Log.v("Epson App", getMetaInfo() + null2str(str));
-        }
-    }
-
-    /* renamed from: v */
-    public static void m81v(String str, String str2) {
-        if (isDebug) {
-            Log.v(str, getMetaInfo() + null2str(str2));
-        }
-    }
-
-    /* renamed from: d */
-    public static void m68d() {
-        if (isDebug) {
-            Log.d("Epson App", getMetaInfo());
-        }
-    }
-
-    /* renamed from: d */
-    public static void m69d(String str) {
-        if (isDebug) {
-            Log.d("Epson App", getMetaInfo() + null2str(str));
-        }
-    }
-
-    /* renamed from: d */
-    public static void m70d(String str, String str2) {
-        if (isDebug) {
-            Log.d(str, getMetaInfo() + null2str(str2));
-        }
-    }
-
-    /* renamed from: i */
-    public static void m76i() {
-        if (isDebug) {
-            Log.i("Epson App", getMetaInfo());
-        }
-    }
-
-    /* renamed from: i */
-    public static void m77i(String str) {
-        if (isDebug) {
-            Log.i("Epson App", getMetaInfo() + null2str(str));
-        }
-    }
-
-    /* renamed from: i */
-    public static void m78i(String str, String str2) {
-        if (isDebug) {
-            Log.i(str, getMetaInfo() + null2str(str2));
-        }
-    }
-
-    /* renamed from: w */
-    public static void m82w(String str) {
-        if (isDebug) {
-            Log.w("Epson App", getMetaInfo() + null2str(str));
-        }
-    }
-
-    /* renamed from: w */
-    public static void m83w(String str, String str2) {
-        if (isDebug) {
-            Log.w(str, getMetaInfo() + null2str(str2));
-        }
-    }
-
-    /* renamed from: w */
-    public static void m85w(String str, Throwable th) {
-        if (isDebug) {
-            Log.w("Epson App", getMetaInfo() + null2str(str), th);
-            printThrowable(th);
-            if (th.getCause() != null) {
-                printThrowable(th.getCause());
-            }
-        }
-    }
-
-    /* renamed from: w */
-    public static void m84w(String str, String str2, Throwable th) {
-        if (isDebug) {
-            Log.w(str, getMetaInfo() + null2str(str2), th);
-            printThrowable(str, th);
-            if (th.getCause() != null) {
-                printThrowable(th.getCause());
-            }
-        }
-    }
-
-    /* renamed from: e */
-    public static void m71e(String str) {
-        if (isDebug) {
-            Log.e("Epson App", getMetaInfo() + null2str(str));
-        }
-    }
-
-    /* renamed from: e */
-    public static void m72e(String str, String str2) {
-        if (isDebug) {
-            Log.e(str, getMetaInfo() + null2str(str2));
-        }
-    }
-
-    /* renamed from: e */
-    public static void m74e(String str, Throwable th) {
-        if (isDebug) {
-            Log.e("Epson App", getMetaInfo() + null2str(str), th);
-            printThrowable(th);
-            if (th.getCause() != null) {
-                printThrowable(th.getCause());
-            }
-        }
-    }
-
-    /* renamed from: e */
-    public static void m73e(String str, String str2, Throwable th) {
-        if (isDebug) {
-            Log.e(str, getMetaInfo() + null2str(str2), th);
-            printThrowable(str, th);
-            if (th.getCause() != null) {
-                printThrowable(th.getCause());
-            }
-        }
-    }
-
-    /* renamed from: e */
-    public static void m75e(Throwable th) {
-        if (isDebug) {
-            printThrowable(th);
-            if (th.getCause() != null) {
-                printThrowable(th.getCause());
-            }
-        }
-    }
-
-    private static void printThrowable(Throwable th) {
-        Log.e("Epson App", th.getClass().getName() + ": " + th.getMessage());
-        for (StackTraceElement stackTraceElement : th.getStackTrace()) {
-            Log.e("Epson App", "  at " + getMetaInfo(stackTraceElement));
-        }
-    }
-
-    private static void printThrowable(String str, Throwable th) {
-        Log.e(str, th.getClass().getName() + ": " + th.getMessage());
-        for (StackTraceElement stackTraceElement : th.getStackTrace()) {
-            Log.e("Epson App", "  at " + getMetaInfo(stackTraceElement));
-        }
-    }
-
-    private static String getMetaInfo() {
-        return getMetaInfo(Thread.currentThread().getStackTrace()[4]);
-    }
-
-    public static String getMetaInfo(StackTraceElement stackTraceElement) {
-        StringBuffer stringBuffer = new StringBuffer();
-        String className = stackTraceElement.getClassName();
-        String substring = className.substring(className.lastIndexOf(CommonDefine.DOT) + 1);
-        String methodName = stackTraceElement.getMethodName();
-        int lineNumber = stackTraceElement.getLineNumber();
-        stringBuffer.append("[");
-        stringBuffer.append(substring);
-        stringBuffer.append("#");
-        stringBuffer.append(methodName);
-        stringBuffer.append(":");
-        stringBuffer.append(lineNumber);
-        stringBuffer.append("]");
-        return new String(stringBuffer);
-    }
-
-    public static final void heap() {
-        heap("Epson App");
-    }
-
-    public static final void heap(String str) {
-        if (isDebug) {
-            DecimalFormat decimalFormat = new DecimalFormat("0.00");
-            StringBuffer stringBuffer = new StringBuffer();
-            stringBuffer.append("Native heap : Free=");
-            stringBuffer.append(Long.toString(Debug.getNativeHeapFreeSize() / PlaybackStateCompat.ACTION_PLAY_FROM_MEDIA_ID));
-            stringBuffer.append("kb");
-            stringBuffer.append(", Allocated=");
-            stringBuffer.append(decimalFormat.format(((Debug.getNativeHeapAllocatedSize()) / 1024.0d) / 1024.0d));
-            stringBuffer.append("MB");
-            stringBuffer.append(", Size=");
-            stringBuffer.append(decimalFormat.format(((Debug.getNativeHeapSize()) / 1024.0d) / 1024.0d));
-            stringBuffer.append("MB");
-            stringBuffer.append(System.getProperty("line.separator"));
-            stringBuffer.append("Dalvik heap : Free=");
-            stringBuffer.append(Long.toString(Runtime.getRuntime().freeMemory() / PlaybackStateCompat.ACTION_PLAY_FROM_MEDIA_ID));
-            stringBuffer.append("kb");
-            stringBuffer.append(", Total=");
-            stringBuffer.append(decimalFormat.format(((Runtime.getRuntime().totalMemory()) / 1024.0d) / 1024.0d));
-            stringBuffer.append("MB");
-            stringBuffer.append(", Now Size=");
-            stringBuffer.append(decimalFormat.format((((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory())) / 1024.0d) / 1024.0d));
-            stringBuffer.append("MB");
-            stringBuffer.append(", MAX Size=");
-            stringBuffer.append(decimalFormat.format(((Runtime.getRuntime().maxMemory()) / 1024.0d) / 1024.0d));
-            stringBuffer.append("MB");
-            Log.i(str, new String(stringBuffer));
-        }
-    }
-}

+ 2 - 0
app/src/main/java/epson/common/OsAssistant.java

@@ -5,6 +5,8 @@ import android.content.res.Configuration;
 
 import android.view.Display;
 
+import androidx.annotation.NonNull;
+
 public class OsAssistant {
     public static void lockScreenRotation(@NonNull Activity activity) {
         Display defaultDisplay = activity.getWindowManager().getDefaultDisplay();

+ 0 - 75
app/src/main/java/epson/common/ReviewInvitationDialog.java

@@ -1,75 +0,0 @@
-package com.epson.mobilephone.common;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.net.Uri;
-import android.os.Bundle;
-
-
-
-import android.support.p000v4.app.FragmentActivity;
-
-
-public class ReviewInvitationDialog extends DialogFragment {
-    private static final String GOOGLE_PLAY_STORE_ID = "market://details?id=epson.print";
-    private OnClickListener mOnClickListener;
-
-    public interface OnClickListener {
-        void invitationDialogClicked(boolean z);
-    }
-
-    public static ReviewInvitationDialog newInstance() {
-        return new ReviewInvitationDialog();
-    }
-
-    @NonNull
-    public Dialog onCreateDialog(@Nullable Bundle bundle) {
-        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        builder.setMessage(R.string.review_guidance_message).setPositiveButton(R.string.review_guidance_ok, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialogInterface, int i) {
-                ReviewInvitationDialog.this.startReview();
-                ReviewInvitationDialog.this.doCallback(true);
-            }
-        }).setNegativeButton(R.string.review_guidance_cancel, new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialogInterface, int i) {
-                ReviewInvitationDialog.this.doCallback(false);
-            }
-        });
-        setCancelable(false);
-        return builder.create();
-    }
-
-    private void startReview() {
-        FragmentActivity activity = getActivity();
-        if (activity != null) {
-            PackageManager packageManager = activity.getPackageManager();
-            Intent intent = new Intent("android.intent.action.VIEW");
-            intent.setData(Uri.parse(GOOGLE_PLAY_STORE_ID));
-            if (intent.resolveActivity(packageManager) != null) {
-                activity.startActivity(intent);
-            }
-        }
-    }
-
-    private void doCallback(boolean z) {
-        mOnClickListener.invitationDialogClicked(z);
-    }
-
-    public void onAttach(Context context) {
-        super.onAttach(context);
-        try {
-            mOnClickListener = (OnClickListener) context;
-        } catch (ClassCastException unused) {
-            throw new ClassCastException(context.toString() + " must implement ReviewInvitationDialog.OnClickListener");
-        }
-    }
-
-    public void onDetach() {
-        super.onDetach();
-        mOnClickListener = null;
-    }
-}

+ 0 - 52
app/src/main/java/epson/common/ReviewInvitationViewModel.java

@@ -1,52 +0,0 @@
-package com.epson.mobilephone.common;
-
-import android.app.Application;
-import android.arch.lifecycle.AndroidViewModel;
-import android.arch.lifecycle.MutableLiveData;
-
-import android.support.annotation.VisibleForTesting;
-
-import java.util.Locale;
-
-public class ReviewInvitationViewModel extends AndroidViewModel {
-    private final MutableLiveData<Boolean> mShowStoreInvitation = new MutableLiveData<>();
-    private StoreReview mStoreReview = new StoreReview();
-
-    public ReviewInvitationViewModel(@NonNull Application application) {
-        super(application);
-        mShowStoreInvitation.setValue(false);
-    }
-
-    /* access modifiers changed from: package-private */
-    @VisibleForTesting
-    public void setStoreReviewObject(StoreReview storeReview) {
-        mStoreReview = storeReview;
-    }
-
-    public MutableLiveData<Boolean> getShowInvitationLiveData() {
-        return mShowStoreInvitation;
-    }
-
-    public void setStartStoreEnd() {
-        mShowStoreInvitation.setValue(false);
-    }
-
-    public void onPrintEnd(boolean z) {
-        if (z && checkLanguage() && mStoreReview.checkPrintSuccessCount(getApplication())) {
-            mShowStoreInvitation.setValue(true);
-        }
-    }
-
-    /* access modifiers changed from: package-private */
-    @VisibleForTesting
-    public boolean checkLanguage() {
-        String languageString = getLanguageString();
-        return Locale.ENGLISH.getLanguage().equals(languageString) || Locale.JAPANESE.getLanguage().equals(languageString);
-    }
-
-    /* access modifiers changed from: package-private */
-    @VisibleForTesting
-    public String getLanguageString() {
-        return Locale.getDefault().getLanguage();
-    }
-}

+ 0 - 52
app/src/main/java/epson/common/StoreReview.java

@@ -1,52 +0,0 @@
-package com.epson.mobilephone.common;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.Locale;
-
-public class StoreReview {
-    private static final String STORE_REVIEW_DATE_KEY = "iprint.storereview.date";
-    private static final String STORE_REVIEW_REFS_NAME = "iprint.storereview";
-    private static final int STORE_REVIEW_SHOW_TIME = 2;
-    private static final String STORE_REVIEW_TASK_COUNT_KEY = "iprint.storereview.taskcount";
-
-    public boolean checkPrintSuccessCount(@NonNull Context context) {
-        int loadTaskCount = loadTaskCount(context) + 1;
-        if (loadTaskCount <= 2) {
-            saveTaskCount(context, loadTaskCount);
-        }
-        if (loadTaskCount == 2) {
-            return true;
-        }
-        return false;
-    }
-
-    public void resetTaskCount(@NonNull Context context) {
-        SharedPreferences.Editor edit = getLocalSharedPreferences(context).edit();
-        edit.putInt(STORE_REVIEW_TASK_COUNT_KEY, 0);
-        edit.apply();
-    }
-
-    private SharedPreferences getLocalSharedPreferences(@NonNull Context context) {
-        return context.getSharedPreferences(STORE_REVIEW_REFS_NAME, 0);
-    }
-
-    private void saveTaskCount(@NonNull Context context, int i) {
-        SharedPreferences.Editor edit = getLocalSharedPreferences(context).edit();
-        edit.putInt(STORE_REVIEW_TASK_COUNT_KEY, i);
-        edit.apply();
-    }
-
-    private int loadTaskCount(@NonNull Context context) {
-        return getLocalSharedPreferences(context).getInt(STORE_REVIEW_TASK_COUNT_KEY, 0);
-    }
-
-    private void saveDate(@NonNull Context context) {
-        SharedPreferences.Editor edit = getLocalSharedPreferences(context).edit();
-        edit.putString(STORE_REVIEW_DATE_KEY, new SimpleDateFormat("yyyyMMddHHmmss", Locale.getDefault()).format(new Date()));
-        edit.apply();
-    }
-}

+ 5 - 207
app/src/main/java/epson/common/Utils.java

@@ -3,6 +3,7 @@ package epson.common;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.app.Service;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
@@ -20,6 +21,9 @@ import android.os.Environment;
 import android.view.KeyEvent;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import epson.print.CommonDefine;
 import epson.print.Util.EPLog;
 import epson.print.widgets.CustomTitleAlertDialogBuilder;
@@ -498,218 +502,12 @@ public class Utils {
         textView.setCompoundDrawables(drawable, (Drawable) null, (Drawable) null, (Drawable) null);
     }
 
-    /* JADX WARNING: Code restructure failed: missing block: B:11:0x002e, code lost:
-        if (r4 == null) goto L_0x004f;
-     */
-    /* JADX WARNING: Code restructure failed: missing block: B:14:?, code lost:
-        r4.close();
-     */
-    /* JADX WARNING: Code restructure failed: missing block: B:29:0x004c, code lost:
-        if (r4 == null) goto L_0x004f;
-     */
-    /* JADX WARNING: Removed duplicated region for block: B:27:0x0049 A[SYNTHETIC, Splitter:B:27:0x0049] */
-    /* JADX WARNING: Removed duplicated region for block: B:36:0x0057 A[SYNTHETIC, Splitter:B:36:0x0057] */
-    /* JADX WARNING: Removed duplicated region for block: B:40:0x005c A[SYNTHETIC, Splitter:B:40:0x005c] */
-    /* Code decompiled incorrectly, please refer to instructions dump. */
     public static java.lang.String getAssetsFileContents(android.content.Context r4, java.lang.String r5) {
-        /*
-            java.lang.StringBuffer r0 = new java.lang.StringBuffer
-            r0.<init>()
-            r1 = 255(0xff, float:3.57E-43)
-            byte[] r1 = new byte[r1]
-            r1 = 0
-            android.content.res.AssetManager r4 = r4.getAssets()     // Catch:{ IOException -> 0x0041, all -> 0x003e }
-            java.io.InputStream r4 = r4.open(r5)     // Catch:{ IOException -> 0x0041, all -> 0x003e }
-            java.io.BufferedReader r5 = new java.io.BufferedReader     // Catch:{ IOException -> 0x003c }
-            java.io.InputStreamReader r2 = new java.io.InputStreamReader     // Catch:{ IOException -> 0x003c }
-            r2.<init>(r4)     // Catch:{ IOException -> 0x003c }
-            r5.<init>(r2)     // Catch:{ IOException -> 0x003c }
-        L_0x001c:
-            java.lang.String r1 = r5.readLine()     // Catch:{ IOException -> 0x0037, all -> 0x0034 }
-            if (r1 == 0) goto L_0x002b
-            r0.append(r1)     // Catch:{ IOException -> 0x0037, all -> 0x0034 }
-            java.lang.String r1 = "\n"
-            r0.append(r1)     // Catch:{ IOException -> 0x0037, all -> 0x0034 }
-            goto L_0x001c
-        L_0x002b:
-            r5.close()     // Catch:{ IOException -> 0x002e }
-        L_0x002e:
-            if (r4 == 0) goto L_0x004f
-        L_0x0030:
-            r4.close()     // Catch:{ IOException -> 0x004f }
-            goto L_0x004f
-        L_0x0034:
-            r0 = move-exception
-            r1 = r5
-            goto L_0x0055
-        L_0x0037:
-            r1 = move-exception
-            r3 = r1
-            r1 = r5
-            r5 = r3
-            goto L_0x0044
-        L_0x003c:
-            r5 = move-exception
-            goto L_0x0044
-        L_0x003e:
-            r0 = move-exception
-            r4 = r1
-            goto L_0x0055
-        L_0x0041:
-            r4 = move-exception
-            r5 = r4
-            r4 = r1
-        L_0x0044:
-            r5.printStackTrace()     // Catch:{ all -> 0x0054 }
-            if (r1 == 0) goto L_0x004c
-            r1.close()     // Catch:{ IOException -> 0x004c }
-        L_0x004c:
-            if (r4 == 0) goto L_0x004f
-            goto L_0x0030
-        L_0x004f:
-            java.lang.String r4 = r0.toString()
-            return r4
-        L_0x0054:
-            r0 = move-exception
-        L_0x0055:
-            if (r1 == 0) goto L_0x005a
-            r1.close()     // Catch:{ IOException -> 0x005a }
-        L_0x005a:
-            if (r4 == 0) goto L_0x005f
-            r4.close()     // Catch:{ IOException -> 0x005f }
-        L_0x005f:
-            throw r0
-        */
         throw new UnsupportedOperationException("Method not decompiled: epson.common.Utils.getAssetsFileContents(android.content.Context, java.lang.String):java.lang.String");
     }
 
-    /* JADX WARNING: Removed duplicated region for block: B:19:0x00fc  */
-    /* Code decompiled incorrectly, please refer to instructions dump. */
     public static java.lang.String[] replaceMessage(java.lang.Integer[] r5, int r6, android.content.Context r7) {
-        /*
-            java.lang.StringBuilder r0 = new java.lang.StringBuilder
-            r0.<init>()
-            java.lang.String r1 = " currentError = "
-            r0.append(r1)
-            r0.append(r6)
-            java.lang.String r0 = r0.toString()
-            com.epson.mobilephone.common.EpLog.m69d(r0)
-            r0 = 3
-            java.lang.Integer[] r0 = new java.lang.Integer[r0]
-            r1 = 0
-            r2 = r5[r1]
-            r0[r1] = r2
-            r2 = 1
-            r3 = r5[r2]
-            r0[r2] = r3
-            r3 = 2
-            r5 = r5[r3]
-            r0[r3] = r5
-            r5 = -11005(0xffffffffffffd503, float:NaN)
-            if (r6 == r5) goto L_0x00c7
-            r5 = 59
-            if (r6 == r5) goto L_0x005b
-            switch(r6) {
-                case 6: goto L_0x0047;
-                case 7: goto L_0x0033;
-                default: goto L_0x0031;
-            }
-        L_0x0031:
-            goto L_0x00d9
-        L_0x0033:
-            r5 = 2131624436(0x7f0e01f4, float:1.8876052E38)
-            java.lang.Integer r5 = java.lang.Integer.valueOf(r5)
-            r0[r2] = r5
-            r5 = 2131624435(0x7f0e01f3, float:1.887605E38)
-            java.lang.Integer r5 = java.lang.Integer.valueOf(r5)
-            r0[r1] = r5
-            goto L_0x00d9
-        L_0x0047:
-            r5 = 2131624398(0x7f0e01ce, float:1.8875975E38)
-            java.lang.Integer r5 = java.lang.Integer.valueOf(r5)
-            r0[r2] = r5
-            r5 = 2131624397(0x7f0e01cd, float:1.8875973E38)
-            java.lang.Integer r5 = java.lang.Integer.valueOf(r5)
-            r0[r1] = r5
-            goto L_0x00d9
-        L_0x005b:
-            com.epson.mobilephone.common.escpr.EscprLib r5 = com.epson.mobilephone.common.escpr.EscprLib.getInstance()
-            com.epson.mobilephone.common.escpr.EPS_REDYINKINFO r6 = new com.epson.mobilephone.common.escpr.EPS_REDYINKINFO
-            r6.<init>()
-            int r5 = r5.epsGetReadyPrintStatus(r6)
-            r4 = 2131625264(0x7f0e0530, float:1.8877731E38)
-            java.lang.Integer r4 = java.lang.Integer.valueOf(r4)
-            r0[r2] = r4
-            r4 = 2131625265(0x7f0e0531, float:1.8877733E38)
-            java.lang.Integer r4 = java.lang.Integer.valueOf(r4)
-            r0[r1] = r4
-            if (r5 != 0) goto L_0x00c4
-            int r5 = r6.subscriptionError
-            switch(r5) {
-                case 1: goto L_0x00b1;
-                case 2: goto L_0x009e;
-                default: goto L_0x0081;
-            }
-        L_0x0081:
-            java.lang.StringBuilder r5 = new java.lang.StringBuilder
-            r5.<init>()
-            java.lang.String r4 = " code = "
-            r5.append(r4)
-            int r4 = r6.subscriptionErrorCode
-            r5.append(r4)
-            java.lang.String r5 = r5.toString()
-            com.epson.mobilephone.common.EpLog.m77i(r5)
-            int r5 = r6.subscriptionErrorCode
-            java.lang.String r5 = java.lang.String.valueOf(r5)
-            goto L_0x00da
-        L_0x009e:
-            r5 = 2131625262(0x7f0e052e, float:1.8877727E38)
-            java.lang.Integer r5 = java.lang.Integer.valueOf(r5)
-            r0[r2] = r5
-            r5 = 2131625263(0x7f0e052f, float:1.887773E38)
-            java.lang.Integer r5 = java.lang.Integer.valueOf(r5)
-            r0[r1] = r5
-            goto L_0x00d9
-        L_0x00b1:
-            r5 = 2131625260(0x7f0e052c, float:1.8877723E38)
-            java.lang.Integer r5 = java.lang.Integer.valueOf(r5)
-            r0[r2] = r5
-            r5 = 2131625261(0x7f0e052d, float:1.8877725E38)
-            java.lang.Integer r5 = java.lang.Integer.valueOf(r5)
-            r0[r1] = r5
-            goto L_0x00d9
-        L_0x00c4:
-            java.lang.String r5 = "unknown"
-            goto L_0x00da
-        L_0x00c7:
-            r5 = 2131624364(0x7f0e01ac, float:1.8875906E38)
-            java.lang.Integer r5 = java.lang.Integer.valueOf(r5)
-            r0[r2] = r5
-            r5 = 2131624367(0x7f0e01af, float:1.8875912E38)
-            java.lang.Integer r5 = java.lang.Integer.valueOf(r5)
-            r0[r1] = r5
-        L_0x00d9:
-            r5 = 0
-        L_0x00da:
-            java.lang.String[] r6 = new java.lang.String[r3]
-            r3 = r0[r1]
-            int r3 = r3.intValue()
-            java.lang.String r3 = r7.getString(r3)
-            r6[r1] = r3
-            java.lang.StringBuilder r1 = new java.lang.StringBuilder
-            r1.<init>()
-            r0 = r0[r2]
-            int r0 = r0.intValue()
-            java.lang.String r7 = r7.getString(r0)
-            r1.append(r7)
-            if (r5 != 0) goto L_0x00fe
-            java.lang.String r5 = ""
-        L_0x00fe:
-            r1.append(r5)
-            java.lang.String r5 = r1.toString()
-            r6[r2] = r5
-            return r6
-        */
+
         throw new UnsupportedOperationException("Method not decompiled: epson.common.Utils.replaceMessage(java.lang.Integer[], int, android.content.Context):java.lang.String[]");
     }
 }

+ 0 - 1
app/src/main/java/epson/epsonconnectregistration/ECAvailableCheckTask.java

@@ -12,7 +12,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.wifidirect.WiFiControl;
 import com.epson.mobilephone.common.wifidirect.WiFiDirectManager;
 

+ 0 - 2
app/src/main/java/epson/epsonconnectregistration/ECBaseTask.java

@@ -9,8 +9,6 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.LocaleList;
 
-import com.epson.mobilephone.common.EpLog;
-
 import java.lang.ref.WeakReference;
 
 public abstract class ECBaseTask extends AsyncTask<Void, Void, ECStatus> {

+ 0 - 2
app/src/main/java/epson/epsonconnectregistration/ECConfigurationTask.java

@@ -8,8 +8,6 @@ import android.net.Uri;
 import android.util.Xml;
 import android.view.View;
 
-import com.epson.mobilephone.common.EpLog;
-
 import epson.common.httpclient.IAHttpClient;
 import epson.print.R;
 

+ 0 - 2
app/src/main/java/epson/epsonconnectregistration/SoapAUTHENTICATIONDataInfo.java

@@ -1,7 +1,5 @@
 package epson.epsonconnectregistration;
 
-import com.epson.mobilephone.common.EpLog;
-
 public class SoapAUTHENTICATIONDataInfo extends SoapConfigDataParser {
     private static final String GROUP_ID = "AUTHENTICATIONDataInfo";
     static final String ID_ADMINLOCK = "AdminLock";

+ 0 - 2
app/src/main/java/epson/epsonconnectregistration/SoapConfigDataParser.java

@@ -2,8 +2,6 @@ package epson.epsonconnectregistration;
 
 import android.util.Xml;
 
-import com.epson.mobilephone.common.EpLog;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;

+ 0 - 1
app/src/main/java/epson/epsonconnectregistration/SoapWEBSETUPDataInfo.java

@@ -4,7 +4,6 @@ import android.net.Uri;
 import android.support.media.ExifInterface;
 
 import com.box.androidsdk.content.BoxConstants;
-import com.epson.mobilephone.common.EpLog;
 
 import epson.print.BuildConfig;
 

+ 0 - 2
app/src/main/java/epson/maintain/activity/LogUrl.java

@@ -2,8 +2,6 @@ package epson.maintain.activity;
 
 import android.content.Context;
 
-import com.epson.mobilephone.common.EpLog;
-
 import epson.common.Constants;
 import epson.print.MyPrinter;
 import epson.print.ecclient.EcClientLib;

+ 0 - 1
app/src/main/java/epson/maintain/activity/MaintainActivity.java

@@ -38,7 +38,6 @@ import android.widget.Switch;
 import android.widget.TextView;
 
 import com.epson.iprint.prtlogger.Analytics;
-import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.escpr.MediaInfo;
 import com.epson.mobilephone.common.maintain2.BatteryInfoEx;
 import com.epson.mobilephone.common.maintain2.MaintainPrinter2;

+ 0 - 1
app/src/main/java/epson/maintain/activity/MaintainPrinterSearchActivity.java

@@ -25,7 +25,6 @@ import android.widget.RadioButton;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.ble.BleAsyncTask;
 import com.epson.mobilephone.common.ble.BleWork;
 import com.epson.mobilephone.common.ble.BleWorkActivity;

+ 0 - 2
app/src/main/java/epson/print/ActivityDocsPrintPreview.java

@@ -48,8 +48,6 @@ import androidx.annotation.Nullable;
 import com.box.androidsdk.content.models.BoxFile;
 import com.epson.iprint.prtlogger.NewLoggerController;
 import com.epson.iprint.prtlogger.PrintLog;
-import com.epson.mobilephone.common.ReviewInvitationDialog;
-import com.epson.mobilephone.common.ReviewInvitationViewModel;
 import com.epson.mobilephone.common.escpr.MediaInfo;
 import com.epson.mobilephone.common.license.LicenseTopActivity;
 import com.epson.mobilephone.common.wifidirect.NfcTagUtils;

+ 0 - 2
app/src/main/java/epson/print/ActivityPrintWeb.java

@@ -33,8 +33,6 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.epson.iprint.prtlogger.PrintLog;
-import com.epson.mobilephone.common.ReviewInvitationDialog;
-import com.epson.mobilephone.common.ReviewInvitationViewModel;
 import com.epson.mobilephone.common.escpr.MediaInfo;
 import com.epson.mobilephone.common.wifidirect.NfcTagUtils;
 

+ 0 - 3
app/src/main/java/epson/print/ActivityViewImageSelect.java

@@ -43,9 +43,6 @@ import com.epson.iprint.prtlogger.NewLoggerController;
 import com.epson.iprint.prtlogger.PrintLog;
 import com.epson.iprint.shared.EpsoniPrintSharedActivity;
 import com.epson.iprint.shared.SharedParamPhoto;
-import com.epson.mobilephone.common.EpLog;
-import com.epson.mobilephone.common.ReviewInvitationDialog;
-import com.epson.mobilephone.common.ReviewInvitationViewModel;
 import com.epson.mobilephone.common.escpr.MediaInfo;
 import com.epson.mobilephone.common.license.LicenseTopActivity;
 import com.epson.mobilephone.common.wifidirect.NfcTagUtils;

+ 0 - 2
app/src/main/java/epson/print/IprintApplication.java

@@ -3,8 +3,6 @@ package epson.print;
 import androidx.multidex.BuildConfig;
 import androidx.multidex.MultiDexApplication;
 
-import com.epson.mobilephone.common.EpLog;
-
 import epson.print.Util.EPLog;
 
 public class IprintApplication extends MultiDexApplication {

+ 0 - 1
app/src/main/java/epson/print/IprintHome.java

@@ -30,7 +30,6 @@ import androidx.annotation.NonNull;
 
 import com.epson.iprint.prtlogger.Analytics;
 import com.epson.memcardacc.DirectorySelecterActivity;
-import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.ble.BleAsyncTask;
 import com.epson.mobilephone.common.ble.BleWork;
 import com.epson.mobilephone.common.guide.NoticeGuideActivity;

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

@@ -14,7 +14,6 @@ import android.os.Binder;
 
 import com.box.androidsdk.content.requests.BoxRequestsMetadata;
 import com.epson.iprint.prtlogger.AnalyticsPreferences;
-import com.epson.mobilephone.common.EpLog;
 import com.google.android.gms.actions.SearchIntents;
 
 import epson.print.IprintApplication;

+ 0 - 1
app/src/main/java/epson/support/DeviceInformationActivity.java

@@ -17,7 +17,6 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.epson.memcardacc.DirectorySelecterActivity;
-import com.epson.mobilephone.common.EpLog;
 import com.epson.mobilephone.common.maintain2.MaintainPrinter2;
 import com.epson.mobilephone.common.wifidirect.ManageDefaultNetwork;
 import com.epson.mobilephone.common.wifidirect.WiFiControl;