Merge pull request getodk#3219 from lognaturel/proguard-prototype

Add proguard rule for action package to enable serialization
ceduardodch · Jul 18, 2019 · ffd268b · ffd268b
2 parents 7f00621 + a763fec
commit ffd268b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/collect_app/proguard-rules.txt b/collect_app/proguard-rules.txt
@@ -7,6 +7,7 @@
 -dontwarn com.rarepebble.**
 
 -keep class org.javarosa.**
+-keep class org.odk.collect.android.logic.actions.**
 -keep class android.support.v7.widget.** { *; }
 -keep class com.google.android.gms.internal.firebase-perf.** { *; }
 

diff --git a/collect_app/src/main/java/org/odk/collect/android/logic/FormController.java b/collect_app/src/main/java/org/odk/collect/android/logic/FormController.java
@@ -130,6 +130,7 @@ public static synchronized void initializeJavaRosa(IPropertyManager mgr) {
             PrototypeManager.registerPrototypes(CoreModelModule.classNames);
             new XFormsModule().registerModule();
 
+            // When registering prototypes from Collect, a proguard exception also needs to be added
             PrototypeManager.registerPrototype("org.odk.collect.android.logic.actions.setgeopoint.CollectSetGeopointAction");
             XFormParser.registerActionHandler(CollectSetGeopointActionHandler.ELEMENT_NAME, new CollectSetGeopointActionHandler());