Merge branch 'update_wwwjdic' into 'master'

WWWJDIC for Android: Update to latest working version

Build, install and functionality tested. Seems the FinfAgent lib is not needed anymore as there is no FlurryAgent lib or any flurry* classes found.

The latest version 2.3.8 is crashing when clicking on an item in the settings dialog. Very likely an upstream bug, so just posting the stacktrace if some one wants to report it (don't have a google account)

```
E/ACRA    ( 1946): org.nick.wwwjdic fatal error : Unable to start activity ComponentInfo{org.nick.wwwjdic/org.nick.wwwjdic.WwwjdicPreferencesHC}: java.lang.RuntimeException: Subclasses of PreferenceActivity must override isValidFragment(String) to verify that the Fragment class is valid! org.nick.wwwjdic.WwwjdicPreferencesHC has not checked if fragment org.nick.wwwjdic.GenericPrefsFragment is valid.
E/ACRA    ( 1946): java.lang.RuntimeException: Unable to start activity ComponentInfo{org.nick.wwwjdic/org.nick.wwwjdic.WwwjdicPreferencesHC}: java.lang.RuntimeException: Subclasses of PreferenceActivity must override isValidFragment(String) to verify that the Fragment class is valid! org.nick.wwwjdic.WwwjdicPreferencesHC has not checked if fragment org.nick.wwwjdic.GenericPrefsFragment is valid.
E/ACRA    ( 1946): 	at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2195)
E/ACRA    ( 1946): 	at android.app.ActivityThread.handleLaunchActivity(ActivityThread.java:2245)
E/ACRA    ( 1946): 	at android.app.ActivityThread.access$800(ActivityThread.java:135)
E/ACRA    ( 1946): 	at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1196)
E/ACRA    ( 1946): 	at android.os.Handler.dispatchMessage(Handler.java:102)
E/ACRA    ( 1946): 	at android.os.Looper.loop(Looper.java:136)
E/ACRA    ( 1946): 	at android.app.ActivityThread.main(ActivityThread.java:5017)
E/ACRA    ( 1946): 	at java.lang.reflect.Method.invokeNative(Native Method)
E/ACRA    ( 1946): 	at java.lang.reflect.Method.invoke(Method.java:515)
E/ACRA    ( 1946): 	at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:779)
E/ACRA    ( 1946): 	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:595)
E/ACRA    ( 1946): 	at dalvik.system.NativeStart.main(Native Method)
E/ACRA    ( 1946): Caused by: java.lang.RuntimeException: Subclasses of PreferenceActivity must override isValidFragment(String) to verify that the Fragment class is valid! org.nick.wwwjdic.WwwjdicPreferencesHC has not checked if fragment org.nick.wwwjdic.GenericPrefsFragment is valid.
E/ACRA    ( 1946): 	at android.preference.PreferenceActivity.isValidFragment(PreferenceActivity.java:898)
E/ACRA    ( 1946): 	at android.preference.PreferenceActivity.switchToHeaderInner(PreferenceActivity.java:1179)
E/ACRA    ( 1946): 	at android.preference.PreferenceActivity.switchToHeader(PreferenceActivity.java:1199)
E/ACRA    ( 1946): 	at android.preference.PreferenceActivity.onCreate(PreferenceActivity.java:545)
E/ACRA    ( 1946): 	at org.nick.wwwjdic.WwwjdicPreferencesHC.onCreate(WwwjdicPreferencesHC.java:14)
E/ACRA    ( 1946): 	at android.app.Activity.performCreate(Activity.java:5231)
E/ACRA    ( 1946): 	at android.app.Instrumentation.callActivityOnCreate(Instrumentation.java:1087)
E/ACRA    ( 1946): 	at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2159)
E/ACRA    ( 1946): 	... 11 more
I/ACRA    ( 1946): Finishing the last Activity prior to killing the Process
I/ACRA    ( 1946): Finished class org.nick.wwwjdic.WwwjdicPreferencesHC
```

See merge request !506
This commit is contained in:
Boris Kraut 2015-01-18 16:08:02 +00:00
commit cd0acc2d7d
2 changed files with 43 additions and 0 deletions

View file

@ -33,6 +33,8 @@ to use all features.
A proprietary analytics library was removed before building, so the analytics A proprietary analytics library was removed before building, so the analytics
switch in the preferences isn't relevant. Anti-feature: Tracking. Crash switch in the preferences isn't relevant. Anti-feature: Tracking. Crash
reports are sent by default, though that can be disabled. reports are sent by default, though that can be disabled.
[https://code.google.com/p/wwwjdic/wiki/Changelog Changelog]
. .
Repo Type:git-svn Repo Type:git-svn
@ -114,6 +116,45 @@ Build:2.3.5,2350
update=.,../wwwjdic update=.,../wwwjdic
target=android-19 target=android-19
Build:2.3.7,2370
commit=1092
subdir=wwwjdic-app
init=rm build.xml
rm=wwwjdic/libs/*.jar,wwwjdic-android/war/WEB-INF/lib/*.jar
srclibs=ActionBarSherlock@4.4.0,ACRA@acra-4.5.0,OpenCSV-org@release-2.2
encoding=utf-8
extlibs=android/android-support-v4.jar
prebuild=wget https://wwwjdic.googlecode.com/svn/branches/2.0/wwwjdic-app/assets/radkfile-u-jis208.txt -P assets/ && \
touch assets/keys && \
mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' ../wwwjdic/project.properties && \
cp -fR $$ACRA$$/src/main/java/* ../wwwjdic/src && \
rm -rf $$OpenCSV-org$$/src/au/com/bytecode/opencsv/bean && \
cp -fR $$OpenCSV-org$$/src/* ../wwwjdic/src && \
mkdir src
update=.,../wwwjdic,../../srclib/ActionBarSherlock/actionbarsherlock
target=android-19
Build:2.3.8,2380
disable=App crash when clicking on a item in setting dialog. Upstream bug?
commit=1099
subdir=wwwjdic-app
init=rm build.xml
rm=wwwjdic/libs/*.jar,wwwjdic-android/war/WEB-INF/lib/*.jar
srclibs=ActionBarSherlock@4.4.0,ACRA@acra-4.5.0,OpenCSV-org@release-2.2
encoding=utf-8
extlibs=android/android-support-v4.jar
prebuild=wget https://wwwjdic.googlecode.com/svn/branches/2.0/wwwjdic-app/assets/radkfile-u-jis208.txt -P assets/ && \
touch assets/keys && \
mv libs/android-support-v4.jar $$ActionBarSherlock$$/libs/ && \
sed -i 's@\(android.library.reference.1=\).*@\1$$ActionBarSherlock$$@' ../wwwjdic/project.properties && \
cp -fR $$ACRA$$/src/main/java/* ../wwwjdic/src && \
rm -rf $$OpenCSV-org$$/src/au/com/bytecode/opencsv/bean && \
cp -fR $$OpenCSV-org$$/src/* ../wwwjdic/src && \
mkdir src
update=.,../wwwjdic,../../srclib/ActionBarSherlock/actionbarsherlock
target=android-19
Maintainer Notes: Maintainer Notes:
Note that all development is in branches/2.0, not trunk. Note that all development is in branches/2.0, not trunk.
. .

2
srclibs/OpenCSV-org.txt Normal file
View file

@ -0,0 +1,2 @@
Repo Type:git
Repo:http://git.code.sf.net/p/opencsv/source