#70[1h]. Move from int to long.

Evgenii Kanivets · Evgenii Kanivets · commit 6020d1cff012 · 2016-12-07T22:12:12.000+02:00
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/base/BaseEntity.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/base/BaseEntity.java
@@ -19,12 +19,12 @@ protected boolean equals(String str1, String str2) {
         else return str1.equals(str2);
     }
 
-    protected int getInteger(double value) {
-        return (int) value;
+    protected long getLong(double value) {
+        return (long) value;
     }
 
-    protected int getDecimal(double value) {
+    protected long getDecimal(double value) {
         // Strange calculation because of double type precision issue
-        return  (int) Math.round(value * 100 - getInteger(value) * 100);
+        return  (long) Math.round(value * 100 - getLong(value) * 100);
     }
 }
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Account.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Account.java
@@ -13,11 +13,11 @@
  */
 public class Account extends BaseEntity implements Parcelable {
     private final String title;
-    private int curSum;
+    private long curSum;
     private final String currency;
-    private int decimals;
+    private long decimals;
 
-    public Account(long id, String title, int curSum, String currency, int decimals) {
+    public Account(long id, String title, long curSum, String currency, long decimals) {
         this.id = id;
         this.title = title;
         this.curSum = curSum;
@@ -29,16 +29,16 @@ public Account(String title, double curSum, String currency) {
         this.id = -1;
         this.title = title;
         this.currency = currency;
-        this.curSum = getInteger(curSum);
+        this.curSum = getLong(curSum);
         this.decimals = getDecimal(curSum);
     }
 
     protected Account(Parcel in) {
         id = in.readLong();
         title = in.readString();
-        curSum = in.readInt();
+        curSum = in.readLong();
         currency = in.readString();
-        decimals = in.readInt();
+        decimals = in.readLong();
     }
 
     public static final Creator<Account> CREATOR = new Creator<Account>() {
@@ -57,11 +57,11 @@ public String getTitle() {
         return title;
     }
 
-    public int getCurSum() {
+    public long getCurSum() {
         return curSum;
     }
 
-    public int getDecimals() {
+    public long getDecimals() {
         return decimals;
     }
 
@@ -76,14 +76,14 @@ public String getCurrency() {
     public void put(double amount) {
         double sum = curSum + decimals / 100.0;
         sum += amount;
-        curSum = getInteger(sum);
+        curSum = getLong(sum);
         decimals = getDecimal(sum);
     }
 
     public void take(double amount) {
         double sum = curSum + decimals / 100.0;
         sum -= amount;
-        curSum = getInteger(sum);
+        curSum = getLong(sum);
         decimals = getDecimal(sum);
     }
 
@@ -124,8 +124,8 @@ public int describeContents() {
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeLong(id);
         dest.writeString(title);
-        dest.writeInt(curSum);
+        dest.writeLong(curSum);
         dest.writeString(currency);
-        dest.writeInt(decimals);
+        dest.writeLong(decimals);
     }
 }
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Record.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Record.java
@@ -19,13 +19,13 @@ public class Record extends BaseEntity implements Parcelable {
     private final int type;
     private final String title;
     private final Category category;
-    private final int price;
+    private final long price;
     private final Account account;
     private final String currency;
-    private final int decimals;
+    private final long decimals;
 
-    public Record(long id, long time, int type, String title, long categoryId, int price,
-                  long accountId, String currency, int decimals) {
+    public Record(long id, long time, int type, String title, long categoryId, long price,
+                  long accountId, String currency, long decimals) {
         this.id = id;
         this.time = time;
         this.type = type;
@@ -37,8 +37,8 @@ public Record(long id, long time, int type, String title, long categoryId, int p
         this.decimals = decimals;
     }
 
-    public Record(long id, long time, int type, String title, Category category, int price,
-                  Account account, String currency, int decimals) {
+    public Record(long id, long time, int type, String title, Category category, long price,
+                  Account account, String currency, long decimals) {
         this.id = id;
         this.time = time;
         this.type = type;
@@ -59,7 +59,7 @@ public Record(long id, long time, int type, String title, Category category, dou
         this.category = category;
         this.account = account;
         this.currency = currency;
-        this.price = getInteger(price);
+        this.price = getLong(price);
         this.decimals = getDecimal(price);
     }
 
@@ -72,7 +72,7 @@ public Record(long time, int type, String title, Category category, double price
         this.category = category;
         this.account = account;
         this.currency = currency;
-        this.price = getInteger(price);
+        this.price = getLong(price);
         this.decimals = getDecimal(price);
     }
 
@@ -82,10 +82,10 @@ protected Record(Parcel in) {
         type = in.readInt();
         title = in.readString();
         category = in.readParcelable(Category.class.getClassLoader());
-        price = in.readInt();
+        price = in.readLong();
         account = in.readParcelable(Account.class.getClassLoader());
         currency = in.readString();
-        decimals = in.readInt();
+        decimals = in.readLong();
     }
 
     public static final Creator<Record> CREATOR = new Creator<Record>() {
@@ -118,11 +118,11 @@ public Category getCategory() {
         return category;
     }
 
-    public int getPrice() {
+    public long getPrice() {
         return price;
     }
 
-    public int getDecimals() {
+    public long getDecimals() {
         return decimals;
     }
 
@@ -210,9 +210,9 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeInt(type);
         dest.writeString(title);
         dest.writeParcelable(category, 0);
-        dest.writeInt(price);
+        dest.writeLong(price);
         dest.writeParcelable(account, 0);
         dest.writeString(currency);
-        dest.writeInt(decimals);
+        dest.writeLong(decimals);
     }
 }
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Transfer.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/entity/data/Transfer.java
@@ -15,13 +15,13 @@ public class Transfer extends BaseEntity implements Parcelable {
     private final long time;
     private final long fromAccountId;
     private final long toAccountId;
-    private final int fromAmount;
-    private final int toAmount;
-    private final int fromDecimals;
-    private final int toDecimals;
+    private final long fromAmount;
+    private final long toAmount;
+    private final long fromDecimals;
+    private final long toDecimals;
 
-    public Transfer(long id, long time, long fromAccountId, long toAccountId, int fromAmount,
-                    int toAmount, int fromDecimals, int toDecimals) {
+    public Transfer(long id, long time, long fromAccountId, long toAccountId, long fromAmount,
+                    long toAmount, long fromDecimals, long toDecimals) {
         this.fromDecimals = fromDecimals;
         this.toDecimals = toDecimals;
         this.id = id;
@@ -36,20 +36,20 @@ public Transfer(long time, long fromAccountId, long toAccountId, double fromAmou
         this.time = time;
         this.fromAccountId = fromAccountId;
         this.toAccountId = toAccountId;
-        this.fromAmount = getInteger(fromAmount);
+        this.fromAmount = getLong(fromAmount);
         this.fromDecimals = getDecimal(fromAmount);
-        this.toAmount = getInteger(toAmount);
+        this.toAmount = getLong(toAmount);
         this.toDecimals = getDecimal(toAmount);
     }
 
     protected Transfer(Parcel in) {
         time = in.readLong();
         fromAccountId = in.readLong();
         toAccountId = in.readLong();
-        fromAmount = in.readInt();
-        toAmount = in.readInt();
-        fromDecimals = in.readInt();
-        toDecimals = in.readInt();
+        fromAmount = in.readLong();
+        toAmount = in.readLong();
+        fromDecimals = in.readLong();
+        toDecimals = in.readLong();
     }
 
     public static final Creator<Transfer> CREATOR = new Creator<Transfer>() {
@@ -81,19 +81,19 @@ public long getToAccountId() {
         return toAccountId;
     }
 
-    public int getFromAmount() {
+    public long getFromAmount() {
         return fromAmount;
     }
 
-    public int getToAmount() {
+    public long getToAmount() {
         return toAmount;
     }
 
-    public int getFromDecimals() {
+    public long getFromDecimals() {
         return fromDecimals;
     }
 
-    public int getToDecimals() {
+    public long getToDecimals() {
         return toDecimals;
     }
 
@@ -148,9 +148,9 @@ public void writeToParcel(Parcel dest, int flags) {
         dest.writeLong(time);
         dest.writeLong(fromAccountId);
         dest.writeLong(toAccountId);
-        dest.writeInt(fromAmount);
-        dest.writeInt(toAmount);
-        dest.writeInt(fromDecimals);
-        dest.writeInt(toDecimals);
+        dest.writeLong(fromAmount);
+        dest.writeLong(toAmount);
+        dest.writeLong(fromDecimals);
+        dest.writeLong(toDecimals);
     }
-}
+}
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/data/AccountRepo.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/data/AccountRepo.java
@@ -65,9 +65,9 @@ protected List<Account> getListFromCursor(@Nullable Cursor cursor) {
                 // Read a account from DB
                 Account account = new Account(cursor.getLong(idColIndex),
                         cursor.getString(titleColIndex),
-                        cursor.getInt(curSumColIndex),
+                        cursor.getLong(curSumColIndex),
                         cursor.getString(currencyColIndex),
-                        cursor.getInt(decimalsColIndex));
+                        cursor.getLong(decimalsColIndex));
 
                 accountList.add(account);
             } while (cursor.moveToNext());
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/data/RecordRepo.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/data/RecordRepo.java
@@ -75,15 +75,15 @@ protected List<Record> getListFromCursor(Cursor cursor) {
                         cursor.getInt(typeColIndex),
                         cursor.getString(titleColIndex),
                         cursor.getLong(categoryColIndex),
-                        cursor.getInt(priceColIndex),
+                        cursor.getLong(priceColIndex),
                         cursor.getLong(accountIdColIndex),
                         cursor.getString(currencyColIndex),
-                        cursor.getInt(decimalsColIndex));
+                        cursor.getLong(decimalsColIndex));
 
                 recordList.add(record);
             } while (cursor.moveToNext());
         }
 
         return recordList;
     }
-}
+}
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/data/TransferRepo.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/repo/data/TransferRepo.java
@@ -73,10 +73,10 @@ protected List<Transfer> getListFromCursor(@Nullable Cursor cursor) {
                         cursor.getLong(idColTime),
                         cursor.getLong(idColFromAccountId),
                         cursor.getLong(idColToAccountId),
-                        cursor.getInt(idColFromAmount),
-                        cursor.getInt(idColToAmount),
-                        cursor.getInt(idColDecimalsFrom),
-                        cursor.getInt(idColDecimalsTo));
+                        cursor.getLong(idColFromAmount),
+                        cursor.getLong(idColToAmount),
+                        cursor.getLong(idColDecimalsFrom),
+                        cursor.getLong(idColDecimalsTo));
 
                 accountList.add(account);
             } while (cursor.moveToNext());
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/AccountValidator.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/AccountValidator.java
@@ -65,7 +65,13 @@ public Account validate() {
             valid = false;
         }
 
-        if (Math.abs(initSum) > Integer.MAX_VALUE) {
+        if (initSum == Double.MAX_VALUE) {
+            tilInitSum.setError(context.getString(R.string.field_cant_be_empty));
+            initSum = 0;
+            valid = false;
+        }
+
+        if (Math.abs(initSum) > MAX_ABS_VALUE) {
             tilInitSum.setError(context.getString(R.string.too_rich));
             valid = false;
         }
diff --git a/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/IValidator.java b/app/src/main/java/com/blogspot/e_kanivets/moneytracker/util/validator/IValidator.java
@@ -10,6 +10,8 @@
  */
 
 public interface IValidator<T> {
+    long MAX_ABS_VALUE = Integer.MAX_VALUE * 1024L;
+
     /**
      * @return instance of class T if validation passed or null otherwise
      */

Original file line number	Diff line number	Diff line change
`@@ -19,12 +19,12 @@ protected boolean equals(String str1, String str2) {`
`19`	`19`	`else return str1.equals(str2);`
`20`	`20`	`}`
`21`	`21`
`22`		`- protected int getInteger(double value) {`
`23`		`- return (int) value;`
	`22`	`+ protected long getLong(double value) {`
	`23`	`+ return (long) value;`
`24`	`24`	`}`
`25`	`25`
`26`		`- protected int getDecimal(double value) {`
	`26`	`+ protected long getDecimal(double value) {`
`27`	`27`	`// Strange calculation because of double type precision issue`
`28`		`- return (int) Math.round(value * 100 - getInteger(value) * 100);`
	`28`	`+ return (long) Math.round(value * 100 - getLong(value) * 100);`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,13 @@ public Account validate() {`
`65`	`65`	`valid = false;`
`66`	`66`	`}`
`67`	`67`
`68`		`- if (Math.abs(initSum) > Integer.MAX_VALUE) {`
	`68`	`+ if (initSum == Double.MAX_VALUE) {`
	`69`	`+ tilInitSum.setError(context.getString(R.string.field_cant_be_empty));`
	`70`	`+ initSum = 0;`
	`71`	`+ valid = false;`
	`72`	`+ }`
	`73`	`+`
	`74`	`+ if (Math.abs(initSum) > MAX_ABS_VALUE) {`
`69`	`75`	`tilInitSum.setError(context.getString(R.string.too_rich));`
`70`	`76`	`valid = false;`
`71`	`77`	`}`