dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bump orbot version to prepare for new release, update tor version listed in layout 

svn:r21854
This commit is contained in:
Erinn Clark 2010-03-08 06:33:34 +00:00
parent a0295c2803
commit 634e32d639
4 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
build.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project name="Orbot"> <project name="Orbot" default="help">
<!-- The local.properties file is created and updated by the 'android' tool. <!-- The local.properties file is created and updated by the 'android' tool.
It contain the path to the SDK. It should *NOT* be checked in in Version It contains the path to the SDK. It should *NOT* be checked in in Version
Control Systems. --> Control Systems. -->
<property file="local.properties" /> <property file="local.properties" />
@ -11,13 +11,13 @@
used by the Ant rules. used by the Ant rules.
Here are some properties you may want to change/update: Here are some properties you may want to change/update:
application-package application.package
the name of your application package as defined in the manifest. Used by the the name of your application package as defined in the manifest. Used by the
'uninstall' rule. 'uninstall' rule.
source-folder source.dir
the name of the source folder. Default is 'src'. the name of the source directory. Default is 'src'.
out-folder out.dir
the name of the output folder. Default is 'bin'. the name of the output directory. Default is 'bin'.
Properties related to the SDK location or the project target should be updated Properties related to the SDK location or the project target should be updated
using the 'android' tool with the 'update' action. using the 'android' tool with the 'update' action.
@ -37,11 +37,11 @@
<!-- Custom Android task to deal with the project target, and import the proper rules. <!-- Custom Android task to deal with the project target, and import the proper rules.
This requires ant 1.6.0 or above. --> This requires ant 1.6.0 or above. -->
<path id="android.antlibs"> <path id="android.antlibs">
<pathelement path="${sdk-location}/tools/lib/anttasks.jar" /> <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
<pathelement path="${sdk-location}/tools/lib/sdklib.jar" /> <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
<pathelement path="${sdk-location}/tools/lib/androidprefs.jar" /> <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
<pathelement path="${sdk-location}/tools/lib/apkbuilder.jar" /> <pathelement path="${sdk.dir}/tools/lib/apkbuilder.jar" />
<pathelement path="${sdk-location}/tools/lib/jarutils.jar" /> <pathelement path="${sdk.dir}/tools/lib/jarutils.jar" />
</path> </path>
<taskdef name="setup" <taskdef name="setup"
@ -49,13 +49,19 @@
classpathref="android.antlibs" /> classpathref="android.antlibs" />
<!-- Execute the Android Setup task that will setup some properties specific to the target, <!-- Execute the Android Setup task that will setup some properties specific to the target,
and import the rules files. and import the build rules files.
To customize the rules, copy/paste them below the task, and disable import by setting
the import attribute to false: The rules file is imported from
<setup import="false" /> <SDK>/platforms/<target_platform>/templates/android_rules.xml
To customize some build steps for your project:
- copy the content of the main node <project> from android_rules.xml
- paste it in this build.xml below the <setup /> task.
- disable the import by changing the setup task below to <setup import="false" />
This will ensure that the properties are setup correctly but that your customized This will ensure that the properties are setup correctly but that your customized
targets are used. build steps are used.
--> -->
<setup /> <setup />
</project> </project>

2
default.properties
View File

@ -10,5 +10,5 @@
# Indicates whether an apk should be generated for each density. # Indicates whether an apk should be generated for each density.
split.density=false split.density=false
# Project target. # Project target.
target=android-4 target=android-2
apk-configurations= apk-configurations=

2
res/layout/layout_about.xml
View File

@ -68,7 +68,7 @@ http://guardianproject.info/apps/orbot/"
android:paddingLeft="15px" android:paddingLeft="15px"
android:textStyle="bold" android:textStyle="bold"
android:textColor="#ffffff" /> android:textColor="#ffffff" />
<TextView android:text="Tor v2.0.x: https://www.torproject.org" <TextView android:text="Tor v0.2.2.9: https://www.torproject.org"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:autoLink="web" android:autoLink="web"

2
res/values/strings.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">Orbot</string> <string name="app_name">Orbot</string>
<string name="app_version">0.0.3b</string> <string name="app_version">0.0.5</string>
<string name="internal_web_url">http://orbot/</string> <string name="internal_web_url">http://orbot/</string>
<string name="default_web_url">http://check.torproject.org</string> <string name="default_web_url">http://check.torproject.org</string>
<string name="secure_default_web_url">https://check.torproject.org</string> <string name="secure_default_web_url">https://check.torproject.org</string>