Skip to content

Commit 798842c

Browse files
adwait-espadwait-esp
committed
Merge branch 'task/log_level_change' into 'master'
Improve log level See merge request idf/esp-idf-provisioning-android!63
2 parents 06509c3 + 958fdf1 commit 798842c

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

‎app/src/main/java/com/espressif/ui/activities/AddDeviceActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ public void onBackPressed() {
166166
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
167167
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
168168

169-
Log.e(TAG, "onRequestPermissionsResult , requestCode : " + requestCode);
169+
Log.d(TAG, "onRequestPermissionsResult , requestCode : " + requestCode);
170170

171171
if (requestCode == REQUEST_CAMERA_PERMISSION) {
172172

@@ -200,7 +200,7 @@ public void onEvent(DeviceConnectionEvent event) {
200200
String userName = sharedPreferences.getString(AppConstants.KEY_USER_NAME, AppConstants.DEFAULT_USER_NAME);
201201
provisionManager.getEspDevice().setUserName(userName);
202202
}
203-
Log.e(TAG, "Device Connected Event Received");
203+
Log.d(TAG, "Device Connected Event Received");
204204
setSecurityTypeFromVersionInfo();
205205
break;
206206

@@ -357,7 +357,7 @@ public void run() {
357357
@Override
358358
public void deviceDetected(final ESPDevice device) {
359359

360-
Log.e(TAG, "Device detected");
360+
Log.d(TAG, "Device detected");
361361
espDevice = device;
362362
final String deviceType = sharedPreferences.getString(AppConstants.KEY_DEVICE_TYPES, AppConstants.DEVICE_TYPE_DEFAULT);
363363

‎app/src/main/java/com/espressif/ui/activities/BLEProvisionLanding.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ public void onEvent(DeviceConnectionEvent event) {
197197
switch (event.getEventType()) {
198198

199199
case ESPConstants.EVENT_DEVICE_CONNECTED:
200-
Log.e(TAG, "Device Connected Event Received");
200+
Log.d(TAG, "Device Connected Event Received");
201201
progressBar.setVisibility(View.GONE);
202202
isConnecting = false;
203203
isDeviceConnected = true;

‎app/src/main/java/com/espressif/ui/activities/ProvisionLanding.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public void onEvent(DeviceConnectionEvent event) {
101101

102102
case ESPConstants.EVENT_DEVICE_CONNECTED:
103103

104-
Log.e(TAG, "Device Connected Event Received");
104+
Log.d(TAG, "Device Connected Event Received");
105105
btnConnect.setEnabled(true);
106106
btnConnect.setAlpha(1f);
107107
txtConnectBtn.setText(R.string.btn_connect);

‎provisioning/src/main/java/com/espressif/provisioning/ESPDevice.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public void connectWiFiDevice() {
188188
@RequiresPermission(allOf = {Manifest.permission.CHANGE_WIFI_STATE, Manifest.permission.ACCESS_WIFI_STATE, Manifest.permission.ACCESS_NETWORK_STATE, Manifest.permission.ACCESS_FINE_LOCATION})
189189
public void connectWiFiDevice(String ssid, String password) {
190190

191-
Log.e(TAG, "connectWiFiDevice ========== SSID : " + ssid + " and Password : " + password);
191+
Log.d(TAG, "connectWiFiDevice ========== SSID : " + ssid + " and Password : " + password);
192192

193193
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
194194

@@ -726,7 +726,7 @@ public void onFailure(Exception e) {
726726

727727
private void getFullWiFiList() {
728728

729-
Log.e(TAG, "Total count : " + totalCount + " and start index is : " + startIndex);
729+
Log.d(TAG, "Total count : " + totalCount + " and start index is : " + startIndex);
730730

731731
if (totalCount < 4) {
732732

@@ -974,11 +974,11 @@ private void processGetSSIDs(byte[] responseData) {
974974
WifiScan.WiFiScanPayload payload = WifiScan.WiFiScanPayload.parseFrom(responseData);
975975
final WifiScan.RespScanResult response = payload.getRespScanResult();
976976

977-
Log.e(TAG, "Response count : " + response.getEntriesCount());
977+
Log.d(TAG, "Response count : " + response.getEntriesCount());
978978

979979
for (int i = 0; i < response.getEntriesCount(); i++) {
980980

981-
Log.e(TAG, "SSID : " + response.getEntries(i).getSsid().toStringUtf8());
981+
Log.d(TAG, "SSID : " + response.getEntries(i).getSsid().toStringUtf8());
982982
String ssid = response.getEntries(i).getSsid().toStringUtf8();
983983
int rssi = response.getEntries(i).getRssi();
984984
boolean isAvailable = false;
@@ -1006,7 +1006,7 @@ private void processGetSSIDs(byte[] responseData) {
10061006
wifiApList.add(wifiAp);
10071007
}
10081008

1009-
Log.e(TAG, "Size of list : " + wifiApList.size());
1009+
Log.d(TAG, "Size of list : " + wifiApList.size());
10101010
}
10111011

10121012
startIndex = startIndex + 4;
@@ -1216,7 +1216,7 @@ private String fetchWiFiSSID() {
12161216
ssid = wifiInfo.getSSID();
12171217
ssid = ssid.replace("\"", "");
12181218
}
1219-
Log.e(TAG, "Returning ssid : " + ssid);
1219+
Log.d(TAG, "Returning ssid : " + ssid);
12201220
return ssid;
12211221
}
12221222

‎provisioning/src/main/java/com/espressif/provisioning/ESPProvisionManager.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ public void run() {
345345
@RequiresPermission(allOf = {Manifest.permission.BLUETOOTH_ADMIN, Manifest.permission.BLUETOOTH, Manifest.permission.ACCESS_FINE_LOCATION})
346346
public void searchBleEspDevices(List<ScanFilter> filters, BleScanListener bleScannerListener) {
347347

348-
Log.e(TAG, "Search for BLE devices");
348+
Log.d(TAG, "Search for BLE devices");
349349
bleScanner = new BleScanner(context, bleScannerListener);
350350
bleScanner.startScan(filters);
351351
}
@@ -359,7 +359,7 @@ public void searchBleEspDevices(List<ScanFilter> filters, BleScanListener bleSca
359359
@RequiresPermission(allOf = {Manifest.permission.BLUETOOTH_ADMIN, Manifest.permission.BLUETOOTH, Manifest.permission.ACCESS_FINE_LOCATION})
360360
public void searchBleEspDevices(ScanSettings scanSettings, BleScanListener bleScannerListener) {
361361

362-
Log.e(TAG, "Search for BLE devices");
362+
Log.d(TAG, "Search for BLE devices");
363363
bleScanner = new BleScanner(context, bleScannerListener);
364364
bleScanner.startScan(scanSettings);
365365
}
@@ -374,7 +374,7 @@ public void searchBleEspDevices(ScanSettings scanSettings, BleScanListener bleSc
374374
@RequiresPermission(allOf = {Manifest.permission.BLUETOOTH_ADMIN, Manifest.permission.BLUETOOTH, Manifest.permission.ACCESS_FINE_LOCATION})
375375
public void searchBleEspDevices(List<ScanFilter> filters, ScanSettings scanSettings, BleScanListener bleScannerListener) {
376376

377-
Log.e(TAG, "Search for BLE devices");
377+
Log.d(TAG, "Search for BLE devices");
378378
bleScanner = new BleScanner(context, bleScannerListener);
379379
bleScanner.startScan(filters, scanSettings);
380380
}
@@ -387,7 +387,7 @@ public void searchBleEspDevices(List<ScanFilter> filters, ScanSettings scanSetti
387387
@RequiresPermission(allOf = {Manifest.permission.BLUETOOTH_ADMIN, Manifest.permission.BLUETOOTH, Manifest.permission.ACCESS_FINE_LOCATION})
388388
public void searchBleEspDevices(BleScanListener bleScannerListener) {
389389

390-
Log.e(TAG, "Search for BLE devices");
390+
Log.d(TAG, "Search for BLE devices");
391391
bleScanner = new BleScanner(context, bleScannerListener);
392392
bleScanner.startScan();
393393
}
@@ -401,7 +401,7 @@ public void searchBleEspDevices(BleScanListener bleScannerListener) {
401401
@RequiresPermission(allOf = {Manifest.permission.BLUETOOTH_ADMIN, Manifest.permission.BLUETOOTH, Manifest.permission.ACCESS_FINE_LOCATION})
402402
public void searchBleEspDevices(String prefix, BleScanListener bleScannerListener) {
403403

404-
Log.e(TAG, "Search for BLE devices");
404+
Log.d(TAG, "Search for BLE devices");
405405
bleScanner = new BleScanner(context, prefix, bleScannerListener);
406406
bleScanner.startScan();
407407
}

0 commit comments

Comments
 (0)