cleanup

nisrulz · Mar 21, 2021 · 86a42a1 · 86a42a1
1 parent 64facc8
commit 86a42a1
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 31 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"