Fixed transfers ratio crash

DSteve595 · Aug 8, 2014 · 6f9d6dc · 6f9d6dc
1 parent 5974426
commit 6f9d6dc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -22,8 +22,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 19
-        versionCode 67
-        versionName '2.0.1'
+        versionCode 68
+        versionName '2.0.2'
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7

diff --git a/app/src/main/java/com/stevenschoen/putionew/PutioTransferLayout.java b/app/src/main/java/com/stevenschoen/putionew/PutioTransferLayout.java
@@ -9,7 +9,7 @@ public class PutioTransferLayout implements Parcelable {
 	public String name;
 	public long downSpeed;
 	public long upSpeed;
-    public String ratio;
+    public float ratio;
 	public int percentDone;
 	public String status;
 
@@ -35,7 +35,7 @@ private void readFromParcel(Parcel in) {
 		this.name = in.readString();
 		this.downSpeed = in.readLong();
 		this.upSpeed = in.readLong();
-        this.ratio = in.readString();
+        this.ratio = in.readFloat();
 		this.percentDone = in.readInt();
 		this.status = in.readString();
 	}
@@ -45,7 +45,7 @@ public void writeToParcel(Parcel out, int flags) {
 		out.writeString(this.name);
 		out.writeLong(this.downSpeed);
 		out.writeLong(this.upSpeed);
-        out.writeString(this.ratio);
+        out.writeFloat(this.ratio);
 		out.writeInt(this.percentDone);
 		out.writeString(this.status);
 	}

diff --git a/app/src/main/java/com/stevenschoen/putionew/TransfersAdapter.java b/app/src/main/java/com/stevenschoen/putionew/TransfersAdapter.java
@@ -81,7 +81,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
                 holder.textMessage.setVisibility(View.GONE);
                 holder.downHolder.setVisibility(View.GONE);
                 holder.upHolder.setVisibility(View.VISIBLE);
-                if (Float.valueOf(transfer.ratio) != 0) {
+                if (transfer.ratio != 0) {
                     holder.textRatio.setText(getContext().getString(R.string.ratio_is, transfer.ratio));
                     holder.ratioHolder.setVisibility(View.VISIBLE);
                 } else {

diff --git a/app/src/main/java/com/stevenschoen/putionew/model/transfers/PutioTransferData.java b/app/src/main/java/com/stevenschoen/putionew/model/transfers/PutioTransferData.java
@@ -11,7 +11,7 @@ public class PutioTransferData implements Parcelable {
 	public String estimatedTime;
 	public String createdTime;
 	public boolean extract;
-    public String currentRatio;
+    public float currentRatio;
 	public long downSpeed;
 	public long upSpeed;
 	public int percentDone;
@@ -36,7 +36,7 @@ private void readFromParcel(Parcel in) {
 		this.estimatedTime = in.readString();
 		this.createdTime = in.readString();
 		this.extract = (Boolean) in.readValue(ClassLoader.getSystemClassLoader());
-        this.currentRatio = in.readString();
+        this.currentRatio = in.readFloat();
 		this.downSpeed = in.readLong();
 		this.upSpeed = in.readLong();
 		this.percentDone = in.readInt();
@@ -54,7 +54,7 @@ public void writeToParcel(Parcel out, int flags) {
 		out.writeString(this.estimatedTime);
 		out.writeString(this.createdTime);
 		out.writeValue(this.extract);
-        out.writeString(this.currentRatio);
+        out.writeFloat(this.currentRatio);
 		out.writeLong(this.downSpeed);
 		out.writeLong(this.upSpeed);
 		out.writeInt(this.percentDone);