0

app/build.gradle

@@ -45,6 +45,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.2'
     implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
 
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.2'

app/src/main/AndroidManifest.xml

@@ -80,7 +80,7 @@
             android:configChanges="locale|keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|layoutDirection|fontScale"
             android:hardwareAccelerated="false"
             android:resizeableActivity="false"
-            android:screenOrientation="unspecified">
+            android:screenOrientation="unspecified" >
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.SEND" />

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectBase.java

@@ -1,13 +1,17 @@
 package com.epson.mobilephone.common.wifidirect;
 
+import android.app.Service;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.wifi.WifiManager;
 import android.os.AsyncTask;
 import android.os.Bundle;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 
 public abstract class ActivityConnectBase extends AppCompatActivity {
+
     public static final String APNAME = "com.epson.iprint.wifidirect.apname";
     public static final String APPASS = "com.epson.iprint.wifidirect.appass";
     public static final int CONNECTING_TIMEOUT = 30;
@@ -44,11 +48,9 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         PRINTER_FINDING
     }
 
-    private abstract void closeWaitingDialog();
-
+    protected abstract void closeWaitingDialog();
     protected abstract void onEnabledWifi();
-
-    private abstract void onError();
+    protected abstract void onError();
 
     public static int getLastDetailResult() {
         return sLastDetailResult;
@@ -80,34 +82,34 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
     }
 
     protected void onResume() {
-        EPLog.m86d(TAG, "onResume()");
+        EPLog.d(TAG, "onResume()");
         super.onResume();
         NfcDispatchUtils.enableForegroundDispatch(this, (IntentFilter[]) null, (String[][]) null);
-        EPLog.m86d(TAG, "addFlags : FLAG_KEEP_SCREEN_ON ");
+        EPLog.d(TAG, "addFlags : FLAG_KEEP_SCREEN_ON ");
         getWindow().addFlags(128);
     }
 
     protected void onPause() {
-        EPLog.m86d(TAG, "onPause()");
+        EPLog.d(TAG, "onPause()");
         super.onPause();
         NfcDispatchUtils.disableForegroundDispatch(this);
-        EPLog.m87e(TAG, "clearFlags : FLAG_KEEP_SCREEN_ON ");
+        EPLog.e(TAG, "clearFlags : FLAG_KEEP_SCREEN_ON ");
         getWindow().clearFlags(128);
     }
 
     protected void onStop() {
-        EPLog.m86d(TAG, "onStop()");
+        EPLog.d(TAG, "onStop()");
         super.onStop();
     }
 
     protected void onDestroy() {
-        EPLog.m86d(TAG, "onDestroy()");
+        EPLog.d(TAG, "onDestroy()");
         super.onDestroy();
         interrupt();
     }
 
     public void onBackPressed() {
-        EPLog.m86d(TAG, "onBackPressed()");
+        EPLog.d(TAG, "onBackPressed()");
         super.onBackPressed();
         interrupt();
     }
@@ -123,7 +125,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         interruptFindingPrinter();
     }
 
-    private void interruptFindingPrinter() {
+    public void interruptFindingPrinter() {
         FindPrinterTask findPrinterTask = taskFindPrinter;
         if (findPrinterTask != null) {
             findPrinterTask.cancel();
@@ -135,15 +137,15 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         connectingObserver.interrupt();
     }
 
-    private void onConnectedPrinter(Intent intent) {
-        EPLog.m86d(TAG, "finish():RESULT_OK");
+    public void onConnectedPrinter(Intent intent) {
+        EPLog.d(TAG, "finish():RESULT_OK");
         closeWaitingDialog();
         setResult(-1, intent);
         setLastDetailResult(-1);
         finish();
     }
 
-    private void setupObserver() {
+    public void setupObserver() {
         connectingObserver.start(this.timeout * 1000);
     }
 
@@ -155,7 +157,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
 
         private void start(final int i) {
             interrupt();
-            EPLog.m86d(ActivityConnectBase.TAG, "Start ConnectingObserver");
+            EPLog.d(ActivityConnectBase.TAG, "Start ConnectingObserver");
             observerTask = new AsyncTask<Void, Void, Void>() {
                 protected Void doInBackground(Void... voidArr) {
                     int i = 0;
@@ -175,7 +177,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
                 }
 
                 protected void onPostExecute(Void voidR) {
-                    EPLog.m88i(ActivityConnectBase.TAG, "Timeout ConnectingObserver");
+                    EPLog.i(ActivityConnectBase.TAG, "Timeout ConnectingObserver");
                     ActivityConnectBase.this.onError();
                 }
             }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
@@ -184,7 +186,7 @@ public abstract class ActivityConnectBase extends AppCompatActivity {
         private void interrupt() {
             AsyncTask<Void, Void, Void> asyncTask = observerTask;
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
-                EPLog.m86d(ActivityConnectBase.TAG, "Stop ConnectingObserver");
+                EPLog.d(ActivityConnectBase.TAG, "Stop ConnectingObserver");
                 observerTask.cancel(false);
             }
         }

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectP2P.java

@@ -1,8 +1,6 @@
 package com.epson.mobilephone.common.wifidirect;
 
 import android.app.AlertDialog;
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -17,14 +15,11 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-
-
-import android.support.p000v4.app.FragmentActivity;
 import android.widget.Toast;
 
-import com.epson.mobilephone.common.wifidirect.ActivityConnectBase;
-import com.epson.mobilephone.common.wifidirect.DialogProgressWiFiDirect;
-import com.epson.mobilephone.common.wifidirect.WifiP2pUtils;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
+import androidx.lifecycle.Observer;
 
 import java.util.Deque;
 
@@ -43,7 +38,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
     Handler mHandler = new Handler() {
         public void handleMessage(Message message) {
             super.handleMessage(message);
-            switch (C10835.f149x55760faf[ActivityConnectP2P.this.status.ordinal()]) {
+            switch (C10835.f149x55760faf[status.ordinal()]) {
                 case 1:
                     break;
                 case 2:
@@ -55,22 +50,22 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
                                 String string2 = data.getString(escprLib.PRINTER_IP);
                                 String string3 = data.getString("id");
                                 if (string != null && string2 != null && string3 != null) {
-                                    EPLog.m88i(ActivityConnectP2P.TAG, "epsWrapperFindPrinter Success" + string);
-                                    if (!ActivityConnectP2P.this.expectedPrtMacAddr.equals(MacAddrUtils.getMacAddressFromPrinterId(string3))) {
-                                        EPLog.m88i(ActivityConnectP2P.TAG, "This Printer is not expected " + string);
+                                    EPLog.i(ActivityConnectP2P.TAG, "epsWrapperFindPrinter Success" + string);
+                                    if (!expectedPrtMacAddr.equals(MacAddrUtils.getMacAddressFromPrinterId(string3))) {
+                                        EPLog.i(ActivityConnectP2P.TAG, "This Printer is not expected " + string);
                                         return;
                                     }
-                                    ActivityConnectP2P.this.interruptFindingPrinter();
+                                    interruptFindingPrinter();
                                     Intent intent = new Intent();
                                     intent.putExtras(data);
-                                    ActivityConnectP2P.this.onConnectedPrinter(intent);
+                                    onConnectedPrinter(intent);
                                     return;
                                 }
                                 return;
                             }
                             return;
                         case 2:
-                            ActivityConnectP2P.this.onError();
+                            onError();
                             return;
                         default:
                             return;
@@ -78,10 +73,10 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
                 case 3:
                     if (message.what == 11) {
                         if (!ActivityConnectP2P.mWifiManager.isWifiEnabled()) {
-                            ActivityConnectP2P.this.startActivityForResult(new Intent(ActivityConnectP2P.this, ActivityControlWiFi.class), 1);
+                            startActivityForResult(new Intent(ActivityConnectP2P.this, ActivityControlWiFi.class), 1);
                             return;
                         }
-                        ActivityConnectP2P.this.onEnabledWifi();
+                        onEnabledWifi();
                         return;
                     }
                     return;
@@ -89,20 +84,20 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
                     if (message.what == 0) {
                         Bundle data2 = message.getData();
                         if (data2 != null && !data2.isEmpty()) {
-                            if (ActivityConnectP2P.this.targetSsid.equals(WiFiControl.removeSSIDPrefix(data2.getString("ssid")))) {
-                                WifiP2pConfig unused = ActivityConnectP2P.this.p2pConnectConfig = new WifiP2pConfig();
-                                ActivityConnectP2P.this.p2pConnectConfig.deviceAddress = data2.getString(SearchWiFiDirectPrinterTask.MACADDR_P2P);
-                                ActivityConnectP2P.this.p2pConnectConfig.groupOwnerIntent = -1;
-                                ActivityConnectP2P.this.p2pConnectConfig.wps.setup = 0;
-                                ActivityConnectP2P.this.status = ActivityConnectBase.Status.WIFI_CONNECTING;
-                                ActivityConnectP2P.this.setupObserver();
+                            if (targetSsid.equals(WiFiControl.removeSSIDPrefix(data2.getString("ssid")))) {
+                                WifiP2pConfig unused = p2pConnectConfig = new WifiP2pConfig();
+                                p2pConnectConfig.deviceAddress = data2.getString(SearchWiFiDirectPrinterTask.MACADDR_P2P);
+                                p2pConnectConfig.groupOwnerIntent = -1;
+                                p2pConnectConfig.wps.setup = 0;
+                                status = ActivityConnectBase.Status.WIFI_CONNECTING;
+                                setupObserver();
                                 ActivityConnectP2P.mHandler.sendEmptyMessage(12);
                                 break;
                             }
                         } else {
-                            EPLog.m87e(ActivityConnectP2P.TAG, "Not Found Network");
-                            ActivityConnectP2P.this.status = ActivityConnectBase.Status.IDLE;
-                            ActivityConnectP2P.this.onError();
+                            EPLog.e(ActivityConnectP2P.TAG, "Not Found Network");
+                            status = ActivityConnectBase.Status.IDLE;
+                            onError();
                             break;
                         }
                     }
@@ -112,33 +107,33 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
             }
             int i = message.what;
             if (i == 10) {
-                ActivityConnectP2P.this.status = ActivityConnectBase.Status.WIFI_CONNECTED;
-                ActivityConnectP2P.this.onConnectedWiFi();
+                status = ActivityConnectBase.Status.WIFI_CONNECTED;
+                onConnectedWiFi();
             } else if (i == 12) {
-                EPLog.m86d(ActivityConnectP2P.TAG, "connect() " + ActivityConnectP2P.this.targetSsid);
-                ActivityConnectP2P.mWiFiP2PManager.connect(ActivityConnectP2P.this.p2pChannnel, ActivityConnectP2P.this.p2pConnectConfig, new WifiP2pManager.ActionListener() {
+                EPLog.d(ActivityConnectP2P.TAG, "connect() " + targetSsid);
+                ActivityConnectP2P.mWiFiP2PManager.connect(p2pChannnel, p2pConnectConfig, new WifiP2pManager.ActionListener() {
                     public void onSuccess() {
-                        EPLog.m86d(ActivityConnectP2P.TAG, "P2PConnect_Operation Success");
+                        EPLog.d(ActivityConnectP2P.TAG, "P2PConnect_Operation Success");
                     }
 
                     public void onFailure(int i) {
                         if (i == 0) {
-                            EPLog.m90w(ActivityConnectP2P.TAG, "P2PConnect_Operation Error " + i);
-                            if (ActivityConnectP2P.this.searchWiFiDirectPrinter == null) {
-                                ActivityConnectP2P.this.onError();
-                            } else if (ActivityConnectP2P.this.p2pRetryCount < 5) {
-                                ActivityConnectP2P.this.searchWiFiDirectPrinter.interrupt();
-                                ActivityConnectP2P.this.interruptConnecting();
-                                ActivityConnectP2P.this.onActivityResult(2, -1, (Intent) null);
+                            EPLog.w(ActivityConnectP2P.TAG, "P2PConnect_Operation Error " + i);
+                            if (searchWiFiDirectPrinter == null) {
+                                onError();
+                            } else if (p2pRetryCount < 5) {
+                                searchWiFiDirectPrinter.interrupt();
+                                interruptConnecting();
+                                onActivityResult(2, -1, (Intent) null);
                                 ActivityConnectP2P.access$408(ActivityConnectP2P.this);
                             } else {
-                                ActivityConnectP2P.this.onError();
+                                onError();
                             }
                         } else if (i != 2) {
-                            EPLog.m90w(ActivityConnectP2P.TAG, "P2PConnect_Operation Fail " + i);
-                            ActivityConnectP2P.this.onError();
+                            EPLog.w(ActivityConnectP2P.TAG, "P2PConnect_Operation Fail " + i);
+                            onError();
                         } else {
-                            EPLog.m90w(ActivityConnectP2P.TAG, "P2PConnect_Operation BUSY");
+                            EPLog.w(ActivityConnectP2P.TAG, "P2PConnect_Operation BUSY");
                             ActivityConnectP2P.mHandler.sendEmptyMessageDelayed(12, 1000);
                         }
                     }
@@ -178,10 +173,10 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
                     String str = checkQueue[0];
                     String str2 = checkQueue[1];
                     if (str2.equals("do_show")) {
-                        ActivityConnectP2P.this.showDialog(str);
+                        showDialog(str);
                     }
                     if (str2.equals("do_dismiss")) {
-                        ActivityConnectP2P.this.dismissDialog(str);
+                        dismissDialog(str);
                     }
                 }
             }
@@ -204,7 +199,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
             needInfo = extras.getBoolean(ActivityConnectBase.NEEDINFO, false);
             timeout = extras.getInt(ActivityConnectBase.TIMEOUT, 30);
         }
-        EPLog.m88i(TAG, "Starting connect :" + targetSsid + " timeout = " + timeout);
+        EPLog.i(TAG, "Starting connect :" + targetSsid + " timeout = " + timeout);
         if (Build.VERSION.SDK_INT >= 29) {
             ActivityRequestLocationPermission.requestLocationPermissionForce(this, 2);
         } else {
@@ -235,7 +230,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
             WifiP2pUtils.ConnectionInfo connectionInfo = WifiP2pUtils.getInstance(this).getConnectionInfo();
             if (connectionInfo != null) {
                 if (this.targetSsid.equals(connectionInfo.printerName)) {
-                    EPLog.m86d(TAG, "Already Connected!!");
+                    EPLog.d(TAG, "Already Connected!!");
                     status = ActivityConnectBase.Status.WIFI_CONNECTING;
                     mHandler.sendEmptyMessage(10);
                     return;
@@ -248,19 +243,19 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
                 status = ActivityConnectBase.Status.WIFI_SCANNING;
             }
         } else {
-            AlertDialog.Builder negativeButton = new AlertDialog.Builder(this).setTitle(C1113R.string.str_error_wifi_connecting_failed).setPositiveButton(getString(C1113R.string.str_goto_wifi_setting), new DialogInterface.OnClickListener() {
+            AlertDialog.Builder negativeButton = new AlertDialog.Builder(this).setTitle(R.string.str_error_wifi_connecting_failed).setPositiveButton(getString(R.string.str_goto_wifi_setting), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
-                    EPLog.m86d(ActivityConnectP2P.TAG, "finish():GOTO_WIFI_SETTINGS");
+                    EPLog.d(ActivityConnectP2P.TAG, "finish():GOTO_WIFI_SETTINGS");
                     WiFiUtils.showOsWifiSettings(ActivityConnectP2P.this, 5);
                 }
-            }).setNegativeButton(getString(C1113R.string.str_cancel), new DialogInterface.OnClickListener() {
+            }).setNegativeButton(getString(R.string.str_cancel), new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialogInterface, int i) {
-                    EPLog.m86d(ActivityConnectP2P.TAG, "finish():RESULT_CANCELED");
-                    ActivityConnectP2P.this.onError();
+                    EPLog.d(ActivityConnectP2P.TAG, "finish():RESULT_CANCELED");
+                    onError();
                     ActivityConnectBase.setLastDetailResult(1);
                 }
             });
-            negativeButton.setMessage(getString(C1113R.string.str_notice_delete_simpleAP) + "\n\nSSID: " + curSSID).setCancelable(false).show();
+            negativeButton.setMessage(getString(R.string.str_notice_delete_simpleAP) + "\n\nSSID: " + curSSID).setCancelable(false).show();
         }
     }
 
@@ -306,7 +301,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
             goto L_0x0056
         L_0x002a:
             r4 = 2
-            int r0 = com.epson.mobilephone.common.wifidirect.C1113R.string.str_error_connecting_printer_p2p
+            int r0 = com.epson.mobilephone.common.wifidirect.R.string.str_error_connecting_printer_p2p
             java.lang.String r5 = r10.getString(r0)
             r6 = 0
             r0 = 17039370(0x104000a, float:2.42446E-38)
@@ -318,10 +313,10 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
             goto L_0x0056
         L_0x0041:
             r4 = 0
-            int r0 = com.epson.mobilephone.common.wifidirect.C1113R.string.str_connecting_printer_p2p
+            int r0 = com.epson.mobilephone.common.wifidirect.R.string.str_connecting_printer_p2p
             java.lang.String r5 = r10.getString(r0)
             r6 = 0
-            int r0 = com.epson.mobilephone.common.wifidirect.C1113R.string.str_cancel
+            int r0 = com.epson.mobilephone.common.wifidirect.R.string.str_cancel
             java.lang.String r7 = r10.getString(r0)
             r8 = 0
             r9 = 0
@@ -359,11 +354,11 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
     }
 
     private void onConnectedWiFi() {
-        EPLog.m86d(TAG, "onConnect()");
+        EPLog.d(TAG, "onConnect()");
         interruptConnecting();
         ManageDefaultNetwork.getInstance(this).resetDefaultNetwork();
         if (this.showConnectedTip) {
-            Toast.makeText(this, getString(C1113R.string.str_notice_wifi_connected), 0).show();
+            Toast.makeText(this, getString(R.string.str_notice_wifi_connected), 0).show();
         }
         if (!this.needInfo) {
             closeWaitingDialog();
@@ -374,7 +369,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
             return;
         }
         if (this.taskFindPrinter != null) {
-            EPLog.m90w(TAG, "Already called onConnect()");
+            EPLog.w(TAG, "Already called onConnect()");
         }
         WifiP2pUtils.ConnectionInfo connectionInfo = WifiP2pUtils.getInstance(this).getConnectionInfo();
         if (connectionInfo.isGroupOwnerThisDevice) {
@@ -389,7 +384,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
 
     private void onError() {
         closeWaitingDialog();
-        Toast.makeText(this, getString(C1113R.string.str_error_connecting_printer_short), 1).show();
+        Toast.makeText(this, getString(R.string.str_error_connecting_printer_short), 1).show();
         if (this.searchWiFiDirectPrinter != null) {
             searchWiFiDirectPrinter.interrupt();
             searchWiFiDirectPrinter = null;
@@ -399,7 +394,7 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
                 if (this.p2pConnectConfig != null) {
                     interruptConnecting();
                     if (mWiFiP2PManager != null) {
-                        EPLog.m86d(TAG, "cancelConnect() " + targetSsid);
+                        EPLog.d(TAG, "cancelConnect() " + targetSsid);
                         mWiFiP2PManager.cancelConnect(this.p2pChannnel, (WifiP2pManager.ActionListener) null);
                         p2pConnectConfig = null;
                         break;
@@ -418,18 +413,18 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
             mModelDialog.doShow(IDD_WIFI_ERROR);
             return;
         }
-        EPLog.m86d(TAG, "finish():RESULT_CANCELED");
+        EPLog.d(TAG, "finish():RESULT_CANCELED");
         setResult(0);
         setLastDetailResult(2);
         finish();
     }
 
     private void closeWaitingDialog() {
-        EPLog.m86d(TAG, "Called closeWaitingDialog()");
+        EPLog.d(TAG, "Called closeWaitingDialog()");
         try {
             mModelDialog.doDismiss(IDD_WIFI_WAITING);
         } catch (IllegalArgumentException unused) {
-            EPLog.m86d(TAG, "IDD_WIFI_WAITING already closed");
+            EPLog.d(TAG, "IDD_WIFI_WAITING already closed");
         }
     }
 
@@ -499,16 +494,16 @@ public class ActivityConnectP2P extends ActivityConnectBase implements DialogPro
 
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
-            EPLog.m86d(ActivityConnectP2P.TAG, "WiFiDirectBroadcastReceiver:onReceive() action = " + action);
+            EPLog.d(ActivityConnectP2P.TAG, "WiFiDirectBroadcastReceiver:onReceive() action = " + action);
             if (action.equals("android.net.wifi.p2p.CONNECTION_STATE_CHANGE")) {
                 WifiP2pGroup wifiP2pGroup = (WifiP2pGroup) intent.getParcelableExtra("p2pGroupInfo");
                 WifiP2pDevice p2PPrinterInfo = WifiP2pUtils.getInstance(context).getP2PPrinterInfo(wifiP2pGroup);
-                EPLog.m86d(ActivityConnectP2P.TAG, "EXTRA_WIFI_P2P_GROUP = " + wifiP2pGroup);
-                if (p2PPrinterInfo != null && ActivityConnectP2P.this.p2pConnectConfig.deviceAddress.equals(p2PPrinterInfo.deviceAddress)) {
-                    EPLog.m86d(ActivityConnectP2P.TAG, "P2P Established " + p2PPrinterInfo.deviceName);
-                    if (ActivityConnectP2P.this.searchWiFiDirectPrinter != null) {
-                        ActivityConnectP2P.this.searchWiFiDirectPrinter.interrupt();
-                        ActivityConnectP2P.this.searchWiFiDirectPrinter = null;
+                EPLog.d(ActivityConnectP2P.TAG, "EXTRA_WIFI_P2P_GROUP = " + wifiP2pGroup);
+                if (p2PPrinterInfo != null && p2pConnectConfig.deviceAddress.equals(p2PPrinterInfo.deviceAddress)) {
+                    EPLog.d(ActivityConnectP2P.TAG, "P2P Established " + p2PPrinterInfo.deviceName);
+                    if (searchWiFiDirectPrinter != null) {
+                        searchWiFiDirectPrinter.interrupt();
+                        searchWiFiDirectPrinter = null;
                     }
                     ActivityConnectP2P.mHandler.sendEmptyMessage(10);
                 }

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityConnectSimpleAP.java

@@ -1,7 +1,5 @@
 package com.epson.mobilephone.common.wifidirect;
 
-import android.arch.lifecycle.Observer;
-import android.arch.lifecycle.ViewModelProviders;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -13,16 +11,17 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
-
-
-import android.support.p000v4.app.FragmentActivity;
 import android.widget.Toast;
 
-import com.epson.mobilephone.common.wifidirect.ActivityConnectBase;
-import com.epson.mobilephone.common.wifidirect.DialogProgressWiFiDirect;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProviders;
 
 import java.util.Deque;
 
+import epson.print.R;
+
 public class ActivityConnectSimpleAP extends ActivityConnectBase implements DialogProgressWiFiDirect.DialogButtonClick {
     private static final int DELAY_CONNECTED_WIFI = 1000;
     private static final String IDD_WIFI_ERROR = "idd_wifi_error";
@@ -38,20 +37,21 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
     private static final String TAG = "ActivityConnectSimpleAP";
     private int connectingNetworkId = -1;
     boolean createSimpleAP = false;
+
     Handler mHandler = new Handler() {
         public void handleMessage(Message message) {
             super.handleMessage(message);
-            switch (C10874.f150x55760faf[ActivityConnectSimpleAP.this.status.ordinal()]) {
+            switch (C10874.f150x55760faf[status.ordinal()]) {
                 case 1:
                     if (message.what == 11) {
-                        if (Build.VERSION.SDK_INT > 25 && !ActivityConnectSimpleAP.this.createSimpleAP) {
-                            ActivityConnectSimpleAP.mModelDialog.doShow(ActivityConnectSimpleAP.IDD_WIFI_SIMPLEAP);
+                        if (Build.VERSION.SDK_INT > 25 && !createSimpleAP) {
+                            mModelDialog.doShow(IDD_WIFI_SIMPLEAP);
                             return;
-                        } else if (!ActivityConnectSimpleAP.mWifiManager.isWifiEnabled()) {
-                            ActivityConnectSimpleAP.this.startActivityForResult(new Intent(ActivityConnectSimpleAP.this, ActivityControlWiFi.class), 1);
+                        } else if (!mWifiManager.isWifiEnabled()) {
+                            startActivityForResult(new Intent(ActivityConnectSimpleAP.this, ActivityControlWiFi.class), 1);
                             return;
                         } else {
-                            ActivityConnectSimpleAP.this.onEnabledWifi();
+                            onEnabledWifi();
                             return;
                         }
                     } else {
@@ -62,25 +62,25 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
                         Bundle data = message.getData();
                         if (data != null && !data.isEmpty()) {
                             String removeSSIDPrefix = WiFiControl.removeSSIDPrefix(data.getString("ssid"));
-                            if (ActivityConnectSimpleAP.this.targetSsid.equals(removeSSIDPrefix)) {
-                                if (ActivityConnectSimpleAP.this.searchWiFiDirectPrinter != null) {
-                                    ActivityConnectSimpleAP.this.searchWiFiDirectPrinter.interrupt();
-                                    ActivityConnectSimpleAP.this.searchWiFiDirectPrinter = null;
+                            if (targetSsid.equals(removeSSIDPrefix)) {
+                                if (searchWiFiDirectPrinter != null) {
+                                    searchWiFiDirectPrinter.interrupt();
+                                    searchWiFiDirectPrinter = null;
                                 }
-                                int unused = ActivityConnectSimpleAP.this.connectingNetworkId = data.getInt("id");
-                                if (WiFiUtils.getInstance(ActivityConnectSimpleAP.this).enableSimpleAP(ActivityConnectSimpleAP.this.connectingNetworkId, removeSSIDPrefix)) {
-                                    ActivityConnectSimpleAP.this.status = ActivityConnectBase.Status.WIFI_CONNECTING;
-                                    ActivityConnectSimpleAP.this.setupObserver();
+                                int unused = connectingNetworkId = data.getInt("id");
+                                if (WiFiUtils.getInstance(ActivityConnectSimpleAP.this).enableSimpleAP(connectingNetworkId, removeSSIDPrefix)) {
+                                    status = ActivityConnectBase.Status.WIFI_CONNECTING;
+                                    setupObserver();
                                     break;
                                 } else {
-                                    ActivityConnectSimpleAP.this.onError();
+                                    onError();
                                     break;
                                 }
                             }
                         } else {
-                            EPLog.m87e(ActivityConnectSimpleAP.TAG, "Not Found Network");
-                            ActivityConnectSimpleAP.this.status = ActivityConnectBase.Status.IDLE;
-                            ActivityConnectSimpleAP.this.onError();
+                            EPLog.e(TAG, "Not Found Network");
+                            status = ActivityConnectBase.Status.IDLE;
+                            onError();
                             break;
                         }
                     }
@@ -96,22 +96,22 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
                                 String string2 = data2.getString(escprLib.PRINTER_IP);
                                 String string3 = data2.getString("id");
                                 if (string != null && string2 != null && string3 != null) {
-                                    EPLog.m88i(ActivityConnectSimpleAP.TAG, "epsWrapperFindPrinter Success");
-                                    if (!ActivityConnectSimpleAP.this.expectedPrtMacAddr.equals(MacAddrUtils.getMacAddressFromPrinterId(string3))) {
-                                        EPLog.m88i(ActivityConnectSimpleAP.TAG, "This Printer is not expected " + string);
+                                    EPLog.i(TAG, "epsWrapperFindPrinter Success");
+                                    if (!expectedPrtMacAddr.equals(MacAddrUtils.getMacAddressFromPrinterId(string3))) {
+                                        EPLog.i(TAG, "This Printer is not expected " + string);
                                         return;
                                     }
-                                    ActivityConnectSimpleAP.this.interruptFindingPrinter();
+                                    interruptFindingPrinter();
                                     Intent intent = new Intent();
                                     intent.putExtras(data2);
-                                    ActivityConnectSimpleAP.this.onConnectedPrinter(intent);
+                                    onConnectedPrinter(intent);
                                     return;
                                 }
                                 return;
                             }
                             return;
                         case 2:
-                            ActivityConnectSimpleAP.this.onError();
+                            onError();
                             return;
                         default:
                             return;
@@ -120,8 +120,8 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
                     return;
             }
             if (message.what == 10) {
-                ActivityConnectSimpleAP.this.status = ActivityConnectBase.Status.WIFI_CONNECTED;
-                ActivityConnectSimpleAP.this.onConnectedWiFi();
+                status = ActivityConnectBase.Status.WIFI_CONNECTED;
+                onConnectedWiFi();
             }
         }
     };
@@ -136,26 +136,26 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
     public void onNeutralClick(String str) {
     }
 
-    static /* synthetic */ int access$408(ActivityConnectSimpleAP activityConnectSimpleAP) {
-        int i = activityConnectSimpleAP.retryConnecting;
-        activityConnectSimpleAP.retryConnecting = i + 1;
+    static /* synthetic */ int access(ActivityConnectSimpleAP activityConnectSimpleAP) {
+        int i = retryConnecting;
+        retryConnecting = i + 1;
         return i;
     }
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        mModelDialog = (DialogProgressWiFiDirectViewModel) ViewModelProviders.m2of((FragmentActivity) this).get(DialogProgressWiFiDirectViewModel.class);
+        mModelDialog = (DialogProgressWiFiDirectViewModel) ViewModelProviders.of(ActivityConnectSimpleAP.this).get(DialogProgressWiFiDirectViewModel.class);
         mModelDialog.getDialogJob().observe(this, new Observer<Deque<String[]>>() {
             public void onChanged(@Nullable Deque<String[]> deque) {
-                String[] checkQueue = ActivityConnectSimpleAP.mModelDialog.checkQueue();
+                String[] checkQueue = mModelDialog.checkQueue();
                 if (checkQueue != null) {
                     String str = checkQueue[0];
                     String str2 = checkQueue[1];
                     if (str2.equals("do_show")) {
-                        ActivityConnectSimpleAP.this.showDialog(str);
+                        showDialog(str);
                     }
                     if (str2.equals("do_dismiss")) {
-                        ActivityConnectSimpleAP.this.dismissDialog(str);
+                        dismissDialog(str);
                     }
                 }
             }
@@ -171,7 +171,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
             needInfo = extras.getBoolean(ActivityConnectBase.NEEDINFO, false);
             timeout = extras.getInt(ActivityConnectBase.TIMEOUT, 30);
         }
-        EPLog.m88i(TAG, "Starting connect :" + targetSsid + " timeout = " + timeout);
+        EPLog.i(TAG, "Starting connect :" + targetSsid + " timeout = " + timeout);
         mHandler.sendEmptyMessage(11);
     }
 
@@ -180,7 +180,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         if (i != 2) {
             switch (i) {
                 case 4:
-                    if (this.targetSsid.equals(WiFiUtils.getInstance(this).getCurSSID())) {
+                    if (targetSsid.equals(WiFiUtils.getInstance(this).getCurSSID())) {
                         onConnectedWiFi();
                         return;
                     }
@@ -199,7 +199,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
             setResult(0);
             setLastDetailResult(1);
             finish();
-        } else if (!this.searchWiFiDirectPrinter.start(1, mHandler, 0, timeout)) {
+        } else if (!searchWiFiDirectPrinter.start(1, mHandler, 0, timeout)) {
             onError();
         } else {
             status = ActivityConnectBase.Status.WIFI_SCANNING;
@@ -207,8 +207,8 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
     }
 
     protected void onEnabledWifi() {
-        if (this.targetSsid.equals(WiFiUtils.getInstance(this).getCurSSID())) {
-            EPLog.m86d(TAG, "Already Connected!!");
+        if (targetSsid.equals(WiFiUtils.getInstance(this).getCurSSID())) {
+            EPLog.d(TAG, "Already Connected!!");
             status = ActivityConnectBase.Status.WIFI_CONNECTING;
             mHandler.sendEmptyMessage(10);
             return;
@@ -216,9 +216,9 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         if (WifiP2pUtils.getInstance(this).isConnectedWiFiP2P()) {
             WifiP2pUtils.getInstance(this).disconnect();
         }
-        if (this.createSimpleAP) {
-            connectingNetworkId = WiFiUtils.getInstance(this).createSimpleAP(this.targetSsid, targetPass);
-            if (this.connectingNetworkId == -1) {
+        if (createSimpleAP) {
+            connectingNetworkId = WiFiUtils.getInstance(this).createSimpleAP(targetSsid, targetPass);
+            if (connectingNetworkId == -1) {
                 mModelDialog.doShow(IDD_WIFI_PROFILE_FAILED);
                 return;
             }
@@ -229,135 +229,10 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         ActivityRequestLocationPermission.requestLocationPermissionForce(this, 2);
     }
 
-    /* access modifiers changed from: private */
-    /* JADX WARNING: Removed duplicated region for block: B:22:0x0046  */
-    /* JADX WARNING: Removed duplicated region for block: B:23:0x0049  */
-    /* JADX WARNING: Removed duplicated region for block: B:24:0x007f  */
-    /* JADX WARNING: Removed duplicated region for block: B:25:0x00b5  */
-    /* JADX WARNING: Removed duplicated region for block: B:26:0x00cc  */
-    /* JADX WARNING: Removed duplicated region for block: B:28:0x00d8  */
-    /* JADX WARNING: Removed duplicated region for block: B:30:? A[RETURN, SYNTHETIC] */
-    /* Code decompiled incorrectly, please refer to instructions dump. */
+
     public void showDialog(java.lang.String r11) {
-        /*
-            r10 = this;
-            int r0 = r11.hashCode()
-            r1 = -872067019(0xffffffffcc055035, float:-3.4947284E7)
-            r2 = 0
-            if (r0 == r1) goto L_0x0038
-            r1 = -692203673(0xffffffffd6bdcf67, float:-1.04349242E14)
-            if (r0 == r1) goto L_0x002e
-            r1 = -174410503(0xfffffffff59ab4f9, float:-3.9222865E32)
-            if (r0 == r1) goto L_0x0024
-            r1 = 765832116(0x2da5abb4, float:1.883458E-11)
-            if (r0 == r1) goto L_0x001a
-            goto L_0x0042
-        L_0x001a:
-            java.lang.String r0 = "idd_wifi_error"
-            boolean r0 = r11.equals(r0)
-            if (r0 == 0) goto L_0x0042
-            r0 = 1
-            goto L_0x0043
-        L_0x0024:
-            java.lang.String r0 = "idd_wifi_waiting"
-            boolean r0 = r11.equals(r0)
-            if (r0 == 0) goto L_0x0042
-            r0 = 0
-            goto L_0x0043
-        L_0x002e:
-            java.lang.String r0 = "idd_wifi_profile_failed"
-            boolean r0 = r11.equals(r0)
-            if (r0 == 0) goto L_0x0042
-            r0 = 3
-            goto L_0x0043
-        L_0x0038:
-            java.lang.String r0 = "idd_wifi_simpleap"
-            boolean r0 = r11.equals(r0)
-            if (r0 == 0) goto L_0x0042
-            r0 = 2
-            goto L_0x0043
-        L_0x0042:
-            r0 = -1
-        L_0x0043:
-            switch(r0) {
-                case 0: goto L_0x00cc;
-                case 1: goto L_0x00b5;
-                case 2: goto L_0x007f;
-                case 3: goto L_0x0049;
-                default: goto L_0x0046;
-            }
-        L_0x0046:
-            r0 = 0
-            goto L_0x00d6
-        L_0x0049:
-            r4 = 2
-            java.lang.StringBuilder r0 = new java.lang.StringBuilder
-            r0.<init>()
-            int r1 = com.epson.mobilephone.common.wifidirect.C1113R.string.str_notice_duplicated_simpleAP
-            java.lang.String r1 = r10.getString(r1)
-            r0.append(r1)
-            java.lang.String r1 = "\n\nSSID: "
-            r0.append(r1)
-            java.lang.String r1 = r10.targetSsid
-            r0.append(r1)
-            java.lang.String r5 = r0.toString()
-            int r0 = com.epson.mobilephone.common.wifidirect.C1113R.string.str_error_wifi_connecting_failed
-            java.lang.String r6 = r10.getString(r0)
-            int r0 = com.epson.mobilephone.common.wifidirect.C1113R.string.str_goto_wifi_setting
-            java.lang.String r7 = r10.getString(r0)
-            r8 = 0
-            int r0 = com.epson.mobilephone.common.wifidirect.C1113R.string.str_cancel
-            java.lang.String r9 = r10.getString(r0)
-            r3 = r11
-            com.epson.mobilephone.common.wifidirect.DialogProgressWiFiDirect r0 = com.epson.mobilephone.common.wifidirect.DialogProgressWiFiDirect.newInstance(r3, r4, r5, r6, r7, r8, r9)
-            goto L_0x00d6
-        L_0x007f:
-            r4 = 2
-            java.lang.StringBuilder r0 = new java.lang.StringBuilder
-            r0.<init>()
-            int r1 = com.epson.mobilephone.common.wifidirect.C1113R.string.str_notice_connecting_simpleAP
-            java.lang.String r1 = r10.getString(r1)
-            r0.append(r1)
-            java.lang.String r1 = "\n\nSSID: "
-            r0.append(r1)
-            java.lang.String r1 = r10.targetSsid
-            r0.append(r1)
-            java.lang.String r5 = r0.toString()
-            int r0 = com.epson.mobilephone.common.wifidirect.C1113R.string.str_error_wifi_connecting_simpleAP
-            java.lang.String r6 = r10.getString(r0)
-            int r0 = com.epson.mobilephone.common.wifidirect.C1113R.string.str_goto_wifi_setting
-            java.lang.String r7 = r10.getString(r0)
-            r8 = 0
-            int r0 = com.epson.mobilephone.common.wifidirect.C1113R.string.str_cancel
-            java.lang.String r9 = r10.getString(r0)
-            r3 = r11
-            com.epson.mobilephone.common.wifidirect.DialogProgressWiFiDirect r0 = com.epson.mobilephone.common.wifidirect.DialogProgressWiFiDirect.newInstance(r3, r4, r5, r6, r7, r8, r9)
-            goto L_0x00d6
-        L_0x00b5:
-            r4 = 2
-            int r0 = com.epson.mobilephone.common.wifidirect.C1113R.string.str_error_connecting_printer
-            java.lang.String r5 = r10.getString(r0)
-            r6 = 0
-            r0 = 17039370(0x104000a, float:2.42446E-38)
-            java.lang.String r7 = r10.getString(r0)
-            r8 = 0
-            r9 = 0
-            r3 = r11
-            com.epson.mobilephone.common.wifidirect.DialogProgressWiFiDirect r0 = com.epson.mobilephone.common.wifidirect.DialogProgressWiFiDirect.newInstance(r3, r4, r5, r6, r7, r8, r9)
-            goto L_0x00d6
-        L_0x00cc:
-            int r0 = com.epson.mobilephone.common.wifidirect.C1113R.string.str_connecting_printer
-            java.lang.String r0 = r10.getString(r0)
-            com.epson.mobilephone.common.wifidirect.DialogProgressWiFiDirect r0 = com.epson.mobilephone.common.wifidirect.DialogProgressWiFiDirect.newInstance(r11, r2, r0)
-        L_0x00d6:
-            if (r0 == 0) goto L_0x00e2
-            r0.setCancelable(r2)
-            android.support.v4.app.FragmentManager r1 = r10.getSupportFragmentManager()
-            r0.show(r1, r11)
-        L_0x00e2:
-            return
-        */
-        throw new UnsupportedOperationException("Method not decompiled: com.epson.mobilephone.common.wifidirect.ActivityConnectSimpleAP.showDialog(java.lang.String):void");
+
+        throw new UnsupportedOperationException("Method not decompiled: com.epson.mobilephone.common.wifidirect.showDialog(java.lang.String):void");
     }
 
     private void dismissDialog(String str) {
@@ -381,7 +256,7 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
     }
 
     private void onConnectedWiFi() {
-        EPLog.m86d(TAG, "onConnect()");
+        EPLog.d(TAG, "onConnect()");
         interruptConnecting();
         new AsyncTask<Void, Void, Void>() {
             protected Void doInBackground(Void... voidArr) {
@@ -391,60 +266,60 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
 
             protected void onPostExecute(Void voidR) {
                 ManageDefaultNetwork.getInstance(ActivityConnectSimpleAP.this).setDefaultNetworkSimpleAp();
-                if (ActivityConnectSimpleAP.this.showConnectedTip) {
+                if (showConnectedTip) {
                     ActivityConnectSimpleAP activityConnectSimpleAP = ActivityConnectSimpleAP.this;
-                    Toast.makeText(activityConnectSimpleAP, activityConnectSimpleAP.getString(C1113R.string.str_notice_wifi_connected), 0).show();
+                    Toast.makeText(activityConnectSimpleAP, getString(R.string.str_notice_wifi_connected), 0).show();
                 }
-                if (!ActivityConnectSimpleAP.this.needInfo) {
-                    ActivityConnectSimpleAP.this.closeWaitingDialog();
-                    ActivityConnectSimpleAP.this.status = ActivityConnectBase.Status.IDLE;
-                    ActivityConnectSimpleAP.this.setResult(-1);
+                if (!needInfo) {
+                    closeWaitingDialog();
+                    status = ActivityConnectBase.Status.IDLE;
+                    setResult(-1);
                     ActivityConnectBase.setLastDetailResult(-1);
-                    ActivityConnectSimpleAP.this.finish();
+                    finish();
                     return;
                 }
-                if (ActivityConnectSimpleAP.this.taskFindPrinter != null) {
-                    EPLog.m90w(ActivityConnectSimpleAP.TAG, "Already called onConnect()");
+                if (taskFindPrinter != null) {
+                    EPLog.w(TAG, "Already called onConnect()");
                 }
                 String curP2PMacAdder = WiFiUtils.getInstance(ActivityConnectSimpleAP.this).getCurP2PMacAdder();
-                ActivityConnectSimpleAP.this.expectedPrtMacAddr = WiFiControl.p2pAddr2PtrAddrP2P(curP2PMacAdder, (String) null);
-                ActivityConnectSimpleAP.this.status = ActivityConnectBase.Status.PRINTER_FINDING;
+                expectedPrtMacAddr = WiFiControl.p2pAddr2PtrAddrP2P(curP2PMacAdder, (String) null);
+                status = ActivityConnectBase.Status.PRINTER_FINDING;
                 ActivityConnectSimpleAP activityConnectSimpleAP2 = ActivityConnectSimpleAP.this;
-                activityConnectSimpleAP2.taskFindPrinter = new FindPrinterTask(activityConnectSimpleAP2.mHandler, ActivityConnectSimpleAP.this.timeout, 1, 2);
-                ActivityConnectSimpleAP.this.taskFindPrinter.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
+                activityConnectSimpleAP2.taskFindPrinter = new FindPrinterTask(activityConnectSimpleAP2.mHandler, timeout, 1, 2);
+                taskFindPrinter.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
             }
         }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
     }
 
     private void onError() {
         closeWaitingDialog();
-        Toast.makeText(this, getString(C1113R.string.str_error_connecting_printer_short), 1).show();
-        if (this.searchWiFiDirectPrinter != null) {
+        Toast.makeText(this, getString(R.string.str_error_connecting_printer_short), 1).show();
+        if (searchWiFiDirectPrinter != null) {
             searchWiFiDirectPrinter.interrupt();
             searchWiFiDirectPrinter = null;
         }
-        if (this.status == ActivityConnectBase.Status.WIFI_CONNECTING && connectingNetworkId != -1) {
+        if (status == ActivityConnectBase.Status.WIFI_CONNECTING && connectingNetworkId != -1) {
             interruptConnecting();
-            WiFiUtils.getInstance(this).removeNetwork(this.connectingNetworkId);
+            WiFiUtils.getInstance(this).removeNetwork(connectingNetworkId);
             connectingNetworkId = -1;
             WiFiUtils.getInstance(this).reConnectNetwork();
-            if (this.showErrorDlg) {
+            if (showErrorDlg) {
                 mModelDialog.doShow(IDD_WIFI_ERROR);
                 return;
             }
         }
-        EPLog.m86d(TAG, "finish():RESULT_CANCELED");
+        EPLog.d(TAG, "finish():RESULT_CANCELED");
         setResult(0);
         setLastDetailResult(2);
         finish();
     }
 
     private void closeWaitingDialog() {
-        EPLog.m86d(TAG, "Called closeWaitingDialog()");
+        EPLog.d(TAG, "Called closeWaitingDialog()");
         try {
             mModelDialog.doDismiss(IDD_WIFI_WAITING);
         } catch (IllegalArgumentException unused) {
-            EPLog.m86d(TAG, "IDD_WIFI_WATING already closed");
+            EPLog.d(TAG, "IDD_WIFI_WATING already closed");
         }
     }
 
@@ -453,186 +328,25 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
 
         /* renamed from: $SwitchMap$com$epson$mobilephone$common$wifidirect$ActivityConnectBase$Status */
         static final /* synthetic */ int[] f150x55760faf = new int[ActivityConnectBase.Status.values().length];
-
-        /* JADX WARNING: Can't wrap try/catch for region: R(10:0|1|2|3|4|5|6|7|8|10) */
-        /* JADX WARNING: Can't wrap try/catch for region: R(8:0|1|2|3|4|5|6|(3:7|8|10)) */
-        /* JADX WARNING: Failed to process nested try/catch */
-        /* JADX WARNING: Missing exception handler attribute for start block: B:3:0x0014 */
-        /* JADX WARNING: Missing exception handler attribute for start block: B:5:0x001f */
-        /* JADX WARNING: Missing exception handler attribute for start block: B:7:0x002a */
-        static {
-            /*
-                com.epson.mobilephone.common.wifidirect.ActivityConnectBase$Status[] r0 = com.epson.mobilephone.common.wifidirect.ActivityConnectBase.Status.values()
-                int r0 = r0.length
-                int[] r0 = new int[r0]
-                f150x55760faf = r0
-                int[] r0 = f150x55760faf     // Catch:{ NoSuchFieldError -> 0x0014 }
-                com.epson.mobilephone.common.wifidirect.ActivityConnectBase$Status r1 = com.epson.mobilephone.common.wifidirect.ActivityConnectBase.Status.IDLE     // Catch:{ NoSuchFieldError -> 0x0014 }
-                int r1 = r1.ordinal()     // Catch:{ NoSuchFieldError -> 0x0014 }
-                r2 = 1
-                r0[r1] = r2     // Catch:{ NoSuchFieldError -> 0x0014 }
-            L_0x0014:
-                int[] r0 = f150x55760faf     // Catch:{ NoSuchFieldError -> 0x001f }
-                com.epson.mobilephone.common.wifidirect.ActivityConnectBase$Status r1 = com.epson.mobilephone.common.wifidirect.ActivityConnectBase.Status.WIFI_SCANNING     // Catch:{ NoSuchFieldError -> 0x001f }
-                int r1 = r1.ordinal()     // Catch:{ NoSuchFieldError -> 0x001f }
-                r2 = 2
-                r0[r1] = r2     // Catch:{ NoSuchFieldError -> 0x001f }
-            L_0x001f:
-                int[] r0 = f150x55760faf     // Catch:{ NoSuchFieldError -> 0x002a }
-                com.epson.mobilephone.common.wifidirect.ActivityConnectBase$Status r1 = com.epson.mobilephone.common.wifidirect.ActivityConnectBase.Status.WIFI_CONNECTING     // Catch:{ NoSuchFieldError -> 0x002a }
-                int r1 = r1.ordinal()     // Catch:{ NoSuchFieldError -> 0x002a }
-                r2 = 3
-                r0[r1] = r2     // Catch:{ NoSuchFieldError -> 0x002a }
-            L_0x002a:
-                int[] r0 = f150x55760faf     // Catch:{ NoSuchFieldError -> 0x0035 }
-                com.epson.mobilephone.common.wifidirect.ActivityConnectBase$Status r1 = com.epson.mobilephone.common.wifidirect.ActivityConnectBase.Status.PRINTER_FINDING     // Catch:{ NoSuchFieldError -> 0x0035 }
-                int r1 = r1.ordinal()     // Catch:{ NoSuchFieldError -> 0x0035 }
-                r2 = 4
-                r0[r1] = r2     // Catch:{ NoSuchFieldError -> 0x0035 }
-            L_0x0035:
-                return
-            */
-            throw new UnsupportedOperationException("Method not decompiled: com.epson.mobilephone.common.wifidirect.ActivityConnectSimpleAP.C10874.<clinit>():void");
-        }
     }
 
-    private void setupObserver() {
+    public void setupObserver() {
         super.setupObserver();
         networkStateChangeReciever = new NetworkStateChangeReciever();
-        registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.STATE_CHANGE"));
-        registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.WIFI_STATE_CHANGED"));
-        registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.supplicant.STATE_CHANGE"));
+        registerReceiver(networkStateChangeReciever, new IntentFilter("android.net.wifi.STATE_CHANGE"));
+        registerReceiver(networkStateChangeReciever, new IntentFilter("android.net.wifi.WIFI_STATE_CHANGED"));
+        registerReceiver(networkStateChangeReciever, new IntentFilter("android.net.wifi.supplicant.STATE_CHANGE"));
     }
 
-    /* JADX WARNING: Removed duplicated region for block: B:17:0x0039  */
-    /* JADX WARNING: Removed duplicated region for block: B:18:0x0045  */
-    /* JADX WARNING: Removed duplicated region for block: B:19:0x0051  */
-    /* JADX WARNING: Removed duplicated region for block: B:23:? A[RETURN, SYNTHETIC] */
-    /* Code decompiled incorrectly, please refer to instructions dump. */
+
     public void onPositiveClick(java.lang.String r5) {
-        /*
-            r4 = this;
-            int r0 = r5.hashCode()
-            r1 = -872067019(0xffffffffcc055035, float:-3.4947284E7)
-            r2 = 2
-            r3 = 0
-            if (r0 == r1) goto L_0x002a
-            r1 = -692203673(0xffffffffd6bdcf67, float:-1.04349242E14)
-            if (r0 == r1) goto L_0x0020
-            r1 = 765832116(0x2da5abb4, float:1.883458E-11)
-            if (r0 == r1) goto L_0x0016
-            goto L_0x0034
-        L_0x0016:
-            java.lang.String r0 = "idd_wifi_error"
-            boolean r5 = r5.equals(r0)
-            if (r5 == 0) goto L_0x0034
-            r5 = 0
-            goto L_0x0035
-        L_0x0020:
-            java.lang.String r0 = "idd_wifi_profile_failed"
-            boolean r5 = r5.equals(r0)
-            if (r5 == 0) goto L_0x0034
-            r5 = 2
-            goto L_0x0035
-        L_0x002a:
-            java.lang.String r0 = "idd_wifi_simpleap"
-            boolean r5 = r5.equals(r0)
-            if (r5 == 0) goto L_0x0034
-            r5 = 1
-            goto L_0x0035
-        L_0x0034:
-            r5 = -1
-        L_0x0035:
-            switch(r5) {
-                case 0: goto L_0x0051;
-                case 1: goto L_0x0045;
-                case 2: goto L_0x0039;
-                default: goto L_0x0038;
-            }
-        L_0x0038:
-            goto L_0x0061
-        L_0x0039:
-            java.lang.String r5 = "ActivityConnectSimpleAP"
-            java.lang.String r0 = "finish():GOTO_WIFI_SETTINGS"
-            com.epson.mobilephone.common.wifidirect.EPLog.m86d(r5, r0)
-            r5 = 5
-            com.epson.mobilephone.common.wifidirect.WiFiUtils.showOsWifiSettings(r4, r5)
-            goto L_0x0061
-        L_0x0045:
-            java.lang.String r5 = "ActivityConnectSimpleAP"
-            java.lang.String r0 = "finish():GOTO_WIFI_SETTINGS"
-            com.epson.mobilephone.common.wifidirect.EPLog.m86d(r5, r0)
-            r5 = 4
-            com.epson.mobilephone.common.wifidirect.WiFiUtils.showOsWifiSettings(r4, r5)
-            goto L_0x0061
-        L_0x0051:
-            java.lang.String r5 = "ActivityConnectSimpleAP"
-            java.lang.String r0 = "finish():RESULT_CANCELED"
-            com.epson.mobilephone.common.wifidirect.EPLog.m86d(r5, r0)
-            r4.setResult(r3)
-            setLastDetailResult(r2)
-            r4.finish()
-        L_0x0061:
-            return
-        */
-        throw new UnsupportedOperationException("Method not decompiled: com.epson.mobilephone.common.wifidirect.ActivityConnectSimpleAP.onPositiveClick(java.lang.String):void");
+
+        throw new UnsupportedOperationException("Method not decompiled: com.epson.mobilephone.common.wifidirect.onPositiveClick(java.lang.String):void");
     }
 
-    /* JADX WARNING: Removed duplicated region for block: B:12:0x002a  */
-    /* JADX WARNING: Removed duplicated region for block: B:13:0x0038  */
-    /* JADX WARNING: Removed duplicated region for block: B:16:? A[RETURN, SYNTHETIC] */
-    /* Code decompiled incorrectly, please refer to instructions dump. */
     public void onNegativeClick(java.lang.String r5) {
-        /*
-            r4 = this;
-            int r0 = r5.hashCode()
-            r1 = -872067019(0xffffffffcc055035, float:-3.4947284E7)
-            r2 = 0
-            r3 = 1
-            if (r0 == r1) goto L_0x001b
-            r1 = -692203673(0xffffffffd6bdcf67, float:-1.04349242E14)
-            if (r0 == r1) goto L_0x0011
-            goto L_0x0025
-        L_0x0011:
-            java.lang.String r0 = "idd_wifi_profile_failed"
-            boolean r5 = r5.equals(r0)
-            if (r5 == 0) goto L_0x0025
-            r5 = 1
-            goto L_0x0026
-        L_0x001b:
-            java.lang.String r0 = "idd_wifi_simpleap"
-            boolean r5 = r5.equals(r0)
-            if (r5 == 0) goto L_0x0025
-            r5 = 0
-            goto L_0x0026
-        L_0x0025:
-            r5 = -1
-        L_0x0026:
-            switch(r5) {
-                case 0: goto L_0x0038;
-                case 1: goto L_0x002a;
-                default: goto L_0x0029;
-            }
-        L_0x0029:
-            goto L_0x0048
-        L_0x002a:
-            java.lang.String r5 = "ActivityConnectSimpleAP"
-            java.lang.String r0 = "finish():RESULT_CANCELED"
-            com.epson.mobilephone.common.wifidirect.EPLog.m86d(r5, r0)
-            r4.onError()
-            setLastDetailResult(r3)
-            goto L_0x0048
-        L_0x0038:
-            java.lang.String r5 = "ActivityConnectSimpleAP"
-            java.lang.String r0 = "finish():RESULT_CANCELED"
-            com.epson.mobilephone.common.wifidirect.EPLog.m86d(r5, r0)
-            r4.setResult(r2)
-            setLastDetailResult(r3)
-            r4.finish()
-        L_0x0048:
-            return
-        */
-        throw new UnsupportedOperationException("Method not decompiled: com.epson.mobilephone.common.wifidirect.ActivityConnectSimpleAP.onNegativeClick(java.lang.String):void");
+
+        throw new UnsupportedOperationException("Method not decompiled: com.epson.mobilephone.common.wifidirect.onNegativeClick(java.lang.String):void");
     }
 
     class NetworkStateChangeReciever extends BroadcastReceiver {
@@ -642,31 +356,31 @@ public class ActivityConnectSimpleAP extends ActivityConnectBase implements Dial
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             if (action.equals("android.net.wifi.WIFI_STATE_CHANGED")) {
-                EPLog.m86d(ActivityConnectSimpleAP.TAG, String.format("WiFi State Change : wifiState = %d", new Object[]{Integer.valueOf(intent.getIntExtra("wifi_state", 4))}));
+                EPLog.d(TAG, String.format("WiFi State Change : wifiState = %d", new Object[]{Integer.valueOf(intent.getIntExtra("wifi_state", 4))}));
             } else if (action.equals("android.net.wifi.STATE_CHANGE")) {
                 NetworkInfo networkInfo = (NetworkInfo) intent.getParcelableExtra("networkInfo");
-                EPLog.m86d(ActivityConnectSimpleAP.TAG, "Network State Changed:" + networkInfo.toString());
-                if (networkInfo.isConnected() && ActivityConnectSimpleAP.this.targetSsid.equals(WiFiUtils.getInstance(ActivityConnectSimpleAP.this).getCurSSID())) {
-                    EPLog.m88i(ActivityConnectSimpleAP.TAG, "Wi-Fi connected.");
-                    ActivityConnectSimpleAP.mHandler.sendEmptyMessageDelayed(10, 1000);
+                EPLog.d(TAG, "Network State Changed:" + networkInfo.toString());
+                if (networkInfo.isConnected() && targetSsid.equals(WiFiUtils.getInstance(this).getCurSSID())) {
+                    EPLog.i(TAG, "Wi-Fi connected.");
+                    mHandler.sendEmptyMessageDelayed(10, 1000);
                 }
             } else if (action.equals("android.net.wifi.supplicant.STATE_CHANGE")) {
                 SupplicantState supplicantState = (SupplicantState) intent.getParcelableExtra("newState");
-                EPLog.m86d(ActivityConnectSimpleAP.TAG, "Supplicant State Changed: State = " + supplicantState.toString());
+                EPLog.d(TAG, "Supplicant State Changed: State = " + supplicantState.toString());
                 if (intent.hasExtra("supplicantError")) {
                     Integer valueOf = Integer.valueOf(intent.getIntExtra("supplicantError", 0));
-                    EPLog.m86d(ActivityConnectSimpleAP.TAG, "Supplicant State Changed: ErrorCode = " + valueOf.toString());
-                    if (ActivityConnectSimpleAP.this.status == ActivityConnectBase.Status.WIFI_CONNECTING) {
-                        EPLog.m86d(ActivityConnectSimpleAP.TAG, "EXTRA_SUPPLICANT_ERROR");
-                        ActivityConnectSimpleAP.this.onError();
+                    EPLog.d(TAG, "Supplicant State Changed: ErrorCode = " + valueOf.toString());
+                    if (status == ActivityConnectBase.Status.WIFI_CONNECTING) {
+                        EPLog.d(TAG, "EXTRA_SUPPLICANT_ERROR");
+                        onError();
                         return;
                     }
                 }
-                if (supplicantState == SupplicantState.ASSOCIATING && ActivityConnectSimpleAP.this.status == ActivityConnectBase.Status.WIFI_CONNECTING) {
-                    ActivityConnectSimpleAP.access$408(ActivityConnectSimpleAP.this);
-                    if (ActivityConnectSimpleAP.this.retryConnecting > 5) {
-                        EPLog.m86d(ActivityConnectSimpleAP.TAG, "Connecting Retry timeout");
-                        ActivityConnectSimpleAP.this.onError();
+                if (supplicantState == SupplicantState.ASSOCIATING && status == ActivityConnectBase.Status.WIFI_CONNECTING) {
+                    access(ActivityConnectSimpleAP.this);
+                    if (retryConnecting > 5) {
+                        EPLog.d(TAG, "Connecting Retry timeout");
+                        onError();
                     }
                 }
             }

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityControlWiFi.java

@@ -3,6 +3,7 @@ package com.epson.mobilephone.common.wifidirect;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -14,6 +15,8 @@ import android.net.wifi.WifiManager;
 import android.os.AsyncTask;
 import android.os.Bundle;
 
+import epson.print.R;
+
 public class ActivityControlWiFi extends Activity {
     public static final int SCANNING_TIMEOUT = 10000;
     public static final String SHOWPROGRESS = "com.epson.iprint.wifidirect.progress";
@@ -30,7 +33,7 @@ public class ActivityControlWiFi extends Activity {
     boolean showWifiSettings = false;
 
     protected void onCreate(Bundle bundle) {
-        EPLog.m86d(TAG, "onCreate()");
+        EPLog.d(TAG, "onCreate()");
         super.onCreate(bundle);
         mWifiManager = (WifiManager) getApplicationContext().getSystemService(Service.WIFI_SERVICE);
         requestWindowFeature(1);
@@ -40,20 +43,20 @@ public class ActivityControlWiFi extends Activity {
             showWifiSettings = extras.getBoolean(SHOWWIFISETTINGS, false);
         }
         if (this.showProgress) {
-            setContentView(C1113R.layout.progress);
+            setContentView(R.layout.progress);
         }
         if (this.showWifiSettings) {
             WiFiUtils.showOsWifiSettings(this, 0);
         } else if (!mWifiManager.isWifiEnabled()) {
             showDialog(0);
         } else {
-            EPLog.m86d(TAG, "Already WiFi Enabled");
+            EPLog.d(TAG, "Already WiFi Enabled");
             onOK();
         }
     }
 
     protected void onResume() {
-        EPLog.m86d(TAG, "onResume()");
+        EPLog.d(TAG, "onResume()");
         super.onResume();
         NfcDispatchUtils.enableForegroundDispatch(this, (IntentFilter[]) null, (String[][]) null);
     }
@@ -64,7 +67,7 @@ public class ActivityControlWiFi extends Activity {
     }
 
     protected void onActivityResult(int i, int i2, Intent intent) {
-        EPLog.m86d(TAG, "onActivityResult()");
+        EPLog.d(TAG, "onActivityResult()");
         super.onActivityResult(i, i2, intent);
         if (i == 0) {
             switch (mWifiManager.getWifiState()) {
@@ -81,10 +84,10 @@ public class ActivityControlWiFi extends Activity {
     }
 
     protected void onDestroy() {
-        EPLog.m86d(TAG, "onDestroy()");
+        EPLog.d(TAG, "onDestroy()");
         super.onDestroy();
         if (this.networkStateChangeReciever != null) {
-            EPLog.m86d(TAG, "unregisterReceiver()");
+            EPLog.d(TAG, "unregisterReceiver()");
             unregisterReceiver(this.networkStateChangeReciever);
             networkStateChangeReciever = null;
         }
@@ -96,7 +99,7 @@ public class ActivityControlWiFi extends Activity {
             public void onClick(DialogInterface dialogInterface, int i) {
                 ActivityControlWiFi.this.registerReciever();
                 boolean wifiEnabled = ActivityControlWiFi.mWifiManager.setWifiEnabled(true);
-                EPLog.m86d(ActivityControlWiFi.TAG, "setWifiEnabled return " + wifiEnabled);
+                EPLog.d(ActivityControlWiFi.TAG, "setWifiEnabled return " + wifiEnabled);
                 if (!wifiEnabled) {
                     WiFiUtils.showOsWifiSettings(ActivityControlWiFi.this, 0);
                 }
@@ -105,24 +108,24 @@ public class ActivityControlWiFi extends Activity {
             public void onClick(DialogInterface dialogInterface, int i) {
                 ActivityControlWiFi.this.onCancel();
             }
-        }).setMessage(getString(C1113R.string.str_no_wifi)).setCancelable(false).create();
+        }).setMessage(getString(R.string.str_no_wifi)).setCancelable(false).create();
     }
 
     private void onOK() {
-        EPLog.m86d(TAG, "finish():RESULT_OK");
+        EPLog.d(TAG, "finish():RESULT_OK");
         setResult(-1);
         finish();
     }
 
     private void onCancel() {
-        EPLog.m86d(TAG, "finish():RESULT_CANCELED");
+        EPLog.d(TAG, "finish():RESULT_CANCELED");
         setResult(0);
         finish();
     }
 
     private void registerReciever() {
         if (this.networkStateChangeReciever == null) {
-            EPLog.m86d(TAG, "registerReceiver()");
+            EPLog.d(TAG, "registerReceiver()");
             networkStateChangeReciever = new NetworkStateChangeReciever();
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.STATE_CHANGE"));
             registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.WIFI_STATE_CHANGED"));
@@ -137,10 +140,10 @@ public class ActivityControlWiFi extends Activity {
         public void onReceive(Context context, Intent intent) {
             String action = intent.getAction();
             if (action.equals("android.net.wifi.WIFI_STATE_CHANGED")) {
-                EPLog.m86d(ActivityControlWiFi.TAG, String.format("WiFi State Change : wifiState = %d", new Object[]{Integer.valueOf(intent.getIntExtra("wifi_state", 4))}));
+                EPLog.d(ActivityControlWiFi.TAG, String.format("WiFi State Change : wifiState = %d", new Object[]{Integer.valueOf(intent.getIntExtra("wifi_state", 4))}));
             } else if (action.equals("android.net.wifi.STATE_CHANGE")) {
                 NetworkInfo networkInfo = (NetworkInfo) intent.getParcelableExtra("networkInfo");
-                EPLog.m86d(ActivityControlWiFi.TAG, "Network State Changed:" + networkInfo.toString());
+                EPLog.d(ActivityControlWiFi.TAG, "Network State Changed:" + networkInfo.toString());
                 if (ActivityControlWiFi.mWifiManager.isWifiEnabled()) {
                     switch (C10903.$SwitchMap$android$net$NetworkInfo$State[networkInfo.getState().ordinal()]) {
                         case 1:
@@ -156,7 +159,7 @@ public class ActivityControlWiFi extends Activity {
                 }
             } else if (action.equals("android.net.wifi.supplicant.STATE_CHANGE")) {
                 SupplicantState supplicantState = (SupplicantState) intent.getParcelableExtra("newState");
-                EPLog.m86d(ActivityControlWiFi.TAG, "Supplicant State Changed: State = " + supplicantState.toString());
+                EPLog.d(ActivityControlWiFi.TAG, "Supplicant State Changed: State = " + supplicantState.toString());
                 switch (C10903.$SwitchMap$android$net$wifi$SupplicantState[supplicantState.ordinal()]) {
                     case 1:
                         ActivityControlWiFi.this.scancount++;
@@ -263,7 +266,7 @@ public class ActivityControlWiFi extends Activity {
 
         private void start() {
             interrunpt();
-            EPLog.m86d(ActivityControlWiFi.TAG, "Start ScanningObserver");
+            EPLog.d(ActivityControlWiFi.TAG, "Start ScanningObserver");
             observerTask = new AsyncTask<Void, Void, Void>() {
                 protected Void doInBackground(Void... voidArr) {
                     int i = 0;
@@ -283,7 +286,7 @@ public class ActivityControlWiFi extends Activity {
                 }
 
                 protected void onPostExecute(Void voidR) {
-                    EPLog.m88i(ActivityControlWiFi.TAG, "Timeout ScanningObserver");
+                    EPLog.i(ActivityControlWiFi.TAG, "Timeout ScanningObserver");
                     ActivityControlWiFi.this.onOK();
                 }
             }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new Void[0]);
@@ -292,7 +295,7 @@ public class ActivityControlWiFi extends Activity {
         private void interrunpt() {
             AsyncTask<Void, Void, Void> asyncTask = observerTask;
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
-                EPLog.m86d(ActivityControlWiFi.TAG, "Stop ScanningObserver");
+                EPLog.d(ActivityControlWiFi.TAG, "Stop ScanningObserver");
                 observerTask.cancel(false);
             }
         }

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityRequestLocationPermission.java

@@ -69,7 +69,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
                 if (!hasLocationPermission(this)) {
                     requestPermission = getNeededPermissionString(this);
                     final boolean z = getPreferences(0).getBoolean(DONOTASKAGAIN, false);
-                    new AlertDialog.Builder(this).setCustomTitle(getTitleLayout(this, C1113R.string.str_need_location_setting_title)).setMessage(C1113R.string.str_need_location_permission).setPositiveButton(C1113R.string.str_next, new DialogInterface.OnClickListener() {
+                    new AlertDialog.Builder(this).setCustomTitle(getTitleLayout(this, R.string.str_need_location_setting_title)).setMessage(R.string.str_need_location_permission).setPositiveButton(R.string.str_next, new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
                             if (!z) {
                                 ActivityRequestLocationPermission activityRequestLocationPermission = ActivityRequestLocationPermission.this;
@@ -79,7 +79,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
                             }
                             dialogInterface.dismiss();
                         }
-                    }).setNegativeButton(C1113R.string.str_cancel, new DialogInterface.OnClickListener() {
+                    }).setNegativeButton(R.string.str_cancel, new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialogInterface, int i) {
                             ActivityRequestLocationPermission.this.setRejectRequestPermission();
                             dialogInterface.dismiss();
@@ -143,7 +143,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
                 if (!this.requestPermission.equals(strArr[i2]) || iArr[i2] != 0) {
                     i2++;
                 } else {
-                    EPLog.m86d(TAG, "PERMISSION_GRANTED " + requestPermission);
+                    EPLog.d(TAG, "PERMISSION_GRANTED " + requestPermission);
                     mHandler.sendEmptyMessage(1);
                     return;
                 }
@@ -185,16 +185,16 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
                 if (r0 == 0) goto L_0x0051
                 android.app.AlertDialog$Builder r0 = new android.app.AlertDialog$Builder
                 r0.<init>(r4)
-                int r1 = com.epson.mobilephone.common.wifidirect.C1113R.string.str_need_location_setting_title
+                int r1 = com.epson.mobilephone.common.wifidirect.R.string.str_need_location_setting_title
                 android.widget.LinearLayout r1 = com.epson.mobilephone.common.wifidirect.ActivityRequestLocationPermission.getTitleLayout(r4, r1)
                 android.app.AlertDialog$Builder r0 = r0.setCustomTitle(r1)
-                int r1 = com.epson.mobilephone.common.wifidirect.C1113R.string.str_need_location_setting
+                int r1 = com.epson.mobilephone.common.wifidirect.R.string.str_need_location_setting
                 android.app.AlertDialog$Builder r0 = r0.setMessage(r1)
-                int r1 = com.epson.mobilephone.common.wifidirect.C1113R.string.str_next
+                int r1 = com.epson.mobilephone.common.wifidirect.R.string.str_next
                 com.epson.mobilephone.common.wifidirect.ActivityRequestLocationPermission$innerHandler$2 r2 = new com.epson.mobilephone.common.wifidirect.ActivityRequestLocationPermission$innerHandler$2
                 r2.<init>(r4)
                 android.app.AlertDialog$Builder r0 = r0.setPositiveButton(r1, r2)
-                int r1 = com.epson.mobilephone.common.wifidirect.C1113R.string.str_cancel
+                int r1 = com.epson.mobilephone.common.wifidirect.R.string.str_cancel
                 com.epson.mobilephone.common.wifidirect.ActivityRequestLocationPermission$innerHandler$1 r2 = new com.epson.mobilephone.common.wifidirect.ActivityRequestLocationPermission$innerHandler$1
                 r2.<init>(r4)
                 android.app.AlertDialog$Builder r4 = r0.setNegativeButton(r1, r2)
@@ -241,7 +241,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
                                 ActivityRequestLocationPermission.this.onError();
                             }
                         } else if (statusCode == 8502) {
-                            EPLog.m87e(ActivityRequestLocationPermission.TAG, "Receive LocationSettingsStatusCodes.SETTINGS_CHANGE_UNAVAILABLE;");
+                            EPLog.e(ActivityRequestLocationPermission.TAG, "Receive LocationSettingsStatusCodes.SETTINGS_CHANGE_UNAVAILABLE;");
                             ActivityRequestLocationPermission.this.onError();
                         }
                     }
@@ -300,9 +300,9 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
     }
 
     public void onConnectionFailed(@NonNull ConnectionResult connectionResult) {
-        EPLog.m87e(TAG, "onConnectionFailed() connectionResult=" + connectionResult.toString());
+        EPLog.e(TAG, "onConnectionFailed() connectionResult=" + connectionResult.toString());
         if (connectionResult.hasResolution()) {
-            EPLog.m87e(TAG, "connectionResult has resolution. Try resolution.");
+            EPLog.e(TAG, "connectionResult has resolution. Try resolution.");
             try {
                 connectionResult.startResolutionForResult(this, 2);
             } catch (IntentSender.SendIntentException e) {
@@ -310,12 +310,12 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
                 onError();
             }
         } else {
-            EPLog.m87e(TAG, "connectionResult do'nt has resolution");
+            EPLog.e(TAG, "connectionResult do'nt has resolution");
             GoogleApiAvailability instance = GoogleApiAvailability.getInstance();
             if (instance != null) {
                 int isGooglePlayServicesAvailable = instance.isGooglePlayServicesAvailable(this);
                 if (isGooglePlayServicesAvailable == 0) {
-                    EPLog.m87e(TAG, "resultCode is SUCCESS. No resolution");
+                    EPLog.e(TAG, "resultCode is SUCCESS. No resolution");
                     onError();
                 } else if (instance.isUserResolvableError(isGooglePlayServicesAvailable)) {
                     instance.showErrorDialogFragment(this, isGooglePlayServicesAvailable, 2, new DialogInterface.OnCancelListener() {
@@ -324,11 +324,11 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
                         }
                     });
                 } else {
-                    EPLog.m87e(TAG, "No userResolvableError.");
+                    EPLog.e(TAG, "No userResolvableError.");
                     onError();
                 }
             } else {
-                EPLog.m87e(TAG, "GoogleApiAvailability.getInstance() failed.");
+                EPLog.e(TAG, "GoogleApiAvailability.getInstance() failed.");
                 onError();
             }
         }
@@ -382,7 +382,7 @@ public class ActivityRequestLocationPermission extends Activity implements Googl
             try {
                 int i = Settings.Secure.getInt(context.getContentResolver(), "location_mode");
                 if (i == 0 || i == 1) {
-                    EPLog.m88i(TAG, "isNeedChangeLocationSettings() return true;");
+                    EPLog.i(TAG, "isNeedChangeLocationSettings() return true;");
                     return true;
                 }
             } catch (Settings.SettingNotFoundException e) {

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectBase.java

@@ -6,6 +6,7 @@ import android.view.Menu;
 import android.view.MenuItem;
 
 import epson.print.ActivityIACommon;
+import epson.print.R;
 
 
 public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
@@ -18,7 +19,7 @@ public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
         super.onCreate(bundle);
     }
 
-    private void setupCommonHeaderControl(boolean z, boolean z2) {
+    public void setupCommonHeaderControl(boolean z, boolean z2) {
         setActionBar(R.string.str_wifidirect_settings, z);
         bDisplayHomeAsUpEnabled = z;
         bSupportCancel = z2;
@@ -29,7 +30,7 @@ public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
         if (i == 10) {
             switch (i2) {
                 case -1:
-                    EPLog.m86d(getLocalClassName(), "finish with RESULT_OK");
+                    EPLog.d(getLocalClassName(), "finish with RESULT_OK");
                     setResult(-1, intent);
                     finish();
                     return;
@@ -44,7 +45,7 @@ public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
 
     public void onBackPressed() {
         if (this.bDisplayHomeAsUpEnabled) {
-            EPLog.m86d(getLocalClassName(), "finish with RESULT_BACK");
+            EPLog.d(getLocalClassName(), "finish with RESULT_BACK");
             setResult(1);
             finish();
             return;
@@ -53,7 +54,7 @@ public abstract class ActivityWiFiDirectBase extends ActivityIACommon {
     }
 
     public void onCancelPressed() {
-        EPLog.m86d(getLocalClassName(), "finish with RESULT_CANCELED");
+        EPLog.d(getLocalClassName(), "finish with RESULT_CANCELED");
         setResult(0);
         finish();
     }

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityWiFiDirectError.java

@@ -11,7 +11,7 @@ public class ActivityWiFiDirectError extends ActivityWiFiDirectBase {
 
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
-        EPLog.m86d(TAG, "onCreate");
+        EPLog.d(TAG, "onCreate");
         ViewGroup viewGroup = (ViewGroup) getLayoutInflater().inflate(R.layout.wifidirect_error, (ViewGroup) null);
         setContentView((View) viewGroup);
         setupCommonHeaderControl(false, true);

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityiPrintConnect.java

@@ -1,5 +1,6 @@
 package com.epson.mobilephone.common.wifidirect;
 
+import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -8,6 +9,7 @@ import android.content.res.Resources;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiManager;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.view.View;
 import android.view.ViewGroup;
@@ -15,13 +17,15 @@ import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
-import com.epson.mobilephone.common.wifidirect.escprLib;
+import androidx.annotation.RequiresApi;
 
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
+import epson.print.R;
+
 public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     public static final String FINISH_EAYSETUP = "easysetup";
     private static final int MACADRESS_SIZE = 6;
@@ -64,6 +68,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         CONNECT_ERROR
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.M)
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         mWifiManager = (WifiManager) getApplicationContext().getSystemService(Service.WIFI_SERVICE);
@@ -82,10 +87,10 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         progress = (ProgressBar) viewGroup.findViewById(R.id.progressBarGetConnectStrings);
         btnFinish.setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
-                ActivityiPrintConnect.this.onFinishPressed();
+                onFinishPressed();
             }
         });
-        mEscprLib.epsWrapperGetSetupConnectStrings(this.settingsTempAp);
+        mEscprLib.epsWrapperGetSetupConnectStrings(settingsTempAp);
     }
 
     public void onFinishPressed() {
@@ -107,13 +112,13 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     private void disconnectRealAp() {
         status = Status.CONNECT_ERROR;
         WiFiUtils wiFiUtils2 = wiFiUtils;
-        wiFiUtils2.removeSimpleAP(wiFiUtils2.getNetworkId(this.settingsRealAp.ssid));
+        wiFiUtils2.removeSimpleAP(wiFiUtils2.getNetworkId(settingsRealAp.ssid));
     }
 
     protected void onResume() {
         super.onResume();
         isKeepSimpleAPConnection = false;
-        switch (this.status) {
+        switch (status) {
             case IDLE:
                 setDisplayMenu(false);
                 toolbar.setVisibility(View.GONE);
@@ -135,10 +140,10 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     }
 
     protected void onPause() {
-        EPLog.m86d(TAG, "onPause()");
+        EPLog.d(TAG, "onPause()");
         super.onPause();
-        if (this.status == Status.GETTING_GONNECTSTRINGS) {
-            EPLog.m86d(TAG, "interruputGetConnectSttings()");
+        if (status == Status.GETTING_GONNECTSTRINGS) {
+            EPLog.d(TAG, "interruputGetConnectSttings()");
             status = Status.CONNECT_ERROR;
             AsyncTask<Void, Void, Boolean> asyncTask = taskGetConnectStrings;
             if (asyncTask != null) {
@@ -147,16 +152,16 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
             }
         }
         WiFiUtils wiFiUtils2 = wiFiUtils;
-        wiFiUtils2.removeSimpleAP(wiFiUtils2.getNetworkId(this.settingsTempAp.ssid));
-        if (!this.isKeepSimpleAPConnection && settingsRealAp.ssid != null) {
+        wiFiUtils2.removeSimpleAP(wiFiUtils2.getNetworkId(settingsTempAp.ssid));
+        if (!isKeepSimpleAPConnection && settingsRealAp.ssid != null) {
             disconnectRealAp();
         }
     }
 
     private void registBroadcastReciever() {
-        if (this.networkStateChangeReciever == null) {
+        if (networkStateChangeReciever == null) {
             networkStateChangeReciever = new NetworkStateChangeReciever();
-            registerReceiver(this.networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
+            registerReceiver(networkStateChangeReciever, new IntentFilter("android.net.wifi.SCAN_RESULTS"));
         }
     }
 
@@ -170,13 +175,13 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
 
     protected void onActivityResult(int i, int i2, Intent intent) {
         super.onActivityResult(i, i2, intent);
-        String ssid = wiFiUtils.getSSID(this.wiFiUtils.getCurNetworkId());
+        String ssid = wiFiUtils.getSSID(wiFiUtils.getCurNetworkId());
         switch (i) {
             case 1:
                 if (i2 != -1) {
                     status = Status.CONNECT_ERROR;
                     return;
-                } else if (this.settingsTempAp.ssid.equals(ssid)) {
+                } else if (settingsTempAp.ssid.equals(ssid)) {
                     startConnectRealAp();
                     return;
                 } else if (ssid != null) {
@@ -190,7 +195,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
                 if (i2 != -1) {
                     status = Status.CONNECT_ERROR;
                     return;
-                } else if (this.settingsRealAp.ssid.equals(ssid)) {
+                } else if (settingsRealAp.ssid.equals(ssid)) {
                     intentResult = intent;
                     intentResult.putExtra(FINISH_EAYSETUP, true);
                     status = Status.CONNECTED;
@@ -208,7 +213,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     }
 
     private void onConnectSimpleAP() {
-        EPLog.m86d(TAG, "onConnectSimpleAP()");
+        EPLog.d(TAG, "onConnectSimpleAP()");
         toolbar.setVisibility(View.VISIBLE);
         progress.setVisibility(View.GONE);
         setDisplayMenu(true);
@@ -216,12 +221,12 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         TextView textView = textView2;
         Resources resources = getResources();
         WiFiUtils wiFiUtils2 = wiFiUtils;
-        textView.setText(resources.getString(R.string.str_connected_printer2, new Object[]{this.intentResult.getStringExtra("name"), wiFiUtils2.getSSID(wiFiUtils2.getCurNetworkId())}));
+        textView.setText(resources.getString(R.string.str_connected_printer2, new Object[]{intentResult.getStringExtra("name"), wiFiUtils2.getSSID(wiFiUtils2.getCurNetworkId())}));
         textView3.setText(getResources().getString(R.string.str_connected_printer3));
     }
 
     private void onConnectOtherAP() {
-        EPLog.m86d(TAG, "onConnectOtherAP()");
+        EPLog.d(TAG, "onConnectOtherAP()");
         toolbar.setVisibility(View.GONE);
         progress.setVisibility(View.GONE);
         setDisplayMenu(true);
@@ -231,7 +236,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     }
 
     private void onConnectError() {
-        EPLog.m86d(TAG, "onConnectError()");
+        EPLog.d(TAG, "onConnectError()");
         toolbar.setVisibility(View.GONE);
         progress.setVisibility(View.GONE);
         setDisplayMenu(true);
@@ -241,7 +246,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     }
 
     private void startConnectTempAp() {
-        EPLog.m86d(TAG, "startConnectTempAp()");
+        EPLog.d(TAG, "startConnectTempAp()");
         Intent intent = new Intent(this, ActivityConnectSimpleAP.class);
         intent.putExtra(ActivityConnectBase.APNAME, settingsTempAp.ssid);
         intent.putExtra(ActivityConnectBase.APPASS, settingsTempAp.password);
@@ -254,16 +259,16 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
     }
 
     private void startConnectRealAp() {
-        EPLog.m86d(TAG, "startConnectRealAp()");
+        EPLog.d(TAG, "startConnectRealAp()");
         taskGetConnectStrings = new AsyncTask<Void, Void, Boolean>() {
             protected void onPreExecute() {
-                ActivityiPrintConnect.this.getWindow().addFlags(128);
-                Status unused = ActivityiPrintConnect.this.status = Status.GETTING_GONNECTSTRINGS;
+                getWindow().addFlags(128);
+                Status unused = status = Status.GETTING_GONNECTSTRINGS;
             }
 
             protected Boolean doInBackground(Void... voidArr) {
-                ActivityiPrintConnect.this.wiFiUtils.pingWiFiDirectPrinter();
-                ActivityiPrintConnect.mEscprLib.epsWrapperInitDriver(192);
+                wiFiUtils.pingWiFiDirectPrinter();
+                mEscprLib.epsWrapperInitDriver(192);
                 boolean z = false;
                 int i = -1;
                 int i2 = 0;
@@ -271,13 +276,13 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
                 while (i2 < 5) {
                     try {
                         if (!isCancelled()) {
-                            i3 = ActivityiPrintConnect.mEscprLib.epsWrapperGetConnectStrings(ActivityiPrintConnect.engineId, ActivityiPrintConnect.this.settingsRealAp);
+                            i3 = mEscprLib.epsWrapperGetConnectStrings(engineId, settingsRealAp);
                             if (!isCancelled()) {
                                 if (i3 == 0) {
                                     break;
                                 }
                                 i2++;
-                                EPLog.m88i(ActivityiPrintConnect.TAG, "epsWrapperGetConnectStrings ret = " + i3 + " retry = " + i2);
+                                EPLog.i(TAG, "epsWrapperGetConnectStrings ret = " + i3 + " retry = " + i2);
                                 Thread.sleep(2000);
                             } else {
                                 throw new InterruptedException();
@@ -290,27 +295,27 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
                     }
                 }
                 if (i3 == 0) {
-                    EPLog.m86d(ActivityiPrintConnect.TAG, "epsWrapperGetConnectStrings ssid = " + ActivityiPrintConnect.this.settingsRealAp.ssid + " printerId = " + ActivityiPrintConnect.this.settingsRealAp.printerId);
-                    ActivityiPrintConnect.mEscprLib.epsWrapperStartWifiDirect(ActivityiPrintConnect.this.settingsRealAp.printerIp.toCharArray());
-                    synchronized (ActivityiPrintConnect.this.waitRealAp) {
-                        ActivityiPrintConnect.this.registBroadcastReciever();
-                        ActivityiPrintConnect.mWifiManager.startScan();
+                    EPLog.d(TAG, "epsWrapperGetConnectStrings ssid = " + settingsRealAp.ssid + " printerId = " + settingsRealAp.printerId);
+                    mEscprLib.epsWrapperStartWifiDirect(settingsRealAp.printerIp.toCharArray());
+                    synchronized (waitRealAp) {
+                        registBroadcastReciever();
+                        mWifiManager.startScan();
                         long currentTimeMillis = System.currentTimeMillis();
-                        ActivityiPrintConnect.this.waitRealAp.wait(120000);
+                        waitRealAp.wait(120000);
                         if (System.currentTimeMillis() - currentTimeMillis >= 120000) {
-                            EPLog.m87e(ActivityiPrintConnect.TAG, "Find RealAp Timepout");
+                            EPLog.e(TAG, "Find RealAp Timepout");
                             i3 = -1;
                         }
                     }
                 } else {
-                    EPLog.m87e(ActivityiPrintConnect.TAG, "epsWrapperGetConnectStrings ret = " + i3);
+                    EPLog.e(TAG, "epsWrapperGetConnectStrings ret = " + i3);
                     ActivityiPrintConnect activityiPrintConnect = ActivityiPrintConnect.this;
-                    activityiPrintConnect.lastErrorStrings = "epsWrapperGetConnectStrings ret = " + i3;
+                    lastErrorStrings = "epsWrapperGetConnectStrings ret = " + i3;
                 }
-                ActivityiPrintConnect.this.wiFiUtils.removeSimpleAP(ActivityiPrintConnect.this.wiFiUtils.getNetworkId(ActivityiPrintConnect.this.settingsTempAp.ssid));
+                wiFiUtils.removeSimpleAP(wiFiUtils.getNetworkId(settingsTempAp.ssid));
                 i = i3;
-                ActivityiPrintConnect.this.unRegistBroadcastReciever();
-                ActivityiPrintConnect.mEscprLib.epsWrapperReleaseDriver();
+                unRegistBroadcastReciever();
+                mEscprLib.epsWrapperReleaseDriver();
                 if (i == 0) {
                     z = true;
                 }
@@ -318,29 +323,29 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
             }
 
             protected void onPostExecute(Boolean bool) {
-                ActivityiPrintConnect.this.getWindow().clearFlags(128);
+                getWindow().clearFlags(128);
                 if (bool.booleanValue()) {
-                    Status unused = ActivityiPrintConnect.this.status = Status.CONNECTING_REALAP;
-                    Intent intent = new Intent(ActivityiPrintConnect.this, ActivityConnectSimpleAP.class);
-                    intent.putExtra(ActivityConnectBase.APNAME, ActivityiPrintConnect.this.settingsRealAp.ssid);
-                    intent.putExtra(ActivityConnectBase.APPASS, ActivityiPrintConnect.this.settingsRealAp.password);
+                    Status unused = status = Status.CONNECTING_REALAP;
+                    Intent intent = new Intent(this, ActivityConnectSimpleAP.class);
+                    intent.putExtra(ActivityConnectBase.APNAME, settingsRealAp.ssid);
+                    intent.putExtra(ActivityConnectBase.APPASS, settingsRealAp.password);
                     intent.putExtra(ActivityConnectBase.CREATE, true);
                     intent.putExtra(ActivityConnectBase.SHOWERROR, false);
                     intent.putExtra(ActivityConnectBase.SHOWTIP, false);
                     intent.putExtra(ActivityConnectBase.TIMEOUT, 60);
                     intent.putExtra(ActivityConnectBase.NEEDINFO, true);
-                    ActivityiPrintConnect.this.startActivityForResult(intent, 2);
+                    startActivityForResult(intent, 2);
                     return;
                 }
-                Status unused2 = ActivityiPrintConnect.this.status = Status.CONNECT_ERROR;
-                ActivityiPrintConnect.this.onConnectError();
+                Status unused2 = status = Status.CONNECT_ERROR;
+                onConnectError();
             }
 
             protected void onCancelled() {
-                EPLog.m86d(ActivityiPrintConnect.TAG, "taskGetConnectStrings Canceled");
-                Status unused = ActivityiPrintConnect.this.status = Status.CONNECT_ERROR;
-                ActivityiPrintConnect.this.getWindow().clearFlags(128);
-                ActivityiPrintConnect.this.wiFiUtils.removeSimpleAP(ActivityiPrintConnect.this.wiFiUtils.getNetworkId(ActivityiPrintConnect.this.settingsTempAp.ssid));
+                EPLog.d(TAG, "taskGetConnectStrings Canceled");
+                Status unused = status = Status.CONNECT_ERROR;
+                getWindow().clearFlags(128);
+                wiFiUtils.removeSimpleAP(wiFiUtils.getNetworkId(settingsTempAp.ssid));
                 super.onCancelled();
             }
         }.execute(new Void[0]);
@@ -354,7 +359,7 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         }
         String macAddress = mWifiManager.getConnectionInfo().getMacAddress();
         if (macAddress != null) {
-            EPLog.m86d(TAG, "getEngineId macAdress = " + macAddress);
+            EPLog.d(TAG, "getEngineId macAdress = " + macAddress);
             String[] split = macAddress.split(":", 6);
             if (split.length == 6) {
                 for (int i2 = 0; i2 < 6; i2++) {
@@ -376,9 +381,9 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
         }
         if (arrayList.size() != 0) {
             for (ScanResult scanResult : arrayList) {
-                if (this.settingsRealAp.ssid.equals(WiFiUtils.removeQuotationsInSSID(scanResult.SSID))) {
-                    EPLog.m86d(TAG, "Found AP");
-                    synchronized (this.waitRealAp) {
+                if (settingsRealAp.ssid.equals(WiFiUtils.removeQuotationsInSSID(scanResult.SSID))) {
+                    EPLog.d(TAG, "Found AP");
+                    synchronized (waitRealAp) {
                         waitRealAp.notify();
                     }
                     return;
@@ -394,8 +399,8 @@ public class ActivityiPrintConnect extends ActivityWiFiDirectBase {
 
         public void onReceive(Context context, Intent intent) {
             if (intent.getAction().equals("android.net.wifi.SCAN_RESULTS")) {
-                EPLog.m86d(ActivityiPrintConnect.TAG, "Scan Results Available");
-                ActivityiPrintConnect.this.onScanResultAvailable();
+                EPLog.d(TAG, "Scan Results Available");
+                onScanResultAvailable();
             }
         }
     }

app/src/main/java/com/epson/mobilephone/common/wifidirect/ActivityiPrintConnectStart.java

@@ -11,8 +11,6 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 
-import com.epson.mobilephone.common.wifidirect.escprLib;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -86,7 +84,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
 
     private void onScanResultAvailable() {
         if (this.bFirstScanResultAvailable) {
-            EPLog.m90w(TAG, "First onScanResultAvailable, ignore this");
+            EPLog.w(TAG, "First onScanResultAvailable, ignore this");
             bFirstScanResultAvailable = false;
         } else {
             List<ScanResult> arrayList = new ArrayList<>();
@@ -98,7 +96,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
             if (arrayList.size() != 0) {
                 for (ScanResult scanResult : arrayList) {
                     if (this.settingsTempAp.ssid.equals(WiFiUtils.removeQuotationsInSSID(scanResult.SSID))) {
-                        EPLog.m86d(TAG, "Found TempAP");
+                        EPLog.d(TAG, "Found TempAP");
                         btnNext.performClick();
                         return;
                     }
@@ -114,7 +112,7 @@ public class ActivityiPrintConnectStart extends ActivityWiFiDirectBase {
 
         public void onReceive(Context context, Intent intent) {
             if (intent.getAction().equals("android.net.wifi.SCAN_RESULTS")) {
-                EPLog.m86d(ActivityiPrintConnectStart.TAG, "Scan Results Available");
+                EPLog.d(ActivityiPrintConnectStart.TAG, "Scan Results Available");
                 ActivityiPrintConnectStart.this.onScanResultAvailable();
             }
         }

app/src/main/java/com/epson/mobilephone/common/wifidirect/DialogProgressWiFiDirect.java

@@ -74,7 +74,7 @@ public class DialogProgressWiFiDirect extends DialogFragment {
         String string4 = getArguments().getString(TAG_NEUTRAL_MESSAGE);
         String string5 = getArguments().getString(TAG_NEGATIVE_MESSAGE);
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
-        View inflate = getActivity().getLayoutInflater().inflate(C1113R.layout.dialog_progress_wifi_direct, (ViewGroup) null);
+        View inflate = getActivity().getLayoutInflater().inflate(R.layout.dialog_progress_wifi_direct, (ViewGroup) null);
         try {
             mActivity = (DialogButtonClick) getActivity();
         } catch (ClassCastException unused) {
@@ -113,22 +113,22 @@ public class DialogProgressWiFiDirect extends DialogFragment {
                 }
             });
         }
-        ProgressBar progressBar = (ProgressBar) inflate.findViewById(C1113R.C1115id.dialog_progress_id);
+        ProgressBar progressBar = (ProgressBar) inflate.findViewById(R.C1115id.dialog_progress_id);
         if (i == 1) {
             RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) progressBar.getLayoutParams();
             layoutParams.addRule(14);
             progressBar.setLayoutParams(layoutParams);
-            TextView textView = (TextView) inflate.findViewById(C1113R.C1115id.dialog_progress_text_bottom);
+            TextView textView = (TextView) inflate.findViewById(R.C1115id.dialog_progress_text_bottom);
             textView.setText(string);
             progressBar.setVisibility(View.VISIBLE);
             textView.setVisibility(View.VISIBLE);
         } else if (i == 0) {
-            TextView textView2 = (TextView) inflate.findViewById(C1113R.C1115id.dialog_progress_text_right);
+            TextView textView2 = (TextView) inflate.findViewById(R.C1115id.dialog_progress_text_right);
             textView2.setText(string);
             progressBar.setVisibility(View.VISIBLE);
             textView2.setVisibility(View.VISIBLE);
         } else {
-            TextView textView3 = (TextView) inflate.findViewById(C1113R.C1115id.dialog_progress_text_right);
+            TextView textView3 = (TextView) inflate.findViewById(R.C1115id.dialog_progress_text_right);
             textView3.setText(string);
             textView3.setVisibility(View.VISIBLE);
         }

app/src/main/java/com/epson/mobilephone/common/wifidirect/EPLog.java

@@ -22,36 +22,31 @@ public class EPLog {
         return isDebuggable;
     }
 
-    /* renamed from: d */
-    public static final void m86d(String str, String str2) {
+    public static final void d(String str, String str2) {
         if (isDebuggable) {
             Log.d(str, str2);
         }
     }
 
-    /* renamed from: e */
-    public static final void m87e(String str, String str2) {
+    public static final void e(String str, String str2) {
         if (isDebuggable) {
             Log.e(str, str2);
         }
     }
 
-    /* renamed from: i */
-    public static final void m88i(String str, String str2) {
+    public static final void i(String str, String str2) {
         if (isDebuggable) {
             Log.i(str, str2);
         }
     }
 
-    /* renamed from: v */
-    public static final void m89v(String str, String str2) {
+    public static final void v(String str, String str2) {
         if (isDebuggable) {
             Log.v(str, str2);
         }
     }
 
-    /* renamed from: w */
-    public static final void m90w(String str, String str2) {
+    public static final void w(String str, String str2) {
         if (isDebuggable) {
             Log.w(str, str2);
         }

app/src/main/java/com/epson/mobilephone/common/wifidirect/FindPrinterTask.java

@@ -31,7 +31,7 @@ class FindPrinterTask extends AsyncTask<Void, Void, Boolean> {
         if (epsWrapperInitDriver != -1050 && epsWrapperInitDriver != 0) {
             return true;
         }
-        EPLog.m86d(TAG, "epsWrapperFindPrinter start");
+        EPLog.d(TAG, "epsWrapperFindPrinter start");
         int epsWrapperFindPrinter = mEscprLib.epsWrapperFindPrinter(192, timeout);
         if (epsWrapperFindPrinter == 0 || epsWrapperFindPrinter == 42) {
             z = false;
@@ -42,7 +42,7 @@ class FindPrinterTask extends AsyncTask<Void, Void, Boolean> {
 
     protected void onPostExecute(Boolean bool) {
         if (bool.booleanValue() || !this.canceled) {
-            EPLog.m86d(TAG, "epsWrapperFindPrinter = EPS_ERR_PRINTER_NOT_FOUND");
+            EPLog.d(TAG, "epsWrapperFindPrinter = EPS_ERR_PRINTER_NOT_FOUND");
             handler.sendEmptyMessage(this.idNotFound);
         }
     }

app/src/main/java/com/epson/mobilephone/common/wifidirect/ManageDefaultNetwork.java

@@ -61,7 +61,7 @@ public class ManageDefaultNetwork {
         }
         if (Build.VERSION.SDK_INT < 23 || (activeNetwork = connectivityManager.getActiveNetwork()) == null || (networkCapabilities = connectivityManager.getNetworkCapabilities(activeNetwork)) == null || !networkCapabilities.hasTransport(0)) {
             synchronized (this.lock) {
-                EPLog.m86d(TAG, "Checking whether isOnline : " + str);
+                EPLog.d(TAG, "Checking whether isOnline : " + str);
                 new Thread(new Runnable() {
                     public void run() {
                         try {
@@ -72,13 +72,13 @@ public class ManageDefaultNetwork {
                             httpURLConnection.setConnectTimeout(5000);
                             httpURLConnection.connect();
                             int responseCode = httpURLConnection.getResponseCode();
-                            EPLog.m86d(ManageDefaultNetwork.TAG, "getResponseCode() : " + responseCode);
+                            EPLog.d(ManageDefaultNetwork.TAG, "getResponseCode() : " + responseCode);
                             httpURLConnection.disconnect();
                             if (responseCode > 0) {
                                 ManageDefaultNetwork.this.canConnected = true;
                             }
                         } catch (IOException unused) {
-                            EPLog.m87e(ManageDefaultNetwork.TAG, "HttpURLConnection failed");
+                            EPLog.e(ManageDefaultNetwork.TAG, "HttpURLConnection failed");
                             ManageDefaultNetwork.this.canConnected = false;
                         }
                         synchronized (ManageDefaultNetwork.this.lock) {
@@ -99,7 +99,7 @@ public class ManageDefaultNetwork {
             }
             return z;
         }
-        EPLog.m86d(TAG, "WiFi connected, But default network is cellular. " + str + "is offline.");
+        EPLog.d(TAG, "WiFi connected, But default network is cellular. " + str + "is offline.");
         return false;
     }
 
@@ -107,29 +107,29 @@ public class ManageDefaultNetwork {
         if (Build.VERSION.SDK_INT >= 21) {
             String curSSID = WiFiUtils.getInstance(mContext).getCurSSID();
             if (curSSID == null) {
-                EPLog.m86d(TAG, "Not connected");
+                EPLog.d(TAG, "Not connected");
                 return;
             }
             if (!curSSID.equals(this.checkedSSID)) {
                 checkedSSID = curSSID;
                 isOnline = checkCurSSIDisOnline(curSSID);
                 if (this.isOnline) {
-                    EPLog.m86d(TAG, curSSID + "is online.");
+                    EPLog.d(TAG, curSSID + "is online.");
                     return;
                 }
             } else if (this.isOnline) {
-                EPLog.m86d(TAG, curSSID + "is online.");
+                EPLog.d(TAG, curSSID + "is online.");
                 return;
             }
             if (Build.VERSION.SDK_INT >= 23) {
                 if (this.connectivityManager.getBoundNetworkForProcess() != null) {
-                    EPLog.m86d(TAG, "Already bindProcessToNetwork called");
+                    EPLog.d(TAG, "Already bindProcessToNetwork called");
                     return;
                 }
             } else if (Build.VERSION.SDK_INT >= 21) {
                 ConnectivityManager connectivityManager2 = connectivityManager;
                 if (ConnectivityManager.getProcessDefaultNetwork() != null) {
-                    EPLog.m86d(TAG, "Already setProcessDefaultNetwork called");
+                    EPLog.d(TAG, "Already setProcessDefaultNetwork called");
                     return;
                 }
             } else {
@@ -170,13 +170,13 @@ public class ManageDefaultNetwork {
     public synchronized void resetDefaultNetwork() {
         if (Build.VERSION.SDK_INT >= 23) {
             if (this.connectivityManager.getBoundNetworkForProcess() != null) {
-                EPLog.m86d(TAG, "resetProcessDefaultNetwork");
+                EPLog.d(TAG, "resetProcessDefaultNetwork");
                 connectivityManager.bindProcessToNetwork((Network) null);
             }
         } else if (Build.VERSION.SDK_INT >= 21) {
             ConnectivityManager connectivityManager2 = connectivityManager;
             if (ConnectivityManager.getProcessDefaultNetwork() != null) {
-                EPLog.m86d(TAG, "resetProcessDefaultNetwork");
+                EPLog.d(TAG, "resetProcessDefaultNetwork");
                 ConnectivityManager connectivityManager3 = connectivityManager;
                 ConnectivityManager.setProcessDefaultNetwork((Network) null);
             }
@@ -200,23 +200,23 @@ public class ManageDefaultNetwork {
         }
 
         public void onAvailable(Network network) {
-            EPLog.m86d(ManageDefaultNetwork.TAG, "Call onAvailable");
+            EPLog.d(ManageDefaultNetwork.TAG, "Call onAvailable");
             super.onAvailable(network);
             if (Build.VERSION.SDK_INT < 23) {
                 ConnectivityManager unused = ManageDefaultNetwork.this.connectivityManager;
                 if (ConnectivityManager.getProcessDefaultNetwork() == null) {
                     ConnectivityManager unused2 = ManageDefaultNetwork.this.connectivityManager;
                     if (ConnectivityManager.setProcessDefaultNetwork(network)) {
-                        EPLog.m86d(ManageDefaultNetwork.TAG, "setProcessDefaultNetwork");
+                        EPLog.d(ManageDefaultNetwork.TAG, "setProcessDefaultNetwork");
                     }
                 }
             } else if (ManageDefaultNetwork.this.connectivityManager.getBoundNetworkForProcess() == null && ManageDefaultNetwork.this.connectivityManager.bindProcessToNetwork(network)) {
-                EPLog.m86d(ManageDefaultNetwork.TAG, "bindProcessToNetwork");
+                EPLog.d(ManageDefaultNetwork.TAG, "bindProcessToNetwork");
             }
         }
 
         public void onLost(Network network) {
-            EPLog.m86d(ManageDefaultNetwork.TAG, "Call onLost");
+            EPLog.d(ManageDefaultNetwork.TAG, "Call onLost");
             super.onLost(network);
             ManageDefaultNetwork.this.resetDefaultNetwork();
         }

app/src/main/java/com/epson/mobilephone/common/wifidirect/NfcTagUtils.java

@@ -352,12 +352,12 @@ public class NfcTagUtils {
     }
 
     public static boolean isExistSimpleApDisabled(Context context, String str) {
-        EPLog.m86d(TAG, "isExistSimpleApDisabled()");
+        EPLog.d(TAG, "isExistSimpleApDisabled()");
         return WiFiUtils.getInstance(context).getExistSimpleApDisabled(str) != -1;
     }
 
     public static boolean isExistSimpleApNormal(Context context, String str) {
-        EPLog.m86d(TAG, "isExistSimpleApNormal()");
+        EPLog.d(TAG, "isExistSimpleApNormal()");
         return WiFiUtils.getInstance(context).getNetworkId(str) != -1;
     }
 }

app/src/main/java/com/epson/mobilephone/common/wifidirect/SearchWiFiDirectPrinterTask.java

@@ -16,10 +16,6 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.SystemClock;
 
-import com.epson.mobilephone.common.wifidirect.SimpleAPInfoDB;
-import com.epson.mobilephone.common.wifidirect.WiFiControl;
-import com.epson.mobilephone.common.wifidirect.WifiP2pUtils;
-
 import epson.print.CommonDefine;
 
 import java.util.ArrayList;
@@ -68,29 +64,29 @@ public class SearchWiFiDirectPrinterTask {
                 }
                 SearchWiFiDirectPrinterTask.mWiFiP2PManager.discoverPeers(SearchWiFiDirectPrinterTask.this.p2pChannnel, new WifiP2pManager.ActionListener() {
                     public void onSuccess() {
-                        EPLog.m86d(SearchWiFiDirectPrinterTask.TAG, "discoverPeers Start");
+                        EPLog.d(SearchWiFiDirectPrinterTask.TAG, "discoverPeers Start");
                         SearchWiFiDirectPrinterTask.this.serarchingStatus |= 2;
                     }
 
                     public void onFailure(int i) {
                         switch (i) {
                             case 0:
-                                EPLog.m90w(SearchWiFiDirectPrinterTask.TAG, "P2P_Operation ERROR");
+                                EPLog.w(SearchWiFiDirectPrinterTask.TAG, "P2P_Operation ERROR");
                                 break;
                             case 1:
-                                EPLog.m90w(SearchWiFiDirectPrinterTask.TAG, "P2P_Operation P2P_UNSUPPORTED");
+                                EPLog.w(SearchWiFiDirectPrinterTask.TAG, "P2P_Operation P2P_UNSUPPORTED");
                                 break;
                             case 2:
-                                EPLog.m90w(SearchWiFiDirectPrinterTask.TAG, "P2P_Operation BUSY");
+                                EPLog.w(SearchWiFiDirectPrinterTask.TAG, "P2P_Operation BUSY");
                                 if (!SearchWiFiDirectPrinterTask.this.bDisConnectP2P && WifiP2pUtils.getInstance(SearchWiFiDirectPrinterTask.this.context).isConnectedWiFiP2P()) {
-                                    EPLog.m90w(SearchWiFiDirectPrinterTask.TAG, "Disconnect P2P and And Retry");
+                                    EPLog.w(SearchWiFiDirectPrinterTask.TAG, "Disconnect P2P and And Retry");
                                     WifiP2pUtils.getInstance(SearchWiFiDirectPrinterTask.this.context).disconnect();
                                     SearchWiFiDirectPrinterTask.this.bDisConnectP2P = true;
                                     SearchWiFiDirectPrinterTask.this.searchHandler.sendEmptyMessageDelayed(0, 1000);
                                     return;
                                 }
                             default:
-                                EPLog.m90w(SearchWiFiDirectPrinterTask.TAG, "P2P_Operation Fail");
+                                EPLog.w(SearchWiFiDirectPrinterTask.TAG, "P2P_Operation Fail");
                                 break;
                         }
                         if (SearchWiFiDirectPrinterTask.this.serarchingStatus == 0) {
@@ -126,10 +122,10 @@ public class SearchWiFiDirectPrinterTask {
 
     private boolean start(int i, Handler handler, int i2, int i3) {
         if (this.serarchingStatus != 0) {
-            EPLog.m86d(TAG, "Already started");
+            EPLog.d(TAG, "Already started");
             return true;
         }
-        EPLog.m86d(TAG, "start()");
+        EPLog.d(TAG, "start()");
         mHandler = handler;
         idResult = i2;
         timeout = i3;
@@ -156,14 +152,14 @@ public class SearchWiFiDirectPrinterTask {
     }
 
     public void interrupt() {
-        EPLog.m86d(TAG, "interrupt()");
+        EPLog.d(TAG, "interrupt()");
         Handler handler = searchHandler;
         if (handler != null) {
             handler.removeMessages(0);
         }
         scannigObserver.interrunpt();
         if (!(mWiFiP2PManager == null || p2pChannnel == null)) {
-            EPLog.m86d(TAG, "stopPeerDiscovery");
+            EPLog.d(TAG, "stopPeerDiscovery");
             mWiFiP2PManager.stopPeerDiscovery(this.p2pChannnel, (WifiP2pManager.ActionListener) null);
         }
         unRegisterReceiverSimpleAp();
@@ -204,13 +200,13 @@ public class SearchWiFiDirectPrinterTask {
         } else {
             long j = lastScan;
             if (j != 0 && elapsedRealtime - j < 30000) {
-                EPLog.m88i(TAG, "onScanResultAvailable, use this Result");
+                EPLog.i(TAG, "onScanResultAvailable, use this Result");
                 z = true;
             } else if (this.retryScaning > 0) {
-                EPLog.m88i(TAG, "onScanResultAvailable, use this Retry Result");
+                EPLog.i(TAG, "onScanResultAvailable, use this Retry Result");
                 z = true;
             } else {
-                EPLog.m90w(TAG, "onScanResultAvailable, ignore this Result");
+                EPLog.w(TAG, "onScanResultAvailable, ignore this Result");
                 z = false;
             }
         }
@@ -226,7 +222,7 @@ public class SearchWiFiDirectPrinterTask {
                     if (this.retryScaning < 3 && Build.VERSION.SDK_INT >= 17) {
                         long j2 = elapsedRealtime - (scanResult.timestamp / 1000);
                         if (j2 >= 30000) {
-                            EPLog.m90w(TAG, "onScanResultAvailable, Ignore for timeout : SSID =" + scanResult.SSID + " past " + j2 + " msec");
+                            EPLog.w(TAG, "onScanResultAvailable, Ignore for timeout : SSID =" + scanResult.SSID + " past " + j2 + " msec");
                         }
                     }
                     String removeQuotationsInSSID = WiFiUtils.removeQuotationsInSSID(scanResult.SSID);
@@ -244,11 +240,11 @@ public class SearchWiFiDirectPrinterTask {
         lastScan = elapsedRealtime;
         retryScaning++;
         if (this.retryScaning < 5) {
-            EPLog.m88i(TAG, "Retry startScan()");
+            EPLog.i(TAG, "Retry startScan()");
             mWifiManager.startScan();
             return;
         }
-        EPLog.m88i(TAG, "MAX_RETRY_SCANING");
+        EPLog.i(TAG, "MAX_RETRY_SCANING");
         unRegisterReceiverSimpleAp();
         serarchingStatus &= -2;
         if (this.serarchingStatus == 0) {
@@ -279,7 +275,7 @@ public class SearchWiFiDirectPrinterTask {
             } else {
                 bundle.putString(MACADDR_INFRA, WiFiControl.p2pAddr2PtrAddr(str2, simpleAPInfoDB.ssid));
             }
-            EPLog.m86d(TAG, "onFindPrinterResult() data = " + bundle.getString("ssid") + CommonDefine.SLASH + bundle.getString("name") + CommonDefine.SLASH + bundle.getString(MACADDR_INFRA) + CommonDefine.SLASH + bundle.getString(MACADDR_P2P));
+            EPLog.d(TAG, "onFindPrinterResult() data = " + bundle.getString("ssid") + CommonDefine.SLASH + bundle.getString("name") + CommonDefine.SLASH + bundle.getString(MACADDR_INFRA) + CommonDefine.SLASH + bundle.getString(MACADDR_P2P));
             obtain.setData(bundle);
             mHandler.sendMessage(obtain);
         }
@@ -291,7 +287,7 @@ public class SearchWiFiDirectPrinterTask {
 
         public void onReceive(Context context, Intent intent) {
             if (intent.getAction().equals("android.net.wifi.SCAN_RESULTS")) {
-                EPLog.m86d(SearchWiFiDirectPrinterTask.TAG, "Scan Results Available");
+                EPLog.d(SearchWiFiDirectPrinterTask.TAG, "Scan Results Available");
                 SearchWiFiDirectPrinterTask.this.onScanResultAvailable();
             }
         }
@@ -306,21 +302,21 @@ public class SearchWiFiDirectPrinterTask {
             if (intent.getAction().equals("android.net.wifi.p2p.PEERS_CHANGED") && (wifiP2pDeviceList = (WifiP2pDeviceList) intent.getParcelableExtra("wifiP2pDeviceList")) != null) {
                 Collection<WifiP2pDevice> deviceList = wifiP2pDeviceList.getDeviceList();
                 if (deviceList.size() == 0) {
-                    EPLog.m86d(SearchWiFiDirectPrinterTask.TAG, "No devices found");
+                    EPLog.d(SearchWiFiDirectPrinterTask.TAG, "No devices found");
                     return;
                 }
                 for (WifiP2pDevice next : deviceList) {
                     if (next.deviceName == null || next.deviceName.trim().isEmpty()) {
-                        EPLog.m90w(SearchWiFiDirectPrinterTask.TAG, "deviceName is empty" + next.deviceAddress);
+                        EPLog.w(SearchWiFiDirectPrinterTask.TAG, "deviceName is empty" + next.deviceAddress);
                     } else if (!WifiP2pUtils.PrimaryDeviceType.isPrinter(next.primaryDeviceType)) {
-                        EPLog.m88i(SearchWiFiDirectPrinterTask.TAG, "Category Not Printer " + next.deviceName);
+                        EPLog.i(SearchWiFiDirectPrinterTask.TAG, "Category Not Printer " + next.deviceName);
                     } else if (MacAddrFilter.getInstance(context).isExcludedMacAddress(WiFiControl.p2pAddr2PtrAddr(next.deviceAddress, next.deviceName))) {
-                        EPLog.m88i(SearchWiFiDirectPrinterTask.TAG, "Excluded Printer " + next.deviceName);
+                        EPLog.i(SearchWiFiDirectPrinterTask.TAG, "Excluded Printer " + next.deviceName);
                     } else {
                         SearchWiFiDirectPrinterTask.this.onFindPrinterResult(WiFiControl.addSSIDPrefix(next.deviceName, WiFiControl.ConnectType.WiFiP2P), -1, next.deviceAddress);
                     }
                 }
-                EPLog.m88i(SearchWiFiDirectPrinterTask.TAG, "Continue discover Peers()");
+                EPLog.i(SearchWiFiDirectPrinterTask.TAG, "Continue discover Peers()");
             }
         }
     }
@@ -333,7 +329,7 @@ public class SearchWiFiDirectPrinterTask {
 
         private void start(final int i) {
             interrunpt();
-            EPLog.m86d(SearchWiFiDirectPrinterTask.TAG, "Start ScanningObserver");
+            EPLog.d(SearchWiFiDirectPrinterTask.TAG, "Start ScanningObserver");
             observerTask = new AsyncTask<Void, Void, Void>() {
                 protected Void doInBackground(Void... voidArr) {
                     int i = 0;
@@ -353,7 +349,7 @@ public class SearchWiFiDirectPrinterTask {
                 }
 
                 protected void onPostExecute(Void voidR) {
-                    EPLog.m88i(SearchWiFiDirectPrinterTask.TAG, "Timeout ScanningObserver");
+                    EPLog.i(SearchWiFiDirectPrinterTask.TAG, "Timeout ScanningObserver");
                     SearchWiFiDirectPrinterTask.mHandler.sendEmptyMessage(SearchWiFiDirectPrinterTask.this.idResult);
                     SearchWiFiDirectPrinterTask.this.interrupt();
                 }
@@ -363,7 +359,7 @@ public class SearchWiFiDirectPrinterTask {
         private void interrunpt() {
             AsyncTask<Void, Void, Void> asyncTask = observerTask;
             if (asyncTask != null && asyncTask.getStatus() == AsyncTask.Status.RUNNING && !this.observerTask.isCancelled()) {
-                EPLog.m86d(SearchWiFiDirectPrinterTask.TAG, "Stop ScanningObserver");
+                EPLog.d(SearchWiFiDirectPrinterTask.TAG, "Stop ScanningObserver");
                 observerTask.cancel(false);
             }
         }

app/src/main/java/com/epson/mobilephone/common/wifidirect/SimpleAPInfoDB.java

@@ -30,7 +30,7 @@ public class SimpleAPInfoDB extends SQLiteOpenHelper {
         if (query == null || query.getCount() <= 0) {
             simpleAPInfo = null;
         } else {
-            EPLog.m88i(TAG, "getSimpleAPInfoDB found info.");
+            EPLog.i(TAG, "getSimpleAPInfoDB found info.");
             int columnIndex = query.getColumnIndex("ssid");
             int columnIndex2 = query.getColumnIndex(COLUMN_DEVICEID);
             query.moveToFirst();
@@ -44,7 +44,7 @@ public class SimpleAPInfoDB extends SQLiteOpenHelper {
     }
 
     public static boolean updateSimpleAPInfoDB(Context context, SimpleAPInfo simpleAPInfo) {
-        EPLog.m88i(TAG, "updateSimpleAPInfoDB ssid = " + simpleAPInfo.ssid);
+        EPLog.i(TAG, "updateSimpleAPInfoDB ssid = " + simpleAPInfo.ssid);
         SQLiteDatabase writableDatabase = new SimpleAPInfoDB(context).getWritableDatabase();
         ContentValues contentValues = new ContentValues();
         contentValues.put("ssid", WiFiUtils.removeQuotationsInSSID(simpleAPInfo.ssid));

app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiControl.java

@@ -2,7 +2,6 @@ package com.epson.mobilephone.common.wifidirect;
 
 import android.content.Context;
 
-import com.epson.mobilephone.common.wifidirect.WifiP2pUtils;
 import com.google.common.primitives.UnsignedBytes;
 
 import java.util.regex.Pattern;
@@ -84,7 +83,7 @@ public class WiFiControl {
                 if (!removeSSIDPrefix.equals(WiFiUtils.getInstance(mAppContext).getCurSSID())) {
                     return true;
                 }
-                EPLog.m90w(TAG, "Already connected : SimpleAP");
+                EPLog.w(TAG, "Already connected : SimpleAP");
                 ManageDefaultNetwork.getInstance(mAppContext).setDefaultNetworkSimpleAp();
                 return false;
             case WiFiP2P:
@@ -92,11 +91,11 @@ public class WiFiControl {
                 if (connectionInfo == null || !removeSSIDPrefix.equals(connectionInfo.printerName)) {
                     return true;
                 }
-                EPLog.m90w(TAG, "Already connected : P2P");
+                EPLog.w(TAG, "Already connected : P2P");
                 ManageDefaultNetwork.getInstance(mAppContext).resetDefaultNetwork();
                 return false;
             default:
-                EPLog.m90w(TAG, "Unknown Type");
+                EPLog.w(TAG, "Unknown Type");
                 return true;
         }
     }
@@ -164,7 +163,7 @@ public class WiFiControl {
             case WiFiP2P:
                 return PREFIX_WIFIP2P + str;
             default:
-                EPLog.m90w(TAG, "Unknown Type");
+                EPLog.w(TAG, "Unknown Type");
                 return str;
         }
     }

app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiDirectManager.java

@@ -7,9 +7,6 @@ import android.content.SharedPreferences;
 import android.net.wifi.WifiManager;
 import android.os.Handler;
 
-import com.epson.mobilephone.common.wifidirect.SimpleAPInfoDB;
-import com.epson.mobilephone.common.wifidirect.WiFiControl;
-
 import epson.common.Constants;
 
 public class WiFiDirectManager {
@@ -90,7 +87,7 @@ public class WiFiDirectManager {
     public static boolean connect(Activity activity, String str, int i) {
         Intent intent;
         checkDebuggable(activity);
-        EPLog.m86d(TAG, "connect()");
+        EPLog.d(TAG, "connect()");
         String removeSSIDPrefix = WiFiControl.removeSSIDPrefix(str);
         if (C11201.f154x793e0ec3[WiFiControl.getSSIDType(str).ordinal()] != 1) {
             intent = new Intent(activity, ActivityConnectSimpleAP.class);
@@ -145,10 +142,10 @@ public class WiFiDirectManager {
     public static boolean reconnect(Activity activity, String str, int i) {
         Intent intent;
         checkDebuggable(activity);
-        EPLog.m86d(TAG, "reconnect()");
+        EPLog.d(TAG, "reconnect()");
         String connectInfo = getConnectInfo(activity, str);
         if (connectInfo == null) {
-            EPLog.m86d(TAG, "getConnectInfo == null");
+            EPLog.d(TAG, "getConnectInfo == null");
             return false;
         }
         String removeSSIDPrefix = WiFiControl.removeSSIDPrefix(connectInfo);
@@ -183,7 +180,7 @@ public class WiFiDirectManager {
         if (!removeSSIDPrefix.equals(instance.getCurSSID()) || (networkId = instance.getNetworkId(removeSSIDPrefix)) == -1) {
             return false;
         }
-        EPLog.m86d(TAG, "disconnect() deviceType = " + str + " printerIp = " + str2);
+        EPLog.d(TAG, "disconnect() deviceType = " + str + " printerIp = " + str2);
         WiFiUtils.setAutoGoTimeout(str2, 120);
         if (bSimpleAPCreated) {
             bSimpleAPCreated = false;
@@ -207,7 +204,7 @@ public class WiFiDirectManager {
     public static String getConnectInfo(Context context, String str) {
         SharedPreferences sharedPreferences = context.getSharedPreferences(Constants.PREFS_WIFI, 0);
         if (str == null || str.length() == 0) {
-            EPLog.m87e(TAG, "getConnectInfo Ilegal param");
+            EPLog.e(TAG, "getConnectInfo Ilegal param");
             return null;
         }
         String string = sharedPreferences.getString(Constants.PREFS_WIFI_AUTOCONNECT_SSID + str, (String) null);
@@ -226,13 +223,13 @@ public class WiFiDirectManager {
 
     public static void setConnectInfo(Context context, String str, String str2, String str3) {
         if (str == null) {
-            EPLog.m87e(TAG, "SSID Ilegal param");
+            EPLog.e(TAG, "SSID Ilegal param");
             return;
         }
         String rebuildSSID = WiFiControl.rebuildSSID(str);
-        EPLog.m86d(TAG, "setConnectInfo :" + rebuildSSID);
+        EPLog.d(TAG, "setConnectInfo :" + rebuildSSID);
         if (str2 == null || str2.length() == 0) {
-            EPLog.m87e(TAG, "setConnectInfo Ilegal param");
+            EPLog.e(TAG, "setConnectInfo Ilegal param");
             return;
         }
         SharedPreferences.Editor edit = context.getSharedPreferences(Constants.PREFS_WIFI, 0).edit();
@@ -245,9 +242,9 @@ public class WiFiDirectManager {
     }
 
     public static void resetConnectInfo(Context context, String str) {
-        EPLog.m86d(TAG, "resetConnectInfo :" + str);
+        EPLog.d(TAG, "resetConnectInfo :" + str);
         if (str == null || str.length() == 0) {
-            EPLog.m87e(TAG, "resetConnectInfo Ilegal param");
+            EPLog.e(TAG, "resetConnectInfo Ilegal param");
             return;
         }
         SharedPreferences.Editor edit = context.getSharedPreferences(Constants.PREFS_WIFI, 0).edit();
@@ -257,7 +254,7 @@ public class WiFiDirectManager {
 
     public static boolean connectSimpleAP(Activity activity, String str, String str2, int i) {
         checkDebuggable(activity);
-        EPLog.m86d(TAG, "connectSimpleAP()");
+        EPLog.d(TAG, "connectSimpleAP()");
         String removeSSIDPrefix = WiFiControl.removeSSIDPrefix(str);
         Intent intent = new Intent(activity, ActivityConnectSimpleAP.class);
         intent.putExtra(ActivityConnectBase.APNAME, removeSSIDPrefix);
@@ -284,7 +281,7 @@ public class WiFiDirectManager {
         if (!removeSSIDPrefix.equals(instance.getCurSSID()) || (networkId = instance.getNetworkId(removeSSIDPrefix)) == -1) {
             return false;
         }
-        EPLog.m86d(TAG, "disconnectSimpleAP() ssid = " + removeSSIDPrefix + " printerIp = " + str2);
+        EPLog.d(TAG, "disconnectSimpleAP() ssid = " + removeSSIDPrefix + " printerIp = " + str2);
         WiFiUtils.setAutoGoTimeout(str2, 120);
         if (!instance.disableSimpleAP(context, networkId)) {
             return false;

app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiDirectPrinterListUtils.java

@@ -4,9 +4,6 @@ import android.app.Activity;
 import android.content.Context;
 import android.os.Build;
 
-import com.epson.mobilephone.common.wifidirect.WiFiControl;
-import com.epson.mobilephone.common.wifidirect.WifiP2pUtils;
-
 import epson.print.MyPrinter;
 
 import java.util.AbstractList;
@@ -64,13 +61,13 @@ public class WiFiDirectPrinterListUtils {
     }
 
     public void clearPrinterInfoList() {
-        EPLog.m86d(TAG, "clearPrinterInfoList()");
+        EPLog.d(TAG, "clearPrinterInfoList()");
         innerPrinterList.clear();
         updateP2pPrinterMacAddr();
     }
 
     public void updateP2pPrinterMacAddr() {
-        EPLog.m86d(TAG, "updateP2pPrinterMacAddr()");
+        EPLog.d(TAG, "updateP2pPrinterMacAddr()");
         WifiP2pUtils.ConnectionInfo connectionInfo = WifiP2pUtils.getInstance(mAppContext).getConnectionInfo();
         if (connectionInfo == null) {
             p2pPrinterMacAddr = null;
@@ -99,10 +96,10 @@ public class WiFiDirectPrinterListUtils {
         switch (getType(str)) {
             case LOCAL:
                 if (str2 == null || str2.isEmpty()) {
-                    EPLog.m90w(TAG, "Invalid MacAddress");
+                    EPLog.w(TAG, "Invalid MacAddress");
                     return;
                 } else if (str2.equals(this.p2pPrinterMacAddr)) {
-                    EPLog.m86d(TAG, "Ignore Printer. This printer communicates via P2P:" + str);
+                    EPLog.d(TAG, "Ignore Printer. This printer communicates via P2P:" + str);
                     return;
                 } else {
                     Iterator<PrinterInfo> it = innerPrinterList.iterator();
@@ -112,13 +109,13 @@ public class WiFiDirectPrinterListUtils {
                             if (!PRINTER_TYPE.LOCAL.equals(next.type)) {
                                 String str3 = next.macAddr;
                                 if (str2 != null && str2.equals(str3)) {
-                                    EPLog.m86d(TAG, "Replace Duplicate Printer:" + next.ssid + "->" + str);
+                                    EPLog.d(TAG, "Replace Duplicate Printer:" + next.ssid + "->" + str);
                                     int indexOf = uiPrinterList.indexOf(next.printer);
                                     if (-1 != indexOf) {
                                         listController.replacePrinter(indexOf, obj, i);
                                         z = false;
                                     } else {
-                                        EPLog.m87e(TAG, "Illegal curPrinterList1 (Maybe replaced):" + str);
+                                        EPLog.e(TAG, "Illegal curPrinterList1 (Maybe replaced):" + str);
                                     }
                                 }
                             }
@@ -137,7 +134,7 @@ public class WiFiDirectPrinterListUtils {
                         PrinterInfo next2 = it2.next();
                         String str4 = next2.macAddr;
                         if (str4 == null || str4.isEmpty()) {
-                            EPLog.m90w(TAG, "Invalid MacAddress");
+                            EPLog.w(TAG, "Invalid MacAddress");
                         } else if (PRINTER_TYPE.WIFIDIRECT.equals(next2.type)) {
                             if (str4 != null && str4.equals(str2)) {
                                 switch (WiFiControl.getSSIDType(str)) {
@@ -145,10 +142,10 @@ public class WiFiDirectPrinterListUtils {
                                         if (next2.ssid.equals(this.curConnectInfo)) {
                                             break;
                                         } else {
-                                            EPLog.m86d(TAG, "Replace Duplicate Printer:" + next2.ssid + "->" + str);
+                                            EPLog.d(TAG, "Replace Duplicate Printer:" + next2.ssid + "->" + str);
                                             int indexOf2 = uiPrinterList.indexOf(next2.printer);
                                             if (-1 == indexOf2) {
-                                                EPLog.m87e(TAG, "Illegal curPrinterList2 (Maybe replaced):" + str);
+                                                EPLog.e(TAG, "Illegal curPrinterList2 (Maybe replaced):" + str);
                                                 break;
                                             } else {
                                                 listController.replacePrinter(indexOf2, obj, i);
@@ -160,12 +157,12 @@ public class WiFiDirectPrinterListUtils {
                                         if (str.equals(this.curConnectInfo)) {
                                             break;
                                         } else {
-                                            EPLog.m86d(TAG, "Found Duplicate Printer:" + next2.ssid + "(" + str + ")");
+                                            EPLog.d(TAG, "Found Duplicate Printer:" + next2.ssid + "(" + str + ")");
                                             z = false;
                                             break;
                                         }
                                     default:
-                                        EPLog.m90w(TAG, "Invalid Type");
+                                        EPLog.w(TAG, "Invalid Type");
                                         break;
                                 }
                             }
@@ -179,18 +176,18 @@ public class WiFiDirectPrinterListUtils {
                                     if (iArr[WiFiControl.getSSIDType(str).ordinal()] != 2) {
                                         z2 = z;
                                     } else if (curConnectInfo2.equals(this.curConnectInfo)) {
-                                        EPLog.m86d(TAG, "Replace Duplicate Printer:" + next2.f157ip + "->" + str);
+                                        EPLog.d(TAG, "Replace Duplicate Printer:" + next2.f157ip + "->" + str);
                                         int indexOf3 = uiPrinterList.indexOf(next2.printer);
                                         if (-1 != indexOf3) {
                                             listController.replacePrinter(indexOf3, obj, i);
                                         } else {
-                                            EPLog.m87e(TAG, "Illegal curPrinterList3 (Maybe replaced):" + str);
+                                            EPLog.e(TAG, "Illegal curPrinterList3 (Maybe replaced):" + str);
                                         }
                                     } else {
-                                        EPLog.m86d(TAG, "Found Duplicate Printer:" + next2.f157ip + "(" + str + ")");
+                                        EPLog.d(TAG, "Found Duplicate Printer:" + next2.f157ip + "(" + str + ")");
                                     }
                                 } else {
-                                    EPLog.m86d(TAG, "Found Duplicate Printer:" + next2.f157ip + "(" + str + ")");
+                                    EPLog.d(TAG, "Found Duplicate Printer:" + next2.f157ip + "(" + str + ")");
                                 }
                             }
                         }
@@ -207,7 +204,7 @@ public class WiFiDirectPrinterListUtils {
                 listController.addPrinter(obj, i);
                 return;
             default:
-                EPLog.m90w(TAG, "Un known Type");
+                EPLog.w(TAG, "Un known Type");
                 return;
         }
     }

app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiNetworkManager.java

@@ -1,11 +1,13 @@
 package com.epson.mobilephone.common.wifidirect;
 
+import android.app.Service;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.NetworkCapabilities;
 
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 @RequiresApi(api = 21)
 public class WiFiNetworkManager {
@@ -16,7 +18,7 @@ public class WiFiNetworkManager {
 
     private WiFiNetworkManager(@NonNull Context context2) {
         context = context2;
-        connectivityManager = (ConnectivityManager) context2.getSystemService("connectivity");
+        connectivityManager = (ConnectivityManager) context2.getSystemService(Service.CONNECTIVITY_SERVICE);
     }
 
     public static WiFiNetworkManager getInsetance(@NonNull Context context2) {
@@ -28,11 +30,10 @@ public class WiFiNetworkManager {
 
     protected Network getWifiNetwork() {
         for (Network network : connectivityManager.getAllNetworks()) {
-            if (this.connectivityManager.getNetworkCapabilities(network).hasTransport(1)) {
+            if (connectivityManager.getNetworkCapabilities(network).hasTransport(1)) {
                 return network;
             }
         }
-        return null;
     }
 
     @RequiresApi(api = 23)
@@ -40,13 +41,12 @@ public class WiFiNetworkManager {
         Network wifiNetwork = getWifiNetwork();
         if (wifiNetwork != null) {
             NetworkCapabilities networkCapabilities = connectivityManager.getNetworkCapabilities(wifiNetwork);
-            if (networkCapabilities.hasCapability(16)) {
-                EPLog.m86d(TAG, "capabilities :" + networkCapabilities.toString());
-                EPLog.m86d(TAG, "isWiFiValidated = OK : " + WiFiUtils.getInstance(this.context).getCurSSID());
+            if (networkCapabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)) {
+                EPLog.d(TAG, "capabilities :" + networkCapabilities.toString());
+                EPLog.d(TAG, "isWiFiValidated = OK : " + WiFiUtils.getInstance(context).getCurSSID());
                 return true;
             }
         }
-        EPLog.m86d(TAG, "isWiFiValidated = NG :" + WiFiUtils.getInstance(this.context).getCurSSID());
         return false;
     }
 }

app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiScanner.java

@@ -6,6 +6,9 @@ import android.os.Handler;
 
 import java.lang.ref.WeakReference;
 
+/**
+ * wifi扫描工具类
+ */
 public class WiFiScanner {
     private static final int INTERVAL_SCAN = 30;
     private static Handler wifiScannerHandler;
@@ -13,7 +16,7 @@ public class WiFiScanner {
     private String TAG = "WiFiScanner";
     private WeakReference<WifiManager> refWiFiManager = null;
 
-    private boolean startScan(WifiManager wifiManager) {
+    public boolean startScan(WifiManager wifiManager) {
         if (Build.VERSION.SDK_INT >= 28) {
             if (wifiScannerHandler == null) {
                 wifiScannerHandler = new Handler();
@@ -25,9 +28,9 @@ public class WiFiScanner {
                 public void run() {
                     WifiManager wifiManager = (WifiManager) WiFiScanner.this.refWiFiManager.get();
                     if (WiFiScanner.this.refWiFiManager != null) {
-                        EPLog.m86d(WiFiScanner.this.TAG, "Started Delayed startScan()");
+                        EPLog.d(WiFiScanner.this.TAG, "Started Delayed startScan()");
                         if (!wifiManager.startScan()) {
-                            EPLog.m87e(WiFiScanner.this.TAG, "Failed Delayed startScan()");
+                            EPLog.e(WiFiScanner.this.TAG, "Failed Delayed startScan()");
                         }
                     }
                 }
@@ -36,7 +39,7 @@ public class WiFiScanner {
         } else if (wifiManager.startScan()) {
             return true;
         } else {
-            EPLog.m87e(this.TAG, "Failed startScan()");
+            EPLog.e(this.TAG, "Failed startScan()");
             return false;
         }
     }

app/src/main/java/com/epson/mobilephone/common/wifidirect/WiFiUtils.java

@@ -101,7 +101,7 @@ public class WiFiUtils {
         if (removeQuotationsInSSID2 != null && removeQuotationsInSSID2.length() > 0 && !WifiSsid_NONE.equals(removeQuotationsInSSID2)) {
             return removeQuotationsInSSID2;
         }
-        EPLog.m87e(TAG, "Error getCurSSID() : Do you have location permission?");
+        EPLog.e(TAG, "Error getCurSSID() : Do you have location permission?");
         return null;
     }
 
@@ -170,10 +170,10 @@ public class WiFiUtils {
         wifiConfiguration.allowedProtocols.set(1);
         wifiConfiguration.networkId = networkId;
         if (networkId == -1) {
-            EPLog.m88i(TAG, "call addNetwork!!");
+            EPLog.i(TAG, "call addNetwork!!");
             i = f159wm.addNetwork(wifiConfiguration);
             if (i == -1) {
-                EPLog.m90w(TAG, "Failed addNetwork. Try ramdam ssid!");
+                EPLog.w(TAG, "Failed addNetwork. Try ramdam ssid!");
                 wifiConfiguration.SSID = "\"" + UUID.randomUUID().toString().replace("-", "") + "\"";
                 i = f159wm.addNetwork(wifiConfiguration);
                 if (i != -1) {
@@ -183,11 +183,11 @@ public class WiFiUtils {
                 }
             }
         } else {
-            EPLog.m88i(TAG, "call updateNetwork!!");
+            EPLog.i(TAG, "call updateNetwork!!");
             i = f159wm.updateNetwork(wifiConfiguration);
         }
         if (i == -1) {
-            EPLog.m87e(TAG, "Failed addNetwork or updateNetwork");
+            EPLog.e(TAG, "Failed addNetwork or updateNetwork");
             return -1;
         }
         int curNetworkId = getCurNetworkId();
@@ -197,7 +197,7 @@ public class WiFiUtils {
         if (wifiManager_connect(i)) {
             return i;
         }
-        EPLog.m87e(TAG, "Failed  wifiManager_connect");
+        EPLog.e(TAG, "Failed  wifiManager_connect");
         return -1;
     }
 
@@ -206,11 +206,11 @@ public class WiFiUtils {
         if (wifiConfig == null) {
             return false;
         }
-        EPLog.m88i(TAG, "Enable Wifi Profile: SSID = " + wifiConfig.SSID);
+        EPLog.i(TAG, "Enable Wifi Profile: SSID = " + wifiConfig.SSID);
         if (Build.VERSION.SDK_INT < 23) {
             wifiConfig.SSID = "\"" + str + "\"";
             if (this.f159wm.updateNetwork(wifiConfig) == -1) {
-                EPLog.m87e(TAG, "Failed  updateNetwork");
+                EPLog.e(TAG, "Failed  updateNetwork");
                 return false;
             }
         }
@@ -221,18 +221,18 @@ public class WiFiUtils {
         if (wifiManager_connect(i)) {
             return true;
         }
-        EPLog.m87e(TAG, "Failed  wifiManager_connect");
+        EPLog.e(TAG, "Failed  wifiManager_connect");
         return true;
     }
 
     private boolean wifiManager_connect(int i) {
         if (!this.f159wm.enableNetwork(i, true)) {
-            EPLog.m87e(TAG, "Failed  enableNetwork");
+            EPLog.e(TAG, "Failed  enableNetwork");
             return false;
         } else if (saveWifiConfiguration(this.f159wm)) {
             return true;
         } else {
-            EPLog.m87e(TAG, "Failed  saveConfiguration");
+            EPLog.e(TAG, "Failed  saveConfiguration");
             return false;
         }
     }
@@ -242,7 +242,7 @@ public class WiFiUtils {
             return false;
         }
         if (i == getCurNetworkId() && !this.f159wm.disconnect()) {
-            EPLog.m87e(TAG, "Failed  disconnect");
+            EPLog.e(TAG, "Failed  disconnect");
             return false;
         } else if (!removeNetwork(i)) {
             return false;
@@ -257,20 +257,20 @@ public class WiFiUtils {
         if (wifiConfig == null) {
             return false;
         }
-        EPLog.m86d(TAG, "Remove Wifi Profile : SSID = " + wifiConfig.SSID + " networkid = " + wifiConfig.networkId + " status = " + wifiConfig.status);
+        EPLog.d(TAG, "Remove Wifi Profile : SSID = " + wifiConfig.SSID + " networkid = " + wifiConfig.networkId + " status = " + wifiConfig.status);
         if (!this.f159wm.removeNetwork(i)) {
-            EPLog.m87e(TAG, "Failed  removeNetwork");
+            EPLog.e(TAG, "Failed  removeNetwork");
             return false;
         } else if (saveWifiConfiguration(this.f159wm)) {
             return true;
         } else {
-            EPLog.m87e(TAG, "Failed  saveConfiguration");
+            EPLog.e(TAG, "Failed  saveConfiguration");
             return false;
         }
     }
 
     public boolean disableSimpleAP(Context context, int i) {
-        EPLog.m86d(TAG, "Enter disableSimpleAP()");
+        EPLog.d(TAG, "Enter disableSimpleAP()");
         if (Build.VERSION.SDK_INT > 25) {
             ManageDefaultNetwork.getInstance(context).resetDefaultNetwork();
             return true;
@@ -283,21 +283,21 @@ public class WiFiUtils {
 
     public boolean invalidateSimpleAP(Context context, int i) {
         boolean z;
-        EPLog.m86d(TAG, "Enter invalidateSimpleAP()");
+        EPLog.d(TAG, "Enter invalidateSimpleAP()");
         if (i == -1) {
             return false;
         }
         if (i != getCurNetworkId()) {
             z = false;
         } else if (!this.f159wm.disableNetwork(i)) {
-            EPLog.m87e(TAG, "Failed  disableNetwork");
+            EPLog.e(TAG, "Failed  disableNetwork");
             return false;
         } else if (!this.f159wm.disconnect()) {
-            EPLog.m87e(TAG, "Failed  disconnect");
+            EPLog.e(TAG, "Failed  disconnect");
             return false;
         } else {
             waitDisconnect();
-            displayToastThroughHandlerThread(context, C1113R.string.str_notice_wifi_disconnected);
+            displayToastThroughHandlerThread(context, R.string.str_notice_wifi_disconnected);
             z = true;
         }
         if (Build.VERSION.SDK_INT < 23) {
@@ -305,7 +305,7 @@ public class WiFiUtils {
             if (wifiConfig == null) {
                 return false;
             }
-            EPLog.m86d(TAG, "Disable Wifi Profile : SSID = " + wifiConfig.SSID + " networkid = " + wifiConfig.networkId + " status = " + wifiConfig.status);
+            EPLog.d(TAG, "Disable Wifi Profile : SSID = " + wifiConfig.SSID + " networkid = " + wifiConfig.networkId + " status = " + wifiConfig.status);
             if (removeQuotationsInSSID(wifiConfig.SSID).matches("^DIRECT-..-.*")) {
                 wifiConfig.SSID = "\"" + replaceUnusedSSID(removeQuotationsInSSID(wifiConfig.SSID)) + "\"";
             } else if (Build.VERSION.SDK_INT >= 21) {
@@ -315,15 +315,15 @@ public class WiFiUtils {
             }
             for (WifiConfiguration next : f159wm.getConfiguredNetworks()) {
                 if (next.networkId != i && wifiConfig.SSID.equals(next.SSID)) {
-                    EPLog.m88i(TAG, "Delete network for Backup : " + next.SSID);
+                    EPLog.i(TAG, "Delete network for Backup : " + next.SSID);
                     f159wm.removeNetwork(next.networkId);
                 }
             }
             if (this.f159wm.updateNetwork(wifiConfig) == -1) {
-                EPLog.m87e(TAG, "Failed  updateNetwork");
+                EPLog.e(TAG, "Failed  updateNetwork");
                 return false;
             } else if (!saveWifiConfiguration(this.f159wm)) {
-                EPLog.m87e(TAG, "Failed  saveConfiguration");
+                EPLog.e(TAG, "Failed  saveConfiguration");
                 return false;
             }
         }
@@ -334,7 +334,7 @@ public class WiFiUtils {
     }
 
     public void reConnectNetwork() {
-        EPLog.m88i(TAG, "called reConnectNetwork");
+        EPLog.i(TAG, "called reConnectNetwork");
         for (WifiConfiguration next : f159wm.getConfiguredNetworks()) {
             if (WiFiControl.isSimpleAP(removeQuotationsInSSID(next.SSID))) {
                 f159wm.disableNetwork(next.networkId);
@@ -343,21 +343,21 @@ public class WiFiUtils {
             }
         }
         if (!saveWifiConfiguration(this.f159wm)) {
-            EPLog.m87e(TAG, "Failed  saveConfiguration");
+            EPLog.e(TAG, "Failed  saveConfiguration");
         }
         if (!this.f159wm.reassociate()) {
-            EPLog.m87e(TAG, "Failed  reassociate");
+            EPLog.e(TAG, "Failed  reassociate");
         }
     }
 
     private boolean saveWifiConfiguration(WifiManager wifiManager) {
         if (Build.VERSION.SDK_INT >= 26) {
-            EPLog.m86d(TAG, "Needless call saveConfiguration");
+            EPLog.d(TAG, "Needless call saveConfiguration");
             return true;
         } else if (wifiManager.saveConfiguration()) {
             return true;
         } else {
-            EPLog.m87e(TAG, "Failed  saveConfiguration");
+            EPLog.e(TAG, "Failed  saveConfiguration");
             return false;
         }
     }
@@ -372,7 +372,7 @@ public class WiFiUtils {
                 if (!isConnectedWifi()) {
                     break;
                 }
-                EPLog.m90w(TAG, "Waiting wifi disconnected");
+                EPLog.w(TAG, "Waiting wifi disconnected");
                 Thread.sleep((long) 200);
                 i += 200;
             } catch (InterruptedException e) {
@@ -381,7 +381,7 @@ public class WiFiUtils {
             }
         }
         if (i >= 5000) {
-            EPLog.m87e(TAG, "TIMEOUT wifi disconnected");
+            EPLog.e(TAG, "TIMEOUT wifi disconnected");
         }
     }
 
@@ -395,7 +395,7 @@ public class WiFiUtils {
                 if (isConnectedWifi()) {
                     break;
                 }
-                EPLog.m90w(TAG, "Waiting wifi connected");
+                EPLog.w(TAG, "Waiting wifi connected");
                 Thread.sleep((long) 500);
                 i += 500;
             } catch (InterruptedException e) {
@@ -404,7 +404,7 @@ public class WiFiUtils {
             }
         }
         if (i >= 10000) {
-            EPLog.m87e(TAG, "TIMEOUT wifi connected");
+            EPLog.e(TAG, "TIMEOUT wifi connected");
         }
     }
 
@@ -430,7 +430,7 @@ public class WiFiUtils {
                 if (networkInfo == null || (!((type = networkInfo.getType()) == 1 || type == 9) || !networkInfo.getState().equals(NetworkInfo.State.CONNECTED))) {
                     i++;
                 } else {
-                    EPLog.m88i(TAG, String.format("isConnectedWifi = true : TypeName = %s", new Object[]{networkInfo.getTypeName()}));
+                    EPLog.i(TAG, String.format("isConnectedWifi = true : TypeName = %s", new Object[]{networkInfo.getTypeName()}));
                     return true;
                 }
             }
@@ -438,7 +438,7 @@ public class WiFiUtils {
             for (NetworkInfo networkInfo2 : f158cm.getAllNetworkInfo()) {
                 int type2 = networkInfo2.getType();
                 if ((type2 == 1 || type2 == 9) && networkInfo2.isConnected()) {
-                    EPLog.m88i(TAG, String.format("isConnectedWifi = true : TypeName = %s", new Object[]{networkInfo2.getTypeName()}));
+                    EPLog.i(TAG, String.format("isConnectedWifi = true : TypeName = %s", new Object[]{networkInfo2.getTypeName()}));
                     return true;
                 }
             }
@@ -456,7 +456,7 @@ public class WiFiUtils {
             return epsWrapperInitDriver;
         }
         int epsWrapperSetAutoGoTimeOut = escprlib.epsWrapperSetAutoGoTimeOut(str.toCharArray(), i);
-        EPLog.m88i(TAG, "epsWrapperSetAutoGoTimeOut ret = " + epsWrapperSetAutoGoTimeOut);
+        EPLog.i(TAG, "epsWrapperSetAutoGoTimeOut ret = " + epsWrapperSetAutoGoTimeOut);
         escprlib.epsWrapperReleaseDriver();
         return epsWrapperSetAutoGoTimeOut;
     }
@@ -476,10 +476,10 @@ public class WiFiUtils {
                     return;
                 }
                 if (byName.isReachable(1000)) {
-                    EPLog.m86d(TAG, "Success ping " + stringBuffer);
+                    EPLog.d(TAG, "Success ping " + stringBuffer);
                     return;
                 }
-                EPLog.m86d(TAG, "Failed ping " + stringBuffer);
+                EPLog.d(TAG, "Failed ping " + stringBuffer);
             } catch (UnknownHostException e) {
                 e.printStackTrace();
             } catch (IOException e2) {

app/src/main/java/com/epson/mobilephone/common/wifidirect/WifiP2pUtils.java

@@ -1,5 +1,6 @@
 package com.epson.mobilephone.common.wifidirect;
 
+import android.app.Service;
 import android.content.Context;
 import android.net.wifi.p2p.WifiP2pDevice;
 import android.net.wifi.p2p.WifiP2pGroup;
@@ -11,7 +12,11 @@ import java.net.NetworkInterface;
 import java.net.SocketException;
 import java.util.Locale;
 
+/**
+ * 局域网wifi管理工具类
+ */
 public class WifiP2pUtils {
+
     private static final String TAG = "WifiP2pUtils";
     private static final int TIMEOUT_CONNECTIONINFO = 5000;
     private static WifiP2pUtils instance;
@@ -28,7 +33,8 @@ public class WifiP2pUtils {
         REQUEST_GROUPINFO
     }
 
-    public class ConnectionInfo {
+    public static class ConnectionInfo {
+
         boolean isGroupOwnerThisDevice;
         public String p2PMacAdder;
         public String printerName;
@@ -37,6 +43,12 @@ public class WifiP2pUtils {
         }
     }
 
+    /**
+     * 新建实例
+     *
+     * @param context 上下文
+     * @return
+     */
     public static WifiP2pUtils getInstance(Context context) {
         WifiP2pUtils wifiP2pUtils = instance;
         if (wifiP2pUtils != null) {
@@ -51,7 +63,7 @@ public class WifiP2pUtils {
             mAppContext = context.getApplicationContext();
             handlerThread = new HandlerThread("Thread for WiFip2p");
             handlerThread.start();
-            mWiFiP2PManager = (WifiP2pManager) mAppContext.getSystemService("wifip2p");
+            mWiFiP2PManager = (WifiP2pManager) mAppContext.getSystemService(Service.WIFI_P2P_SERVICE);
             WifiP2pManager wifiP2pManager = mWiFiP2PManager;
             if (wifiP2pManager != null) {
                 p2pChannnel = wifiP2pManager.initialize(mAppContext, handlerThread.getLooper(), (WifiP2pManager.ChannelListener) null);
@@ -116,13 +128,13 @@ public class WifiP2pUtils {
             status = STATUS.REQUEST_GROUPINFO;
             mWiFiP2PManager.requestGroupInfo(this.p2pChannnel, new WifiP2pManager.GroupInfoListener() {
                 public void onGroupInfoAvailable(WifiP2pGroup wifiP2pGroup) {
-                    WifiP2pGroup unused = WifiP2pUtils.this.groupInfo = wifiP2pGroup;
-                    if (WifiP2pUtils.this.groupInfo != null) {
-                        EPLog.m86d(WifiP2pUtils.TAG, "Received EXTRA_WIFI_P2P_GROUP = " + WifiP2pUtils.this.groupInfo.toString());
+                    WifiP2pGroup unused = groupInfo = wifiP2pGroup;
+                    if (groupInfo != null) {
+                        EPLog.d(WifiP2pUtils.TAG, "Received EXTRA_WIFI_P2P_GROUP = " + groupInfo.toString());
                     } else {
-                        EPLog.m86d(WifiP2pUtils.TAG, "Received EXTRA_WIFI_P2P_GROUP = null");
+                        EPLog.d(WifiP2pUtils.TAG, "Received EXTRA_WIFI_P2P_GROUP = null");
                     }
-                    WifiP2pUtils.this.resumeThread();
+                    resumeThread();
                 }
             });
             try {
@@ -150,11 +162,11 @@ public class WifiP2pUtils {
         if (wifiP2pManager != null) {
             wifiP2pManager.removeGroup(this.p2pChannnel, new WifiP2pManager.ActionListener() {
                 public void onSuccess() {
-                    EPLog.m86d(WifiP2pUtils.TAG, "Success removeGroup");
+                    EPLog.d(WifiP2pUtils.TAG, "Success removeGroup");
                 }
 
                 public void onFailure(int i) {
-                    EPLog.m86d(WifiP2pUtils.TAG, "Failed removeGroup");
+                    EPLog.d(WifiP2pUtils.TAG, "Failed removeGroup");
                 }
             });
         }

app/src/main/java/com/epson/mobilephone/common/wifidirect/escprLib.java

@@ -75,7 +75,7 @@ public class escprLib {
         String str = printerList;
         if (str != null && str.length() > 0) {
             String name = getClass().getName();
-            EPLog.m87e(name, "EXTRACT Printer information: " + printerList);
+            EPLog.e(name, "EXTRACT Printer information: " + printerList);
             String[] split = printerList.split("\\|\\|");
             if (mIsSearch && mHandler != null) {
                 Message obtain = Message.obtain();
@@ -102,7 +102,7 @@ public class escprLib {
     }
 
     private void javaDebugCB() {
-        EPLog.m88i(getClass().getName(), debugString);
+        EPLog.i(getClass().getName(), debugString);
         debugString = "";
     }
 

app/src/main/java/epson/support/DeviceInformationActivity.java

@@ -17,6 +17,7 @@ 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;
@@ -62,9 +63,7 @@ public class DeviceInformationActivity extends ActivityIACommon {
         public boolean handleMessage(Message message) {
             String str;
             String str2;
-            EPLog.m313i("IprintHome", "HandlerCallback");
             int i = message.getData().getInt(Constants.PRINTER_LOCATION);
-            EpLog.m69d("printerLocation " + i);
             boolean z = false;
             switch (message.what) {
                 case 0:
@@ -104,7 +103,7 @@ public class DeviceInformationActivity extends ActivityIACommon {
                     int[] intArray = message.getData().getIntArray("STATUS_ERROR");
                     if (i != 1 || WiFiDirectManager.getConnectInfo(getApplicationContext(), WiFiDirectManager.DEVICE_TYPE_PRINTER) == null) {
                         if (intArray == null) {
-                            DeviceInformationActivity deviceInformationActivity = this;
+                            DeviceInformationActivity deviceInformationActivity = DeviceInformationActivity.this;
                             setPrinterInfo(getString(R.string.upon_error), true);
                             String access$0003 = TAG;
                             EPLog.m313i(access$0003, "Stt titlef: " + getString(R.string.upon_error));
@@ -160,6 +159,7 @@ public class DeviceInformationActivity extends ActivityIACommon {
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView(R.layout.device_information);
+
         setActionBar(R.string.str_deviceInformation_Info, true);
         checkSmartPhoneInfo();
         checkPrinterInfo();
@@ -259,6 +259,12 @@ public class DeviceInformationActivity extends ActivityIACommon {
         }
     }
 
+    /**
+     * 获取ip
+     *
+     * @param context
+     * @return
+     */
     public static String getIpAddressFromP2P(Context context) {
         try {
             NetworkInterface p2PInterfaceInfo = WifiP2pUtils.getInstance(context).getP2PInterfaceInfo();

app/src/main/java/epson/support/SupportAboutActivity.java

@@ -16,9 +16,10 @@ public class SupportAboutActivity extends ActivityIACommon implements View.OnCli
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView(R.layout.help_about);
+
         setActionBar(R.string.tv_help_about, true);
         try {
-            PackageInfo packageInfo = getPackageManager().getPackageInfo(getPackageName(), 128);
+            PackageInfo packageInfo = getPackageManager().getPackageInfo(getPackageName(), PackageManager.GET_META_DATA);
             int i = packageInfo.versionCode;
             ((TextView) findViewById(R.id.version)).setText(getResources().getString(R.string.about_ver) + " " + packageInfo.versionName + " (" + getString(R.string.build_type) + getString(R.string.build_count) + ")");
         } catch (PackageManager.NameNotFoundException e) {

app/src/main/java/epson/support/SupportActivity.java

@@ -34,6 +34,7 @@ public class SupportActivity extends ActivityIACommon implements CommonDefine, V
     protected void onCreate(Bundle bundle) {
         super.onCreate(bundle);
         setContentView(R.layout.main_support);
+
         setActionBar(R.string.title_support, true);
         findViewById(R.id.linearLayoutIprintNews).setOnClickListener(new View.OnClickListener() {
             public void onClick(View view) {
@@ -107,6 +108,7 @@ public class SupportActivity extends ActivityIACommon implements CommonDefine, V
     }
 
     protected void onActivityResult(int i, int i2, Intent intent) {
+        super.onActivityResult(i, i2, intent);
         if (i == 1) {
             updateUserSurveySwitch();
         }