From 86a42a141469c48029169ffb7137265f9c068e5e Mon Sep 17 00:00:00 2001 From: Nishant Srivastava Date: Mon, 22 Mar 2021 00:17:21 +0100 Subject: [PATCH] cleanup --- .../projecteasydeviceinfo/MainActivity.java | 22 +++++++++---------- build.gradle | 1 + configs/common.gradle | 11 ---------- easydeviceinfo-ads/build.gradle | 2 +- easydeviceinfo-base/build.gradle | 2 +- .../easydeviceinfo/base/EasyBatteryMod.java | 14 +++++++----- easydeviceinfo-ktx/build.gradle | 2 +- easydeviceinfo/build.gradle | 2 +- 8 files changed, 25 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/github/nisrulz/projecteasydeviceinfo/MainActivity.java b/app/src/main/java/github/nisrulz/projecteasydeviceinfo/MainActivity.java index 403fe23..584b702 100644 --- a/app/src/main/java/github/nisrulz/projecteasydeviceinfo/MainActivity.java +++ b/app/src/main/java/github/nisrulz/projecteasydeviceinfo/MainActivity.java @@ -366,17 +366,6 @@ public void onSuccess(final String adIdentifier, final boolean adDonotTrack) { deviceDataMap.put("Battery voltage", easyBatteryMod.getBatteryVoltage() + " mV"); - @BatteryHealth final int batteryHealth = easyBatteryMod.getBatteryHealth(); - switch (batteryHealth) { - case BatteryHealth.GOOD: - deviceDataMap.put("Battery health", "Good"); - break; - case BatteryHealth.HAVING_ISSUES: - default: - deviceDataMap.put("Battery health", "Having issues"); - break; - } - @ChargingVia final int isChargingVia = easyBatteryMod.getChargingSource(); switch (isChargingVia) { case ChargingVia.AC: @@ -394,6 +383,17 @@ public void onSuccess(final String adIdentifier, final boolean adDonotTrack) { break; } + @BatteryHealth final int batteryHealth = easyBatteryMod.getBatteryHealth(); + switch (batteryHealth) { + case BatteryHealth.GOOD: + deviceDataMap.put("Battery health", "Good"); + break; + case BatteryHealth.HAVING_ISSUES: + default: + deviceDataMap.put("Battery health", "Having issues"); + break; + } + //Bluetooth Mod final EasyBluetoothMod easyBluetoothMod = new EasyBluetoothMod(this); deviceDataMap.put("BT MAC Address", easyBluetoothMod.getBluetoothMAC()); diff --git a/build.gradle b/build.gradle index c339960..1939aa8 100644 --- a/build.gradle +++ b/build.gradle @@ -48,6 +48,7 @@ allprojects { google() mavenCentral() + // Required by Lint (com.android.tools.lint:lint-gradle:27.1.3) jcenter() { content { // This is an AGP issue. Its been fixed in Canary version. Ideally it would be backported diff --git a/configs/common.gradle b/configs/common.gradle index faac9f7..0173145 100644 --- a/configs/common.gradle +++ b/configs/common.gradle @@ -39,17 +39,6 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } - - lintOptions { - textOutput "stdout" - textReport true - checkAllWarnings true - warningsAsErrors true - showAll true - explainIssues true - abortOnError false - lintConfig file("$projectDir/lint.xml") - } } dependencies { diff --git a/easydeviceinfo-ads/build.gradle b/easydeviceinfo-ads/build.gradle index a39f659..aa2abb1 100644 --- a/easydeviceinfo-ads/build.gradle +++ b/easydeviceinfo-ads/build.gradle @@ -23,7 +23,7 @@ ext.setupModuleNamesForPublishing(ModuleName.ads, ModuleDesc.ads) dependencies { implementation Dependencies.adIdentifier - // Including the sub-module as Jcenter dependency + // Including the sub-module as remote maven dependency // api "com.github.nisrulz:easydeviceinfo-common:$Versions.libraryName" // Including the sub-module as module dependency diff --git a/easydeviceinfo-base/build.gradle b/easydeviceinfo-base/build.gradle index 074254b..d87732b 100644 --- a/easydeviceinfo-base/build.gradle +++ b/easydeviceinfo-base/build.gradle @@ -22,7 +22,7 @@ ext.setupModuleNamesForPublishing(ModuleName.base, ModuleDesc.base) dependencies { implementation Dependencies.annotation - // Including the sub-module as Jcenter dependency + // Including the sub-module as remote maven dependency // api "com.github.nisrulz:easydeviceinfo-common:$Versions.libraryName" // Including the sub-module as module dependency diff --git a/easydeviceinfo-base/src/main/java/github/nisrulz/easydeviceinfo/base/EasyBatteryMod.java b/easydeviceinfo-base/src/main/java/github/nisrulz/easydeviceinfo/base/EasyBatteryMod.java index 4905527..9b3633e 100644 --- a/easydeviceinfo-base/src/main/java/github/nisrulz/easydeviceinfo/base/EasyBatteryMod.java +++ b/easydeviceinfo-base/src/main/java/github/nisrulz/easydeviceinfo/base/EasyBatteryMod.java @@ -117,18 +117,22 @@ public final int getBatteryVoltage() { @ChargingVia public final int getChargingSource() { final Intent batteryStatus = this.getBatteryStatusIntent(); + int result = ChargingVia.UNKNOWN_SOURCE; final int chargePlug = batteryStatus.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0); switch (chargePlug) { case BatteryManager.BATTERY_PLUGGED_AC: - return ChargingVia.AC; + result = ChargingVia.AC; + break; case BatteryManager.BATTERY_PLUGGED_USB: - return ChargingVia.USB; + result = ChargingVia.USB; + break; case BatteryManager.BATTERY_PLUGGED_WIRELESS: - return ChargingVia.WIRELESS; - default: - return ChargingVia.UNKNOWN_SOURCE; + result = ChargingVia.WIRELESS; + break; } + + return result; } /** diff --git a/easydeviceinfo-ktx/build.gradle b/easydeviceinfo-ktx/build.gradle index 963c1fa..4874937 100644 --- a/easydeviceinfo-ktx/build.gradle +++ b/easydeviceinfo-ktx/build.gradle @@ -22,7 +22,7 @@ ext.setupModuleNamesForPublishing(ModuleName.ktx, ModuleDesc.ktx) dependencies { implementation Dependencies.kotlinStdLib - // Including the sub-module as Jcenter dependency + // Including the sub-module as remote maven dependency // api "com.github.nisrulz:easydeviceinfo-common:$Versions.libraryName" // Including the sub-module as module dependency diff --git a/easydeviceinfo/build.gradle b/easydeviceinfo/build.gradle index ae59061..a7aadf6 100644 --- a/easydeviceinfo/build.gradle +++ b/easydeviceinfo/build.gradle @@ -23,7 +23,7 @@ ext.setupModuleNamesForPublishing(ModuleName.main, ModuleDesc.main) dependencies { implementation Dependencies.annotation - // Including the sub-module as Jcenter dependency + // Including the sub-module as remote maven dependency // api "com.github.nisrulz:easydeviceinfo-ads:$Versions.libraryName" // api "com.github.nisrulz:easydeviceinfo-base:$Versions.libraryName"