diff --git a/.gitignore b/.gitignore index 64134ea8..a0253d7c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +assets/ /external/bin/ /external/include/ /external/*-build-stamp @@ -9,8 +10,13 @@ bin gen native +libs/jtorctl.jar local.properties builds /patches/* obj releases + +# ant build products +build.xml +proguard-project.txt diff --git a/.gitmodules b/.gitmodules index a7b1599f..732052d7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,30 +1,40 @@ [submodule "external/tor"] path = external/tor url = https://git.torproject.org/git/tor.git + ignore = dirty [submodule "external/libevent"] path = external/libevent url = https://github.com/libevent/libevent.git + ignore = dirty [submodule "external/jtorctl"] path = external/jtorctl url = https://github.com/guardianproject/jtorctl + ignore = dirty [submodule "external/openssl"] path = external/openssl url = git://git.openssl.org/openssl + ignore = dirty [submodule "external/iptables"] path = external/iptables url = git://git.netfilter.org/iptables + ignore = dirty [submodule "external/superuser-commands"] path = external/superuser-commands url = https://github.com/dschuermann/superuser-commands.git + ignore = dirty [submodule "external/polipo"] path = external/polipo url = https://github.com/jech/polipo.git + ignore = dirty [submodule "external/badvpn"] path = external/badvpn url = https://github.com/guardianproject/badvpn.git + ignore = dirty [submodule "external/pluto"] path = external/pluto url = https://github.com/guardianproject/pluto.git + ignore = dirty [submodule "external/jsocks"] path = external/jsocks url = https://github.com/guardianproject/jsocks.git + ignore = dirty diff --git a/BUILD b/BUILD index bd535871..196dc636 100644 --- a/BUILD +++ b/BUILD @@ -27,7 +27,7 @@ Be sure that you have all of the git submodules up-to-date: To begin building, from the Orbot root directory, you first need to build all external C/native dependencies: - export NDK_BASE={PATH TO YOUR NDK INSTALL} + export ANDROID_NDK_HOME={PATH TO YOUR NDK INSTALL} make -C external At this point, you'll have Tor and Polipo binaries that can be run on an @@ -54,7 +54,7 @@ into < 1M chunks because some Android devices don't like resources larger than Now build the Android app - ./update-ant-build + ./setup-ant ant release This will produce an unsigned Tor package in ./bin/Orbot-unsigned.apk! diff --git a/compare-to-official-release b/compare-to-official-release new file mode 100755 index 00000000..8e3a3003 --- /dev/null +++ b/compare-to-official-release @@ -0,0 +1,62 @@ +#!/bin/sh + +if [ $# -ne 2 ]; then + echo "Usage: $0 /path/to/Orbot-v15.0.1.apk /another/Orbot-v15.0.1.apk" + exit 1 +fi + +set -e +set -x + +test -e "$1" +test -e "$2" + +tmpdir=`mktemp -d /tmp/.compare-apks.XXXXXXXXXX` +apk1=$(basename $1) +apk2=$(basename $2) +sourcedir1=$(cd `dirname $1` && pwd) +sourcedir2=$(cd `dirname $2` && pwd) +apkname1=`echo $apk1 | sed 's,\.apk$,,'` +apkname2=`echo $apk2 | sed 's,\.apk$,,'` +dir1=$tmpdir/`echo $(dirname $1) | sed 's,[/ ],_,g'`-$apkname1 +dir2=$tmpdir/`echo $(dirname $2) | sed 's,[/ ],_,g'`-$apkname2 + +mkdir -p $dir1/zip +cd $dir1/zip +unzip "$sourcedir1/$apk1" +cd .. +apktool d --no-res --no-src "$sourcedir1/$apk1" +mv "$apkname1" apktool +# strip the full path to the zip for the comparison +unzip -l "$sourcedir1/$apk1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/unzip-l.txt +unzip -lv "$sourcedir1/$apk1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/unzip-lv.txt +zipinfo -lv "$sourcedir1/$apk1" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir1/zipinfo-lv.txt +xxd "$sourcedir1/$apk1" > $dir1/xxd +for f in $dir1/zip/assets/*/*; do + xxd $f > $dir1/xxd-$(basename $f) +done + +mkdir -p $dir2/zip +cd $dir2/zip +unzip "$sourcedir2/$apk2" +cd .. +apktool d --no-res --no-src "$sourcedir2/$apk2" +mv "$apkname2" apktool +# strip the full path to the zip for the comparison +unzip -l "$sourcedir2/$apk2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/unzip-l.txt +unzip -lv "$sourcedir2/$apk2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/unzip-lv.txt +zipinfo -lv "$sourcedir2/$apk2" | sed 's,^\(Archive:\s\s*\)/.*/,\1,' > $dir2/zipinfo-lv.txt +xxd "$sourcedir2/$apk2" > $dir2/xxd +for f in $dir2/zip/assets/*/*; do + xxd $f > $dir2/xxd-$(basename $f) +done + +if which meld > /dev/null; then + meld $dir1 $dir2 +elif which opendiff > /dev/null; then + opendiff $dir1 $dir2 +else + echo "ERROR: meld or opendiff required for the comparison!" +fi + +rm -rf $dir1 $dir2 diff --git a/custom_rules.xml b/custom_rules.xml new file mode 100644 index 00000000..5f473de4 --- /dev/null +++ b/custom_rules.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/external/Makefile b/external/Makefile index 39752e32..c4b91b22 100644 --- a/external/Makefile +++ b/external/Makefile @@ -22,7 +22,7 @@ else endif # Android NDK setup -NDK_BASE ?= /opt/android-ndk +ANDROID_NDK_HOME ?= /opt/android-ndk NDK_PLATFORM_LEVEL ?= 16 NDK_TOOLCHAIN_VERSION=4.8 APP_ABI ?= armeabi @@ -33,7 +33,7 @@ endif ifneq ($(filter arm64%, $(APP_ABI)),) NDK_ABI := arm64 endif -NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI) +NDK_SYSROOT=$(ANDROID_NDK_HOME)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI) NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]') ifneq ($(filter mips%, $(NDK_ABI)),) HOST := $(NDK_ABI)el-linux-android @@ -55,11 +55,11 @@ NDK_TOOLCHAIN := $(HOST)-$(NDK_TOOLCHAIN_VERSION) ifneq ($(filter x86%, $(NDK_ABI)),) NDK_TOOLCHAIN := $(NDK_ABI)-$(NDK_TOOLCHAIN_VERSION) endif -NDK_TOOLCHAIN_BASE=$(NDK_BASE)/toolchains/$(NDK_TOOLCHAIN)/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR) +NDK_TOOLCHAIN_BASE=$(ANDROID_NDK_HOME)/toolchains/$(NDK_TOOLCHAIN)/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR) # include Android's build flags TARGET_ARCH_ABI = $(APP_ABI) -include $(NDK_BASE)/toolchains/$(NDK_TOOLCHAIN)/setup.mk +include $(ANDROID_NDK_HOME)/toolchains/$(NDK_TOOLCHAIN)/setup.mk CC := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-gcc --sysroot=$(NDK_SYSROOT) CXX := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-g++ --sysroot=$(NDK_SYSROOT) diff --git a/fix-translations b/fix-translations new file mode 100755 index 00000000..7402fe04 --- /dev/null +++ b/fix-translations @@ -0,0 +1,10 @@ +#!/bin/bash -x + +# Fix TypographyEllipsis programmatically +sed -i 's/\.\.\./…/g' res/values*/*.xml + +# Replace "--" with an "em dash" character +sed -i 's,\(\>[^\<]*\)--\([^\>]\),\1—\2,g' res/values*/*.xml + +# make sure apostrophes in strings are escaped +sed -i "s,\(>[^<]*[^\\]\)',\1\\\\',gp" res/values*/*.xml diff --git a/jenkins-build b/jenkins-build new file mode 100755 index 00000000..c56d5b0d --- /dev/null +++ b/jenkins-build @@ -0,0 +1,34 @@ +#!/bin/bash + +set -e +set -x + +if [ -z $ANDROID_HOME ]; then + if [ -e ~/.android/bashrc ]; then + . ~/.android/bashrc + else + echo "ANDROID_HOME must be set!" + exit + fi +fi + +if [ -z $ANDROID_NDK_HOME ]; then + if which ndk-build 2>&1 /dev/null; then + ANDROID_NDK_HOME=`which ndk-build | sed 's,/ndk-build,,'` + else + echo "ANDROID_NDK_HOME not set and 'ndk-build' not in PATH" + exit + fi +fi + +# reset version code/name to current date +versionCodeDate=`date +%s` +versionNameDate=`date +%Y-%m-%d_%H.%M.%S` + +sed -i \ + -e "s,android:versionCode=\"[0-9][0-9]*\",android:versionCode=\"$versionCodeDate\"," \ + -e "s,android:versionName=\"\([^\"][^\"]*\)\",android:versionName=\"\1.$versionNameDate\"," \ + AndroidManifest.xml + +make -C external +./setup-ant diff --git a/make-release-build b/make-release-build new file mode 100755 index 00000000..0372ee79 --- /dev/null +++ b/make-release-build @@ -0,0 +1,76 @@ +#!/bin/bash +# bash is required because we need bash's printf to guarantee a cross-platform +# timestamp format. + +set -e +set -x + +# make sure we're on a signed tag that matches the version name +versionName=`sed -n 's,.*versionName="\([^"]*\)".*,\1,p' AndroidManifest.xml` +describe=`git describe` +if [ $versionName != $describe ]; then + echo "WARNING: building $describe, which is not the latest release ($versionName)" +else + # make a clearer warning above by putting this here + set +x + echo "" + echo "" + echo "Checking git tag signature for release build:" + git tag -v $versionName + echo "" + echo "" + set -x +fi + + +if [ -z $ANDROID_HOME ]; then + if [ -e ~/.android/bashrc ]; then + . ~/.android/bashrc + else + echo "ANDROID_HOME must be set!" + exit + fi +fi + +projectroot=`pwd` +projectname=`sed -n 's,.*name="app_name">\(.*\)<.*,\1,p' res/values/strings.xml` + +# standardize timezone to reduce build differences +export TZ=UTC +TIMESTAMP=`printf '%(%Y-%m-%d %H:%M:%S)T' \ + $(git log -n1 --format=format:%at)` +# run the clock at 5% speed, ant requires a moving clock +TIMESTAMP_5=`printf '@%(%Y-%m-%d %H:%M:%S)T x0.05' \ + $(git log -n1 --format=format:%at)` + +git reset --hard +git clean -fdx +git submodule foreach git reset --hard +git submodule foreach git clean -fdx +git submodule sync +git submodule foreach git submodule sync +git submodule update --init --recursive + + +if [ -e ~/.android/ant.properties ]; then + cp ~/.android/ant.properties $projectroot/ +else + echo "skipping release ant.properties" +fi + +faketime "$TIMESTAMP" make -C external + +./setup-ant +faketime -f "$TIMESTAMP_5" ant release + +apk=$projectroot/bin/$projectname-v$describe.apk + +if which gpg > /dev/null; then + if [ -z "`gpg --list-secret-keys`" ]; then + echo "No GPG secret keys found, not signing APK" + else + gpg --armor --detach-sign $apk + fi +else + echo "gpg not found, not signing APK" +fi diff --git a/res/drawable-hdpi-v11/ic_menu_agenda.png b/res/drawable-hdpi-v11/ic_menu_agenda.png deleted file mode 100755 index c63a12bf..00000000 Binary files a/res/drawable-hdpi-v11/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-hdpi-v11/ic_menu_clear_playlist.png b/res/drawable-hdpi-v11/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a690..00000000 Binary files a/res/drawable-hdpi-v11/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-hdpi-v11/ic_stat_notify.png b/res/drawable-hdpi-v11/ic_stat_notify.png deleted file mode 100644 index f9770388..00000000 Binary files a/res/drawable-hdpi-v11/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-hdpi-v9/ic_menu_agenda.png b/res/drawable-hdpi-v9/ic_menu_agenda.png deleted file mode 100755 index c63a12bf..00000000 Binary files a/res/drawable-hdpi-v9/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-hdpi-v9/ic_menu_clear_playlist.png b/res/drawable-hdpi-v9/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a690..00000000 Binary files a/res/drawable-hdpi-v9/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-hdpi-v9/ic_stat_notify.png b/res/drawable-hdpi-v9/ic_stat_notify.png deleted file mode 100644 index 45e749e4..00000000 Binary files a/res/drawable-hdpi-v9/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_action_browse.png b/res/drawable-hdpi/ic_action_browse.png deleted file mode 100644 index 0972bbd9..00000000 Binary files a/res/drawable-hdpi/ic_action_browse.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_action_start.png b/res/drawable-hdpi/ic_action_start.png deleted file mode 100644 index 8b7b829e..00000000 Binary files a/res/drawable-hdpi/ic_action_start.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_agenda.png b/res/drawable-hdpi/ic_menu_agenda.png deleted file mode 100755 index c63a12bf..00000000 Binary files a/res/drawable-hdpi/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_menu_clear_playlist.png b/res/drawable-hdpi/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a690..00000000 Binary files a/res/drawable-hdpi/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_stat_notify.png b/res/drawable-hdpi/ic_stat_notify.png deleted file mode 100644 index 06a42596..00000000 Binary files a/res/drawable-hdpi/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-ldpi-v11/ic_menu_agenda.png b/res/drawable-ldpi-v11/ic_menu_agenda.png deleted file mode 100755 index c63a12bf..00000000 Binary files a/res/drawable-ldpi-v11/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-ldpi-v11/ic_menu_clear_playlist.png b/res/drawable-ldpi-v11/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a690..00000000 Binary files a/res/drawable-ldpi-v11/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-ldpi-v11/ic_stat_notify.png b/res/drawable-ldpi-v11/ic_stat_notify.png deleted file mode 100644 index 9fdf779c..00000000 Binary files a/res/drawable-ldpi-v11/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-ldpi-v9/ic_menu_agenda.png b/res/drawable-ldpi-v9/ic_menu_agenda.png deleted file mode 100755 index c63a12bf..00000000 Binary files a/res/drawable-ldpi-v9/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-ldpi-v9/ic_menu_clear_playlist.png b/res/drawable-ldpi-v9/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a690..00000000 Binary files a/res/drawable-ldpi-v9/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-ldpi-v9/ic_stat_notify.png b/res/drawable-ldpi-v9/ic_stat_notify.png deleted file mode 100644 index 2a932065..00000000 Binary files a/res/drawable-ldpi-v9/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_action_browse.png b/res/drawable-ldpi/ic_action_browse.png deleted file mode 100644 index 9cf751b8..00000000 Binary files a/res/drawable-ldpi/ic_action_browse.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_action_start.png b/res/drawable-ldpi/ic_action_start.png deleted file mode 100644 index fc098d2c..00000000 Binary files a/res/drawable-ldpi/ic_action_start.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_menu_agenda.png b/res/drawable-ldpi/ic_menu_agenda.png deleted file mode 100755 index c63a12bf..00000000 Binary files a/res/drawable-ldpi/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_menu_clear_playlist.png b/res/drawable-ldpi/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a690..00000000 Binary files a/res/drawable-ldpi/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-ldpi/ic_stat_notify.png b/res/drawable-ldpi/ic_stat_notify.png deleted file mode 100644 index 70ae0175..00000000 Binary files a/res/drawable-ldpi/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-mdpi-v11/ic_menu_agenda.png b/res/drawable-mdpi-v11/ic_menu_agenda.png deleted file mode 100755 index c63a12bf..00000000 Binary files a/res/drawable-mdpi-v11/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-mdpi-v11/ic_menu_clear_playlist.png b/res/drawable-mdpi-v11/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a690..00000000 Binary files a/res/drawable-mdpi-v11/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-mdpi-v11/ic_stat_notify.png b/res/drawable-mdpi-v11/ic_stat_notify.png deleted file mode 100644 index 8e4f9bf7..00000000 Binary files a/res/drawable-mdpi-v11/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-mdpi-v9/ic_menu_agenda.png b/res/drawable-mdpi-v9/ic_menu_agenda.png deleted file mode 100755 index c63a12bf..00000000 Binary files a/res/drawable-mdpi-v9/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-mdpi-v9/ic_menu_clear_playlist.png b/res/drawable-mdpi-v9/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a690..00000000 Binary files a/res/drawable-mdpi-v9/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-mdpi-v9/ic_stat_notify.png b/res/drawable-mdpi-v9/ic_stat_notify.png deleted file mode 100644 index 19fbc973..00000000 Binary files a/res/drawable-mdpi-v9/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_action_browse.png b/res/drawable-mdpi/ic_action_browse.png deleted file mode 100644 index cb6075f4..00000000 Binary files a/res/drawable-mdpi/ic_action_browse.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_action_start.png b/res/drawable-mdpi/ic_action_start.png deleted file mode 100644 index 7d9f3911..00000000 Binary files a/res/drawable-mdpi/ic_action_start.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_agenda.png b/res/drawable-mdpi/ic_menu_agenda.png deleted file mode 100755 index c63a12bf..00000000 Binary files a/res/drawable-mdpi/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_menu_clear_playlist.png b/res/drawable-mdpi/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a690..00000000 Binary files a/res/drawable-mdpi/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_stat_notify.png b/res/drawable-mdpi/ic_stat_notify.png deleted file mode 100644 index 48f16703..00000000 Binary files a/res/drawable-mdpi/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-xhdpi-v11/ic_menu_agenda.png b/res/drawable-xhdpi-v11/ic_menu_agenda.png deleted file mode 100755 index c63a12bf..00000000 Binary files a/res/drawable-xhdpi-v11/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-xhdpi-v11/ic_menu_clear_playlist.png b/res/drawable-xhdpi-v11/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a690..00000000 Binary files a/res/drawable-xhdpi-v11/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-xhdpi-v11/ic_stat_notify.png b/res/drawable-xhdpi-v11/ic_stat_notify.png deleted file mode 100644 index 75d0aef8..00000000 Binary files a/res/drawable-xhdpi-v11/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-xhdpi-v9/ic_menu_agenda.png b/res/drawable-xhdpi-v9/ic_menu_agenda.png deleted file mode 100755 index c63a12bf..00000000 Binary files a/res/drawable-xhdpi-v9/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-xhdpi-v9/ic_menu_clear_playlist.png b/res/drawable-xhdpi-v9/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a690..00000000 Binary files a/res/drawable-xhdpi-v9/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-xhdpi-v9/ic_stat_notify.png b/res/drawable-xhdpi-v9/ic_stat_notify.png deleted file mode 100644 index b9ec5932..00000000 Binary files a/res/drawable-xhdpi-v9/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_action_browse.png b/res/drawable-xhdpi/ic_action_browse.png deleted file mode 100644 index d7ca5b6e..00000000 Binary files a/res/drawable-xhdpi/ic_action_browse.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_action_start.png b/res/drawable-xhdpi/ic_action_start.png deleted file mode 100644 index f45cadd5..00000000 Binary files a/res/drawable-xhdpi/ic_action_start.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_agenda.png b/res/drawable-xhdpi/ic_menu_agenda.png deleted file mode 100755 index c63a12bf..00000000 Binary files a/res/drawable-xhdpi/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_menu_clear_playlist.png b/res/drawable-xhdpi/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a690..00000000 Binary files a/res/drawable-xhdpi/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_stat_notify.png b/res/drawable-xhdpi/ic_stat_notify.png deleted file mode 100644 index 71be265f..00000000 Binary files a/res/drawable-xhdpi/ic_stat_notify.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_menu_agenda.png b/res/drawable-xxhdpi/ic_menu_agenda.png deleted file mode 100755 index c63a12bf..00000000 Binary files a/res/drawable-xxhdpi/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_menu_clear_playlist.png b/res/drawable-xxhdpi/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a690..00000000 Binary files a/res/drawable-xxhdpi/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_menu_agenda.png b/res/drawable-xxxhdpi/ic_menu_agenda.png deleted file mode 100755 index c63a12bf..00000000 Binary files a/res/drawable-xxxhdpi/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable-xxxhdpi/ic_menu_clear_playlist.png b/res/drawable-xxxhdpi/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a690..00000000 Binary files a/res/drawable-xxxhdpi/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable/bindingtile.png b/res/drawable/bindingtile.png deleted file mode 100644 index 7a325e98..00000000 Binary files a/res/drawable/bindingtile.png and /dev/null differ diff --git a/res/drawable/button_stop.png b/res/drawable/button_stop.png deleted file mode 100644 index d97a3a8e..00000000 Binary files a/res/drawable/button_stop.png and /dev/null differ diff --git a/res/drawable/geometric.png b/res/drawable/geometric.png deleted file mode 100644 index 07f5137d..00000000 Binary files a/res/drawable/geometric.png and /dev/null differ diff --git a/res/drawable/ic_inverse.png b/res/drawable/ic_inverse.png deleted file mode 100644 index 65eff2c7..00000000 Binary files a/res/drawable/ic_inverse.png and /dev/null differ diff --git a/res/drawable/ic_menu_agenda.png b/res/drawable/ic_menu_agenda.png deleted file mode 100755 index c63a12bf..00000000 Binary files a/res/drawable/ic_menu_agenda.png and /dev/null differ diff --git a/res/drawable/ic_menu_check.png b/res/drawable/ic_menu_check.png deleted file mode 100644 index c1873047..00000000 Binary files a/res/drawable/ic_menu_check.png and /dev/null differ diff --git a/res/drawable/ic_menu_clear_playlist.png b/res/drawable/ic_menu_clear_playlist.png deleted file mode 100644 index 9100a690..00000000 Binary files a/res/drawable/ic_menu_clear_playlist.png and /dev/null differ diff --git a/res/drawable/ic_menu_home.png b/res/drawable/ic_menu_home.png deleted file mode 100644 index 34943f66..00000000 Binary files a/res/drawable/ic_menu_home.png and /dev/null differ diff --git a/res/drawable/ic_menu_reports.png b/res/drawable/ic_menu_reports.png deleted file mode 100644 index f61bbd8b..00000000 Binary files a/res/drawable/ic_menu_reports.png and /dev/null differ diff --git a/res/drawable/ic_menu_settings.png b/res/drawable/ic_menu_settings.png deleted file mode 100644 index 2e88b0f6..00000000 Binary files a/res/drawable/ic_menu_settings.png and /dev/null differ diff --git a/res/drawable/icon_firefox.png b/res/drawable/icon_firefox.png deleted file mode 100644 index 65d66841..00000000 Binary files a/res/drawable/icon_firefox.png and /dev/null differ diff --git a/res/drawable/menu_settings.png b/res/drawable/menu_settings.png deleted file mode 100644 index 577e0558..00000000 Binary files a/res/drawable/menu_settings.png and /dev/null differ diff --git a/res/drawable/menu_start.png b/res/drawable/menu_start.png deleted file mode 100644 index 2d0d2e2d..00000000 Binary files a/res/drawable/menu_start.png and /dev/null differ diff --git a/res/drawable/nav_refresh.png b/res/drawable/nav_refresh.png deleted file mode 100644 index bb9d855f..00000000 Binary files a/res/drawable/nav_refresh.png and /dev/null differ diff --git a/res/drawable/onion.png b/res/drawable/onion.png deleted file mode 100644 index 22858198..00000000 Binary files a/res/drawable/onion.png and /dev/null differ diff --git a/res/drawable/proxymob.png b/res/drawable/proxymob.png deleted file mode 100644 index 6e232194..00000000 Binary files a/res/drawable/proxymob.png and /dev/null differ diff --git a/res/drawable/tor128.png b/res/drawable/tor128.png deleted file mode 100644 index f6ce203f..00000000 Binary files a/res/drawable/tor128.png and /dev/null differ diff --git a/res/drawable/torerror.png b/res/drawable/torerror.png deleted file mode 100644 index 0e8eeed5..00000000 Binary files a/res/drawable/torerror.png and /dev/null differ diff --git a/res/drawable/torstopping.png b/res/drawable/torstopping.png deleted file mode 100644 index 0e8eeed5..00000000 Binary files a/res/drawable/torstopping.png and /dev/null differ diff --git a/res/drawable/txture.png b/res/drawable/txture.png deleted file mode 100644 index 2549c497..00000000 Binary files a/res/drawable/txture.png and /dev/null differ diff --git a/res/drawable/vidalia.png b/res/drawable/vidalia.png deleted file mode 100644 index f6ce203f..00000000 Binary files a/res/drawable/vidalia.png and /dev/null differ diff --git a/res/drawable/warning.png b/res/drawable/warning.png deleted file mode 100644 index f5371dce..00000000 Binary files a/res/drawable/warning.png and /dev/null differ diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml index f42a6036..83ed2d44 100644 --- a/res/layout/layout_wizard_tips.xml +++ b/res/layout/layout_wizard_tips.xml @@ -63,15 +63,6 @@ android:drawableLeft="@drawable/ic_duckduckgo" android:text="@string/wizard_tips_duckgo" /> -