diff --git a/.classpath b/.classpath index 9ba6b8726..323d9666c 100644 --- a/.classpath +++ b/.classpath @@ -8,5 +8,6 @@ - + + diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..d7c37e410 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +local.properties +bin +gen +.settings +*~ diff --git a/Android.mk b/Android.mk index a17c75e68..7184bd38b 100644 --- a/Android.mk +++ b/Android.mk @@ -6,6 +6,7 @@ LOCAL_STATIC_JAVA_LIBRARIES += libdom LOCAL_STATIC_JAVA_LIBRARIES += libio LOCAL_STATIC_JAVA_LIBRARIES += libjutf LOCAL_STATIC_JAVA_LIBRARIES += libjzlib +LOCAL_STATIC_JAVA_LIBRARIES += libhtmlcleaner LOCAL_MODULE_TAGS := eng @@ -24,6 +25,7 @@ LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libdom:libs/apache-mime4j-dom-0.7-SNAPSH LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libio:libs/commons-io-2.0.1.jar LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libjutf:libs/jutf7-1.0.1-SNAPSHOT.jar LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libjzlib:libs/jzlib-1.0.7.jar +LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libhtmlcleaner:libs/htmlcleaner-2.2.jar include $(BUILD_MULTI_PREBUILT) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index faf568c95..cdfe9b30b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,12 +1,12 @@ + + @@ -71,12 +73,21 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HTMLCLEANER_LICENSE b/HTMLCLEANER_LICENSE new file mode 100644 index 000000000..25c863f68 --- /dev/null +++ b/HTMLCLEANER_LICENSE @@ -0,0 +1,35 @@ +HtmlCleaner is distributed under BSD License. It gives the freedom for +anyone to use, explore, modify, and distribute HtmlCleaner, but without any +warranty. + + Copyright (c) 2006-2011, HtmlCleaner team. + All rights reserved. + + Redistribution and use of this software in source and binary forms, + with or without modification, are permitted provided that the + following conditions are met: + + * Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the + following disclaimer in the documentation and/or other + materials provided with the distribution. + + * The name of HtmlCleaner may not be used to endorse or promote + products derived from this software without specific prior + written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/ant.properties b/ant.properties new file mode 100644 index 000000000..cfc6e1ad4 --- /dev/null +++ b/ant.properties @@ -0,0 +1,23 @@ +# This file is used to override default values used by the Ant build system. +# +# This file must be checked in Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + +# Indicates whether an apk should be generated for each density. +split.density=false +java.encoding=utf8 +# Project target. +target=android-9 +extensible.libs.classpath=compile-only-libs diff --git a/assets/emoticons/24hours.gif b/assets/emoticons/24hours.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/airplane.gif b/assets/emoticons/airplane.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/angry.gif b/assets/emoticons/angry.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/annoy.gif b/assets/emoticons/annoy.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/apple.gif b/assets/emoticons/apple.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/appli01.gif b/assets/emoticons/appli01.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/appli02.gif b/assets/emoticons/appli02.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/aquarius.gif b/assets/emoticons/aquarius.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/aries.gif b/assets/emoticons/aries.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/art.gif b/assets/emoticons/art.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/atm.gif b/assets/emoticons/atm.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/bag.gif b/assets/emoticons/bag.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/ban.gif b/assets/emoticons/ban.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/banana.gif b/assets/emoticons/banana.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/bank.gif b/assets/emoticons/bank.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/bar.gif b/assets/emoticons/bar.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/baseball.gif b/assets/emoticons/baseball.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/basketball.gif b/assets/emoticons/basketball.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/bearing.gif b/assets/emoticons/bearing.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/beer.gif b/assets/emoticons/beer.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/bell.gif b/assets/emoticons/bell.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/bicycle.gif b/assets/emoticons/bicycle.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/birthday.gif b/assets/emoticons/birthday.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/bleah.gif b/assets/emoticons/bleah.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/bomb.gif b/assets/emoticons/bomb.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/book.gif b/assets/emoticons/book.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/bottle.gif b/assets/emoticons/bottle.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/boutique.gif b/assets/emoticons/boutique.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/bread.gif b/assets/emoticons/bread.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/bud.gif b/assets/emoticons/bud.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/building.gif b/assets/emoticons/building.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/bullettrain.gif b/assets/emoticons/bullettrain.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/bus.gif b/assets/emoticons/bus.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/by-d.gif b/assets/emoticons/by-d.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/cafe.gif b/assets/emoticons/cafe.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/cake.gif b/assets/emoticons/cake.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/camera.gif b/assets/emoticons/camera.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/cancer.gif b/assets/emoticons/cancer.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/capricornus.gif b/assets/emoticons/capricornus.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/car.gif b/assets/emoticons/car.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/carouselpony.gif b/assets/emoticons/carouselpony.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/cat.gif b/assets/emoticons/cat.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/catface.gif b/assets/emoticons/catface.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/cd.gif b/assets/emoticons/cd.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/chair.gif b/assets/emoticons/chair.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/cherry.gif b/assets/emoticons/cherry.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/cherryblossom.gif b/assets/emoticons/cherryblossom.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/chick.gif b/assets/emoticons/chick.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/clear.gif b/assets/emoticons/clear.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/clip.gif b/assets/emoticons/clip.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/clock.gif b/assets/emoticons/clock.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/cloud.gif b/assets/emoticons/cloud.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/clover.gif b/assets/emoticons/clover.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/club.gif b/assets/emoticons/club.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/coldsweats01.gif b/assets/emoticons/coldsweats01.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/coldsweats02.gif b/assets/emoticons/coldsweats02.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/confident.gif b/assets/emoticons/confident.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/copyright.gif b/assets/emoticons/copyright.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/crown.gif b/assets/emoticons/crown.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/crying.gif b/assets/emoticons/crying.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/cute.gif b/assets/emoticons/cute.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/d-point.gif b/assets/emoticons/d-point.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/danger.gif b/assets/emoticons/danger.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/dash.gif b/assets/emoticons/dash.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/delicious.gif b/assets/emoticons/delicious.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/denim.gif b/assets/emoticons/denim.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/despair.gif b/assets/emoticons/despair.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/diamond.gif b/assets/emoticons/diamond.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/dog.gif b/assets/emoticons/dog.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/dollar.gif b/assets/emoticons/dollar.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/door.gif b/assets/emoticons/door.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/down.gif b/assets/emoticons/down.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/downwardleft.gif b/assets/emoticons/downwardleft.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/downwardright.gif b/assets/emoticons/downwardright.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/drama.gif b/assets/emoticons/drama.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/ear.gif b/assets/emoticons/ear.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/eight.gif b/assets/emoticons/eight.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/empty.gif b/assets/emoticons/empty.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/end.gif b/assets/emoticons/end.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/enter.gif b/assets/emoticons/enter.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/event.gif b/assets/emoticons/event.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/eye.gif b/assets/emoticons/eye.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/eyeglass.gif b/assets/emoticons/eyeglass.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/fastfood.gif b/assets/emoticons/fastfood.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/faxto.gif b/assets/emoticons/faxto.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/fish.gif b/assets/emoticons/fish.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/five.gif b/assets/emoticons/five.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/flag.gif b/assets/emoticons/flag.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/flair.gif b/assets/emoticons/flair.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/foot.gif b/assets/emoticons/foot.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/four.gif b/assets/emoticons/four.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/free.gif b/assets/emoticons/free.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/freedial.gif b/assets/emoticons/freedial.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/fuji.gif b/assets/emoticons/fuji.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/full.gif b/assets/emoticons/full.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/fullmoon.gif b/assets/emoticons/fullmoon.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/game.gif b/assets/emoticons/game.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/gasstation.gif b/assets/emoticons/gasstation.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/gawk.gif b/assets/emoticons/gawk.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/gemini.gif b/assets/emoticons/gemini.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/golf.gif b/assets/emoticons/golf.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/good.gif b/assets/emoticons/good.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/hairsalon.gif b/assets/emoticons/hairsalon.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/happy01.gif b/assets/emoticons/happy01.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/happy02.gif b/assets/emoticons/happy02.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/heart.gif b/assets/emoticons/heart.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/heart01.gif b/assets/emoticons/heart01.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/heart02.gif b/assets/emoticons/heart02.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/heart03.gif b/assets/emoticons/heart03.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/heart04.gif b/assets/emoticons/heart04.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/horse.gif b/assets/emoticons/horse.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/hospital.gif b/assets/emoticons/hospital.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/hotel.gif b/assets/emoticons/hotel.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/house.gif b/assets/emoticons/house.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/id.gif b/assets/emoticons/id.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/impact.gif b/assets/emoticons/impact.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/info01.gif b/assets/emoticons/info01.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/info02.gif b/assets/emoticons/info02.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/japanesetea.gif b/assets/emoticons/japanesetea.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/karaoke.gif b/assets/emoticons/karaoke.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/key.gif b/assets/emoticons/key.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/kissmark.gif b/assets/emoticons/kissmark.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/leftright.gif b/assets/emoticons/leftright.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/leo.gif b/assets/emoticons/leo.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/libra.gif b/assets/emoticons/libra.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/loveletter.gif b/assets/emoticons/loveletter.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/lovely.gif b/assets/emoticons/lovely.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/mail.gif b/assets/emoticons/mail.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/mailto.gif b/assets/emoticons/mailto.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/maple.gif b/assets/emoticons/maple.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/memo.gif b/assets/emoticons/memo.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/mist.gif b/assets/emoticons/mist.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/mobaq.gif b/assets/emoticons/mobaq.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/mobilephone.gif b/assets/emoticons/mobilephone.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/moneybag.gif b/assets/emoticons/moneybag.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/moon1.gif b/assets/emoticons/moon1.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/moon2.gif b/assets/emoticons/moon2.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/moon3.gif b/assets/emoticons/moon3.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/motorsports.gif b/assets/emoticons/motorsports.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/movie.gif b/assets/emoticons/movie.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/music.gif b/assets/emoticons/music.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/new.gif b/assets/emoticons/new.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/newmoon.gif b/assets/emoticons/newmoon.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/ng.gif b/assets/emoticons/ng.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/night.gif b/assets/emoticons/night.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/nine.gif b/assets/emoticons/nine.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/noodle.gif b/assets/emoticons/noodle.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/nosmoking.gif b/assets/emoticons/nosmoking.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/note.gif b/assets/emoticons/note.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/notes.gif b/assets/emoticons/notes.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/ok.gif b/assets/emoticons/ok.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/on.gif b/assets/emoticons/on.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/one.gif b/assets/emoticons/one.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/paper.gif b/assets/emoticons/paper.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/parking.gif b/assets/emoticons/parking.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/pass.gif b/assets/emoticons/pass.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/pc.gif b/assets/emoticons/pc.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/pen.gif b/assets/emoticons/pen.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/pencil.gif b/assets/emoticons/pencil.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/penguin.gif b/assets/emoticons/penguin.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/phoneto.gif b/assets/emoticons/phoneto.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/pig.gif b/assets/emoticons/pig.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/pisces.gif b/assets/emoticons/pisces.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/pocketbell.gif b/assets/emoticons/pocketbell.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/postoffice.gif b/assets/emoticons/postoffice.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/pouch.gif b/assets/emoticons/pouch.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/pout.gif b/assets/emoticons/pout.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/present.gif b/assets/emoticons/present.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/punch.gif b/assets/emoticons/punch.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/r-mark.gif b/assets/emoticons/r-mark.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/rain.gif b/assets/emoticons/rain.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/recycle.gif b/assets/emoticons/recycle.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/restaurant.gif b/assets/emoticons/restaurant.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/ribbon.gif b/assets/emoticons/ribbon.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/riceball.gif b/assets/emoticons/riceball.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/ring.gif b/assets/emoticons/ring.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/rock.gif b/assets/emoticons/rock.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/rouge.gif b/assets/emoticons/rouge.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/run.gif b/assets/emoticons/run.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/rvcar.gif b/assets/emoticons/rvcar.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/sad.gif b/assets/emoticons/sad.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/sagittarius.gif b/assets/emoticons/sagittarius.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/sandclock.gif b/assets/emoticons/sandclock.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/school.gif b/assets/emoticons/school.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/scissors.gif b/assets/emoticons/scissors.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/scorpius.gif b/assets/emoticons/scorpius.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/search.gif b/assets/emoticons/search.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/secret.gif b/assets/emoticons/secret.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/seven.gif b/assets/emoticons/seven.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/shadow.gif b/assets/emoticons/shadow.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/sharp.gif b/assets/emoticons/sharp.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/shine.gif b/assets/emoticons/shine.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/ship.gif b/assets/emoticons/ship.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/shock.gif b/assets/emoticons/shock.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/shoe.gif b/assets/emoticons/shoe.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/sign01.gif b/assets/emoticons/sign01.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/sign02.gif b/assets/emoticons/sign02.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/sign03.gif b/assets/emoticons/sign03.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/sign04.gif b/assets/emoticons/sign04.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/sign05.gif b/assets/emoticons/sign05.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/signaler.gif b/assets/emoticons/signaler.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/six.gif b/assets/emoticons/six.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/ski.gif b/assets/emoticons/ski.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/slate.gif b/assets/emoticons/slate.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/sleepy.gif b/assets/emoticons/sleepy.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/smile.gif b/assets/emoticons/smile.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/smoking.gif b/assets/emoticons/smoking.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/snail.gif b/assets/emoticons/snail.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/snow.gif b/assets/emoticons/snow.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/snowboard.gif b/assets/emoticons/snowboard.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/soccer.gif b/assets/emoticons/soccer.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/soon.gif b/assets/emoticons/soon.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/spa.gif b/assets/emoticons/spa.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/spade.gif b/assets/emoticons/spade.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/sports.gif b/assets/emoticons/sports.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/sprinkle.gif b/assets/emoticons/sprinkle.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/subway.gif b/assets/emoticons/subway.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/sun.gif b/assets/emoticons/sun.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/sweat01.gif b/assets/emoticons/sweat01.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/sweat02.gif b/assets/emoticons/sweat02.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/t-shirt.gif b/assets/emoticons/t-shirt.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/taurus.gif b/assets/emoticons/taurus.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/telephone.gif b/assets/emoticons/telephone.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/tennis.gif b/assets/emoticons/tennis.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/think.gif b/assets/emoticons/think.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/three.gif b/assets/emoticons/three.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/thunder.gif b/assets/emoticons/thunder.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/ticket.gif b/assets/emoticons/ticket.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/tm.gif b/assets/emoticons/tm.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/toilet.gif b/assets/emoticons/toilet.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/train.gif b/assets/emoticons/train.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/tulip.gif b/assets/emoticons/tulip.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/tv.gif b/assets/emoticons/tv.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/two.gif b/assets/emoticons/two.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/typhoon.gif b/assets/emoticons/typhoon.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/up.gif b/assets/emoticons/up.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/updown.gif b/assets/emoticons/updown.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/upwardleft.gif b/assets/emoticons/upwardleft.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/upwardright.gif b/assets/emoticons/upwardright.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/virgo.gif b/assets/emoticons/virgo.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/watch.gif b/assets/emoticons/watch.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/wave.gif b/assets/emoticons/wave.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/weep.gif b/assets/emoticons/weep.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/wheelchair.gif b/assets/emoticons/wheelchair.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/wine.gif b/assets/emoticons/wine.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/wink.gif b/assets/emoticons/wink.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/wobbly.gif b/assets/emoticons/wobbly.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/wrench.gif b/assets/emoticons/wrench.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/xmas.gif b/assets/emoticons/xmas.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/yacht.gif b/assets/emoticons/yacht.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/yen.gif b/assets/emoticons/yen.gif old mode 100755 new mode 100644 diff --git a/assets/emoticons/zero.gif b/assets/emoticons/zero.gif old mode 100755 new mode 100644 diff --git a/build.properties b/build.properties deleted file mode 100644 index 7b7f4a0a4..000000000 --- a/build.properties +++ /dev/null @@ -1,2 +0,0 @@ -application-package=com.fsck.k9 -target=android-9 diff --git a/build.xml b/build.xml index 327b46f4d..04502dfc8 100644 --- a/build.xml +++ b/build.xml @@ -1,15 +1,14 @@ - - + + - - + - - + - - - - - - + + - - - - - - - - - - - - Building version number ${version-name} + + - - Setting version to ${version-name} - You can't set the version without passing -Dversion-name=1.234 - - - - - - - + - - Bumping K-9 to ${version-name} - + To customize existing targets, there are two options: + - Customize only one target: + - copy/paste the target into this file, *before* the + task. + - customize it to your needs. + - Customize the whole content of build.xml + - copy/paste the content of the rules files (minus the top node) + into this file, replacing the task. + - customize to your needs. - - - - - - - - - - - - - - + *********************** + ****** IMPORTANT ****** + *********************** + In all cases you must update the value of version-tag below to read 'custom' instead of an integer, + in order to avoid having your file be overridden by tools such as "android update project" + --> + + + + + + + + + + + + + + Building version number ${version-name} + + + + + + + Building version number ${version-name} + + + + Setting version to ${version-name} + You can't set the version without passing -Dversion-name=1.234 + + + + + + + + + + + Bumping K-9 to ${version-name} + + + + + + + + + + + + + + + + - - Creating library ${rclib} for remote control - applications - - + + Creating library ${rclib} for remote control applications + - Uploading to Google Code using Google::Code::Upload - + @@ -125,7 +159,7 @@ - + Installing ${out.debug.file} onto default emulator... @@ -134,12 +168,20 @@ + + + Reinstalling ${out.debug.file} onto default emulator... + + + + + + - - + @@ -159,27 +201,16 @@ bump-version: ant -Dversion-name=3.123 Bumps the project version to 3.123,tags and commits it astyle: Make K-9's source look like it's supposed to + eclipse: Apply template Eclipse settings + + + + + + - - - + + diff --git a/compile-only-libs/mockito-all-1.8.5.jar b/compile-only-libs/mockito-all-1.8.5.jar new file mode 100644 index 000000000..4b0395ed8 Binary files /dev/null and b/compile-only-libs/mockito-all-1.8.5.jar differ diff --git a/docs/activity_diagram.graphml b/docs/activity_diagram.graphml new file mode 100644 index 000000000..a2f1a4216 --- /dev/null +++ b/docs/activity_diagram.graphml @@ -0,0 +1,936 @@ + + + + + + + + + + + + + + + + + + + + + + + Accounts + + + + + + + + + + + FolderList + + + + + + + + + + + MessageList + + + + + + + + + + + MessageView + + + + + + + + + + + AccountSettings + + + + + + + + + + + AccountSetupIncoming + + + + + + + + + + + AccountSetupOutgoing + + + + + + + + + + + Prefs + + + + + + + + + + + FontSizeSettings + + + + + + + + + + + AccountSetupOptions + + + + + + + + + + + AccountSetupNames + + + + + + + + + + + AccountSetupComposition + + + + + + + + + + + AccountSetupCheckSettings + + + + + + + + + + + AccountSetupBasics + + + + + + + + + + + AccountSetupAccountType + + + + + + + + + + + FolderSettings + + + + + + + + + + + ChooseAccount + + + + + + + + + + + ChooseFolder + + + + + + + + + + + ChooseIdentity + + + + + + + + + + + EditIdentity + + + + + + + + + + + LauncherShortcuts + + + + + + + + + + + ManageIdentities + + + + + + + + + + + MessageCompose + + + + + + + + + + + Other Apps / OS + + + + + + + + + + + Search + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/k9mail.iml b/k9mail.iml index 1f9d13dd0..1d380b11c 100644 --- a/k9mail.iml +++ b/k9mail.iml @@ -19,6 +19,7 @@