Fix incompatibility with old prefs-libraries

iZettle · Jan 3, 2018 · 7bfac41 · 7bfac41
1 parent 3ab0839
commit 7bfac41
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/wrench-app/src/main/java/com/izettle/wrench/provider/WrenchProvider.java b/wrench-app/src/main/java/com/izettle/wrench/provider/WrenchProvider.java
@@ -255,6 +255,8 @@ public Uri insert(@NonNull Uri uri, ContentValues values) {
             case CURRENT_CONFIGURATIONS: {
                 Bolt bolt = Bolt.fromContentValues(values);
 
+                bolt = fixRCTypes(bolt);
+
                 WrenchConfiguration wrenchConfiguration = configurationDao.getWrenchConfiguration(callingApplication.id(), bolt.getKey());
 
                 if (wrenchConfiguration == null) {
@@ -290,6 +292,23 @@ public Uri insert(@NonNull Uri uri, ContentValues values) {
         return ContentUris.withAppendedId(uri, insertId);
     }
 
+    private Bolt fixRCTypes(Bolt bolt) {
+        switch (bolt.getType()) {
+            case "java.lang.String":
+                return bolt.copy(bolt.getId(), Bolt.TYPE.STRING, bolt.getKey(), bolt.getValue());
+            case "java.lang.Integer":
+                return bolt.copy(bolt.getId(), Bolt.TYPE.INTEGER, bolt.getKey(), bolt.getValue());
+            case "java.lang.Enum":
+                return bolt.copy(bolt.getId(), Bolt.TYPE.ENUM, bolt.getKey(), bolt.getValue());
+            case "java.lang.Boolean":
+                return bolt.copy(bolt.getId(), Bolt.TYPE.BOOLEAN, bolt.getKey(), bolt.getValue());
+            default: {
+                return bolt;
+            }
+
+        }
+    }
+
     @Override
     public int bulkInsert(@NonNull Uri uri, @NonNull ContentValues[] values) {
         WrenchApplication callingApplication = getCallingApplication(getContext(), applicationDao);