From c746a2768aab84cef79199785ed325bd4bd00a7b Mon Sep 17 00:00:00 2001 From: Sergey Solovyev Date: Sun, 18 Nov 2012 17:59:39 +0400 Subject: [PATCH] Changes --- .../android/calculator/model/AFunction.java | 2 +- calculatorpp/proguard.cfg | 19 ++++++++++++++++++- .../calculator/CalculatorApplication.java | 2 +- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/AFunction.java b/calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/AFunction.java index 1e2c8a4d..6ee10a7b 100644 --- a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/AFunction.java +++ b/calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/AFunction.java @@ -54,7 +54,7 @@ public class AFunction implements IFunction, MathPersistenceEntity, Serializable @NotNull private String content; - @ElementList + @ElementList(type = String.class) @NotNull private List parameterNames = new ArrayList(); diff --git a/calculatorpp/proguard.cfg b/calculatorpp/proguard.cfg index 2b2b7cfb..796ed57d 100644 --- a/calculatorpp/proguard.cfg +++ b/calculatorpp/proguard.cfg @@ -63,7 +63,24 @@ -dontwarn com.google.common.collect.MinMaxPriorityQueue -keep class org.simpleframework.xml.** { *; } --keep class * implements org.solovyev.android.calculator.model.MathPersistenceEntity +-keep class * implements org.solovyev.android.calculator.model.MathPersistenceEntity +-keep class * implements org.solovyev.android.calculator.MathEntityPersistenceContainer + +# +#********************************************************************* +# +# LOGS +# +#********************************************************************* +# + +-assumenosideeffects class android.util.Log { + public static int v(...); + public static int d(...); + public static int i(...); + public static int w(...); + public static int e(...); +} # #********************************************************************* diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java index fb0ce759..cb6462f8 100644 --- a/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java +++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java @@ -22,7 +22,7 @@ import org.solovyev.android.calculator.widget.CalculatorWidgetHelper; /*@ReportsCrashes(formKey = "dEhDaW1nZU1qcFdsVUpiSnhON0c0ZHc6MQ", mode = ReportingInteractionMode.TOAST)*/ @ReportsCrashes(formKey = "", - mailTo = "se.solovyev+programming+calculatorpp+crashes@gmail.com", + mailTo = "se.solovyev+programming+calculatorpp+crashes+1.5.0b@gmail.com", mode = ReportingInteractionMode.DIALOG, resToastText = R.string.crashed, resDialogTitle = R.string.crash_dialog_title,