Fixed isBatteryCharging type from string to boolean

applivery · Dec 13, 2016 · b67d327 · b67d327
1 parent 32a56b9
commit b67d327
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/applvsdklib/src/main/java/com/applivery/applvsdklib/domain/feedback/DeviceDetailsInfo.java b/applvsdklib/src/main/java/com/applivery/applvsdklib/domain/feedback/DeviceDetailsInfo.java
@@ -36,7 +36,7 @@ public interface DeviceDetailsInfo {
 
   String getBatteryPercentage();
 
-  String isBatteryCharging();
+  boolean isBatteryCharging();
 
   String getNetworkConnectivity();
 

diff --git a/applvsdklib/src/main/java/com/applivery/applvsdklib/domain/model/FeedbackWrapper.java b/applvsdklib/src/main/java/com/applivery/applvsdklib/domain/model/FeedbackWrapper.java
@@ -40,7 +40,7 @@ public class FeedbackWrapper {
   final private String osVersion;
   final private String deviceId;
   final private String batteryPercentage;
-  final private String isBatteryCharging;
+  final private boolean isBatteryCharging;
   final private String networkConnectivity;
   final private String screenResolution;
   final private String ramUsed;
@@ -51,7 +51,7 @@ public class FeedbackWrapper {
   public FeedbackWrapper(String packageName, String appVersionName, String osName, String screen,
       String screenShotBase64, String feedBackMessage, String vendor, String model, String type,
       String appId, String bugType, String osVersion, String deviceId, String batteryPercentage,
-      String isBatteryCharging, String networkConnectivity, String screenResolution, String ramUsed,
+      boolean isBatteryCharging, String networkConnectivity, String screenResolution, String ramUsed,
       String ramTotal, String freeDiskPercentage, String screenOrientation) {
 
     this.packageName = packageName;
@@ -164,7 +164,7 @@ public String getBatteryPercentage() {
     return batteryPercentage;
   }
 
-  public String getIsBatteryCharging() {
+  public boolean isBatteryCharging() {
     return isBatteryCharging;
   }
 

diff --git a/applvsdklib/src/main/java/com/applivery/applvsdklib/network/api/model/ApiDeviceData.java b/applvsdklib/src/main/java/com/applivery/applvsdklib/network/api/model/ApiDeviceData.java
@@ -30,7 +30,7 @@ public class ApiDeviceData {
   @SerializedName("type") @Expose private final String type;
   @SerializedName("id") @Expose private final String id;
   @SerializedName("battery") @Expose private final String battery;
-  @SerializedName("batteryStatus") @Expose private final String batteryStatus;
+  @SerializedName("batteryStatus") @Expose private final boolean batteryStatus;
   @SerializedName("network") @Expose private final String network;
   @SerializedName("resolution") @Expose private final String resolution;
   @SerializedName("ramUsed") @Expose private final String ramUsed;
@@ -39,7 +39,7 @@ public class ApiDeviceData {
   @SerializedName("orientation") @Expose private final String orientation;
 
   public ApiDeviceData(String model, String vendor, String type, String id, String battery,
-      String batteryStatus, String network, String resolution, String ramUsed, String ramTotal,
+      boolean batteryStatus, String network, String resolution, String ramUsed, String ramTotal,
       String diskFree, String orientation) {
     this.model = model;
     this.vendor = vendor;

diff --git a/...n/java/com/applivery/applvsdklib/network/api/requests/mappers/ApiDeviceRequestMapper.java b/...n/java/com/applivery/applvsdklib/network/api/requests/mappers/ApiDeviceRequestMapper.java
@@ -32,7 +32,7 @@ public class ApiDeviceRequestMapper implements RequestMapper<FeedbackWrapper, Ap
     String type = feedbackWrapper.getType();
     String deviceId = feedbackWrapper.getDeviceId();
     String batteryPercentage = feedbackWrapper.getBatteryPercentage();
-    String isBatteryCharging = feedbackWrapper.getIsBatteryCharging();
+    boolean isBatteryCharging = feedbackWrapper.isBatteryCharging();
     String networkConnectivity = feedbackWrapper.getNetworkConnectivity();
     String screenResolution = feedbackWrapper.getScreenResolution();
     String ramUsed = feedbackWrapper.getRamUsed();

diff --git a/...java/com/applivery/applvsdklib/tools/androidimplementations/AndroidDeviceDetailsInfo.java b/...java/com/applivery/applvsdklib/tools/androidimplementations/AndroidDeviceDetailsInfo.java
@@ -118,7 +118,7 @@ public class AndroidDeviceDetailsInfo implements DeviceDetailsInfo {
     return batteryPercentage;
   }
 
-  @Override public String isBatteryCharging() {
+  @Override public boolean isBatteryCharging() {
     Context context = AppliverySdk.getApplicationContext();
     boolean isBatteryCharging = false;
     Intent batteryStatus = getBatteryStatus(context);
@@ -130,7 +130,7 @@ public class AndroidDeviceDetailsInfo implements DeviceDetailsInfo {
       isBatteryCharging = isBatteryCharging || plugged == BatteryManager.BATTERY_PLUGGED_WIRELESS;
     }
 
-    return String.valueOf(isBatteryCharging);
+    return isBatteryCharging;
   }
 
   @Override public String getNetworkConnectivity() {