From e6fdbea0f85cdab59640f41e6365875d26880810 Mon Sep 17 00:00:00 2001 From: Damyan Ivanov Date: Thu, 17 Sep 2020 07:25:04 +0000 Subject: [PATCH] fix storing/retrieval of currency position no need of trickery. standard enum has it all --- .../net/ktnx/mobileledger/model/Currency.java | 18 +----------------- .../model/MobileLedgerProfile.java | 4 ++-- 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/net/ktnx/mobileledger/model/Currency.java b/app/src/main/java/net/ktnx/mobileledger/model/Currency.java index f332f001..5f488e28 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/Currency.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/Currency.java @@ -119,22 +119,6 @@ public class Currency { this.hasGap = hasGap; } public enum Position { - before(-1), after(1), unknown(0), none(-2); - Position(int value) { - } - static Position valueOf(int value) { - switch (value) { - case -1: - return before; - case +1: - return after; - case 0: - return unknown; - case -2: - return none; - default: - throw new IllegalStateException(String.format("Unexpected value (%d)", value)); - } - } + before, after, unknown, none } } diff --git a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java index 229e5348..4ac99fe1 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/MobileLedgerProfile.java @@ -527,7 +527,7 @@ public final class MobileLedgerProfile { { while (c.moveToNext()) { Currency currency = new Currency(c.getInt(0), c.getString(1), - Currency.Position.valueOf(c.getInt(2)), c.getInt(3) == 1); + Currency.Position.valueOf(c.getString(2)), c.getInt(3) == 1); result.add(currency); } } @@ -548,7 +548,7 @@ public final class MobileLedgerProfile { { if (cursor.moveToFirst()) { return new Currency(cursor.getInt(0), cursor.getString(1), - Currency.Position.valueOf(cursor.getInt(2)), cursor.getInt(3) == 1); + Currency.Position.valueOf(cursor.getString(2)), cursor.getInt(3) == 1); } return null; } -- 2.39.2