TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes

Browse Source
This commit is contained in:
Sergey Solovyev 2012-11-18 17:59:39 +04:00
parent fa7904c1cd
commit c746a2768a
3 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calculatorpp-core/src/main/java/org/solovyev/android/calculator/model/AFunction.java
View File

@ -54,7 +54,7 @@ public class AFunction implements IFunction, MathPersistenceEntity, Serializable
@NotNull @NotNull
private String content; private String content;
@ElementList @ElementList(type = String.class)
@NotNull @NotNull
private List<String> parameterNames = new ArrayList<String>(); private List<String> parameterNames = new ArrayList<String>();

17
calculatorpp/proguard.cfg
View File

@ -64,6 +64,23 @@
-keep class org.simpleframework.xml.** { *; } -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(...);
}
# #
#********************************************************************* #*********************************************************************

2
calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorApplication.java
View File

@ -22,7 +22,7 @@ import org.solovyev.android.calculator.widget.CalculatorWidgetHelper;
/*@ReportsCrashes(formKey = "dEhDaW1nZU1qcFdsVUpiSnhON0c0ZHc6MQ", /*@ReportsCrashes(formKey = "dEhDaW1nZU1qcFdsVUpiSnhON0c0ZHc6MQ",
mode = ReportingInteractionMode.TOAST)*/ mode = ReportingInteractionMode.TOAST)*/
@ReportsCrashes(formKey = "", @ReportsCrashes(formKey = "",
mailTo = "se.solovyev+programming+calculatorpp+crashes@gmail.com", mailTo = "se.solovyev+programming+calculatorpp+crashes+1.5.0b@gmail.com",
mode = ReportingInteractionMode.DIALOG, mode = ReportingInteractionMode.DIALOG,
resToastText = R.string.crashed, resToastText = R.string.crashed,
resDialogTitle = R.string.crash_dialog_title, resDialogTitle = R.string.crash_dialog_title,