[tor-commits] r24927: {website} changed ProxyMob to Proxy Mobile for more accurate searchi (website/trunk/docs/en)
Author: n8fr8 Date: 2011-07-22 20:16:33 + (Fri, 22 Jul 2011) New Revision: 24927 Modified: website/trunk/docs/en/android.wml Log: changed ProxyMob to Proxy Mobile for more accurate searching Modified: website/trunk/docs/en/android.wml === --- website/trunk/docs/en/android.wml 2011-07-21 15:40:41 UTC (rev 24926) +++ website/trunk/docs/en/android.wml 2011-07-22 20:16:33 UTC (rev 24927) @@ -110,7 +110,7 @@ liYou must root your device and update the firmware to an iptables-capable ROM for Orbot to transparently proxy all TCP traffic./li liFor non-modified and non-rooted phones, you'll want to manually configure HTTP or SOCKS proxy settings for specific applications./li liIf you root your device and install an iptables-capable ROM (such as a href=http://cyanogenmod.com;Cyanogen/a), Orbot can transparently proxy traffic on an app-by-app basis through Tor./li -liYou can also install Firefox for Android from the market with the a href=https://guardianproject.info/apps/proxymob;ProxyMob Add-on/a or install the text-only “NDBrowser” from the Android Market. +liYou can also install Firefox for Android from the market with the a href=https://guardianproject.info/apps/proxymob;Proxy Mobile Add-on/a or install the text-only “NDBrowser” from the Android Market. Both of these solutions all routing of web access through Tor on standard, un-rooted devices./li liFor Instant Messaging, try a href=https://guardianproject.info/apps/gibber;Gibberbot/a, which includes support for connecting via Tor and Off-the-Record encryption./li /ul ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24766: {website} added fingerprint for my Orbot signing key (website/trunk/docs/en)
Author: n8fr8 Date: 2011-05-17 15:29:45 + (Tue, 17 May 2011) New Revision: 24766 Modified: website/trunk/docs/en/verifying-signatures.wml Log: added fingerprint for my Orbot signing key Modified: website/trunk/docs/en/verifying-signatures.wml === --- website/trunk/docs/en/verifying-signatures.wml 2011-05-17 08:49:04 UTC (rev 24765) +++ website/trunk/docs/en/verifying-signatures.wml 2011-05-17 15:29:45 UTC (rev 24766) @@ -35,6 +35,7 @@ liMike's (0xDDC6C0AD) signs the Torbutton xpi./li liKarsten's (0xF7C11265) signs the metrics archives and tools./li liRobert Hogan's (0x22F6856F) signs torsocks release tarballs and tags./li +liNathan's (0xB374CBD2) signs the Android APK file for Orbot./li. /ul h3Step Zero: Install GnuPG/h3 @@ -169,6 +170,11 @@ uid Robert Hogan lt;rob...@roberthogan.netgt; sub 1024g/FC4A9460 2006-08-19 +pub 3072D/B374CBD2 2010-06-09 [expires: 2011-06-09] + Key fingerprint = B92B CA64 72F7 C6F0 8D47 8503 D2AC D203 B374 CBD2 +uid Nathan of Guardian lt;nat...@guardianproject.infogt; +sub 4096g/B5878C3B 2010-06-09 [expires: 2011-06-09] + /pre h3Step Three: Verify the downloaded package/h3 ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24758: {projects} last modification for StrictNodes, exit node support (in projects/android/trunk/Orbot: res/xml src/org/torproject/android/service)
Author: n8fr8
Date: 2011-05-17 02:02:36 + (Tue, 17 May 2011)
New Revision: 24758
Modified:
projects/android/trunk/Orbot/res/xml/preferences.xml
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
Log:
last modification for StrictNodes, exit node support
Modified: projects/android/trunk/Orbot/res/xml/preferences.xml
===
--- projects/android/trunk/Orbot/res/xml/preferences.xml2011-05-16
14:39:26 UTC (rev 24757)
+++ projects/android/trunk/Orbot/res/xml/preferences.xml2011-05-17
02:02:36 UTC (rev 24758)
@@ -42,17 +42,26 @@
/PreferenceCategory
-PreferenceCategory android:title=Exit Nodes
-
+PreferenceCategory android:title=Node Configuration android:summary=These
are advanced settings that can reduce your anonymity
+EditTextPreference android:key=pref_entrance_nodes
+android:title=Entrance Nodes
+android:summary=Fingerprints, nicks, countries and addresses for the first
hop
+android:dialogTitle=Enter Entrance Nodes
+/
EditTextPreference android:key=pref_exit_nodes
android:title=Exit Nodes
-android:summary=Fingerprints, nicknames, country codes and address patterns
for the last hop
+android:summary=Fingerprints, nicks, countries and addresses for the last hop
android:dialogTitle=Enter Exit Nodes
/
+EditTextPreference android:key=pref_exclude_nodes
+android:title=Exclude Nodes
+android:summary=Fingerprints, nicks, countries and addresses to exclude
+android:dialogTitle=Enter Exclude Nodes
+/
CheckBoxPreference android:defaultValue=false
-android:title=Strict Exit Nodes android:key=pref_strict_exit_nodes
-android:summary=Use only these specific exit nodes/
+android:title=Strict Nodes android:key=pref_strict_nodes
+android:summary=Use *only* these specified nodes/
/PreferenceCategory
PreferenceCategory android:title=Bridges
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
===
---
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
2011-05-16 14:39:26 UTC (rev 24757)
+++
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
2011-05-17 02:02:36 UTC (rev 24758)
@@ -1288,8 +1288,10 @@
boolean enableHiddenServices = prefs.getBoolean(pref_hs_enable,
false);
-boolean enableStrictExitNodes =
prefs.getBoolean(pref_strict_exit_nodes, false);
+boolean enableStrictNodes = prefs.getBoolean(pref_strict_nodes,
false);
+String entranceNodes = prefs.getString(pref_entrance_nodes, );
String exitNodes = prefs.getString(pref_exit_nodes, );
+String excludeNodes = prefs.getString(pref_exclude_nodes, );
//boolean enableTransparentProxy =
prefs.getBoolean(TorConstants.PREF_TRANSPARENT, false);
@@ -1308,13 +1310,10 @@
}
}
-if (exitNodes.length() 0)
-{
-
- mBinder.updateConfiguration(ExitNodes, exitNodes,
false);
- mBinder.updateConfiguration(StrictExitNodes,
enableStrictExitNodes ? 1 : 0, false);
-
-}
+mBinder.updateConfiguration(EntranceNodes, entranceNodes, false);
+mBinder.updateConfiguration(ExitNodes, exitNodes, false);
+ mBinder.updateConfiguration(ExcludeNodes, excludeNodes,
false);
+ mBinder.updateConfiguration(StrictExitNodes,
enableStrictNodes ? 1 : 0, false);
if (useBridges)
{
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24759: {projects} tweaking layout for small screens (in projects/android/trunk/Orbot/res: layout layout-land)
Author: n8fr8 Date: 2011-05-17 02:03:07 + (Tue, 17 May 2011) New Revision: 24759 Modified: projects/android/trunk/Orbot/res/layout-land/layout_main.xml projects/android/trunk/Orbot/res/layout/layout_main.xml Log: tweaking layout for small screens Modified: projects/android/trunk/Orbot/res/layout/layout_main.xml === --- projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-05-17 02:02:36 UTC (rev 24758) +++ projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-05-17 02:03:07 UTC (rev 24759) @@ -12,11 +12,11 @@ android:layout_height=30dp android:layout_gravity=center_horizontal android:background=#A0909090 -ImageView android:id=@+id/radioModeImage + ImageView android:id=@+id/radioModeImage android:layout_width=wrap_content android:layout_height=wrap_content - android:layout_marginTop=3dip - android:layout_marginRight=3dip + android:layout_marginTop=3px + android:layout_marginRight=3px android:gravity=right android:layout_toRightOf=@+id/radioModeLabel android:layout_alignParentRight=true @@ -26,46 +26,32 @@ TextView android:id=@+id/radioModeText android:layout_width=wrap_content android:layout_height=wrap_content -android:text=@string/powered_by - android:layout_marginTop=9px +android:text=powered by The Tor Project + android:layout_marginTop=8px android:layout_marginRight=0px android:gravity=right android:layout_toLeftOf=@+id/radioModeImage -android:textColor=#33 / +android:textColor=#cc / /RelativeLayout - TableLayout android:id=@+id/mainLayout - android:layout_gravity=center - android:layout_height=wrap_content - android:layout_width=wrap_content - TableRow android:id=@+id/startRow - TableLayout - android:layout_gravity=center - android:layout_height=wrap_content - android:layout_width=wrap_content - TableRow - ImageView - android:id=@+id/imgStatus - android:layout_marginTop=30dip - android:layout_width=wrap_content - android:layout_height=wrap_content - android:src=@drawable/toroff/ - /TableRow - TableRow - TextView android:id=@+id/lblStatus - android:text=@string/press_to_start - android:layout_gravity=center_horizontal - android:gravity=center_horizontal - android:textStyle=bold - android:layout_width=fill_parent - android:layout_height=75px - android:textColor=#ff -/ - /TableRow - /TableLayout - /TableRow - - /TableLayout +ImageView + android:id=@+id/imgStatus + android:layout_margin=5dip + android:layout_width=320dip + android:layout_height=320dip + android:src=@drawable/toroff + android:layout_gravity=center_horizontal + / + + TextView android:id=@+id/lblStatus + android:text=@string/press_to_start + android:layout_gravity=center_horizontal + android:textStyle=bold + android:layout_width=wrap_content + android:layout_height=30dip + android:textColor=#ff +/ + Modified: projects/android/trunk/Orbot/res/layout-land/layout_main.xml
[tor-commits] r24760: {projects} updated for 1.0.5.1 (small mods to layout and prefs) (projects/android/trunk/Orbot)
Author: n8fr8 Date: 2011-05-17 02:08:39 + (Tue, 17 May 2011) New Revision: 24760 Modified: projects/android/trunk/Orbot/AndroidManifest.xml Log: updated for 1.0.5.1 (small mods to layout and prefs) Modified: projects/android/trunk/Orbot/AndroidManifest.xml === --- projects/android/trunk/Orbot/AndroidManifest.xml2011-05-17 02:03:07 UTC (rev 24759) +++ projects/android/trunk/Orbot/AndroidManifest.xml2011-05-17 02:08:39 UTC (rev 24760) @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; - package=org.torproject.android android:versionName=0.2.2.25-orbot-alpha-1.0.5 android:versionCode=11 + package=org.torproject.android android:versionName=0.2.2.25-orbot-alpha-1.0.5.1 android:versionCode=11 uses-permission android:name=android.permission.INTERNET / uses-permission android:name=android.permission.RECEIVE_BOOT_COMPLETED/ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24761: {} 1.0.5.1 release (in projects/android/tags: . 0.2.2.25-alpha-orbot-1.0.5.1)
Author: n8fr8 Date: 2011-05-17 02:09:44 + (Tue, 17 May 2011) New Revision: 24761 Added: projects/android/tags/0.2.2.25-alpha-orbot-1.0.5.1/ projects/android/tags/0.2.2.25-alpha-orbot-1.0.5.1/Orbot/ Removed: projects/android/tags/0.2.2.25-alpha-orbot-1.0.5.1/Orbot/ Log: 1.0.5.1 release ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24762: {projects} updated changelog and res strings version num (in projects/android/trunk/Orbot: . res/layout res/values res/values-ar res/values-ca res/values-de res/values-es res/val
Author: n8fr8 Date: 2011-05-17 03:08:30 + (Tue, 17 May 2011) New Revision: 24762 Modified: projects/android/trunk/Orbot/CHANGELOG projects/android/trunk/Orbot/res/layout/layout_main.xml projects/android/trunk/Orbot/res/values-ar/strings.xml projects/android/trunk/Orbot/res/values-ca/strings.xml projects/android/trunk/Orbot/res/values-de/strings.xml projects/android/trunk/Orbot/res/values-es/strings.xml projects/android/trunk/Orbot/res/values-fa/strings.xml projects/android/trunk/Orbot/res/values-mk/strings.xml projects/android/trunk/Orbot/res/values-nb/strings.xml projects/android/trunk/Orbot/res/values-nl/strings.xml projects/android/trunk/Orbot/res/values-pl/strings.xml projects/android/trunk/Orbot/res/values-pt/strings.xml projects/android/trunk/Orbot/res/values-ru/strings.xml projects/android/trunk/Orbot/res/values-sv/strings.xml projects/android/trunk/Orbot/res/values-zh/strings.xml projects/android/trunk/Orbot/res/values/strings.xml Log: updated changelog and res strings version num Modified: projects/android/trunk/Orbot/CHANGELOG === --- projects/android/trunk/Orbot/CHANGELOG 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/CHANGELOG 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,5 +1,9 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +1.0.5.1/.2 +- small updates to layout of main screen to fit smaller screens +- fixed preference setting of EntryNode torrc value + 1.0.5 - added exit node and StrictExitNode preference - fixed tor binary installation issue related to max resource size and compression Modified: projects/android/trunk/Orbot/res/layout/layout_main.xml === --- projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -33,11 +33,17 @@ android:layout_toLeftOf=@+id/radioModeImage android:textColor=#cc / /RelativeLayout - +RelativeLayout +android:orientation=vertical +android:layout_width=fill_parent +android:layout_height=fill_parent +android:layout_gravity=center_vertical + + ImageView android:id=@+id/imgStatus - android:layout_margin=5dip - android:layout_width=320dip + android:layout_margin=15dip + android:layout_width=fill_parent android:layout_height=320dip android:src=@drawable/toroff android:layout_gravity=center_horizontal @@ -45,15 +51,15 @@ TextView android:id=@+id/lblStatus android:text=@string/press_to_start - android:layout_gravity=center_horizontal + android:gravity=center_horizontal android:textStyle=bold - android:layout_width=wrap_content - android:layout_height=30dip + android:layout_width=fill_parent + android:layout_height=60dip android:textColor=#ff + android:layout_below=@id/imgStatus / - + /RelativeLayout - /LinearLayout Modified: projects/android/trunk/Orbot/res/values/strings.xml === --- projects/android/trunk/Orbot/res/values/strings.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/values/strings.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,7 +1,7 @@ ?xml version=1.0 encoding=utf-8? resources string name=app_nameOrbot/string - string name=app_version1.0.5/string + string name=app_version1.0.5.2/string string name=internal_web_urlhttp://orbot//string string name=default_web_urlhttp://check.torproject.org/string Modified: projects/android/trunk/Orbot/res/values-ar/strings.xml === --- projects/android/trunk/Orbot/res/values-ar/strings.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/values-ar/strings.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,7 +1,7 @@ ?xml version=1.0 encoding=utf-8? resources string name=app_nameاوربوت (Orbot)/string -string name=app_version1.0.5/string +string name=app_version1.0.5.2/string string name=internal_web_urlhttp://orbot//string string name=default_web_urlhttp://check.torproject.org/string Modified: projects/android/trunk/Orbot/res/values-ca/strings.xml === --- projects/android/trunk/Orbot/res/values-ca/strings.xml
[tor-commits] r24763: {projects} fixed handling of 'EntryNodes' preference (in projects/android/trunk/Orbot/src/org/torproject/android: . service)
Author: n8fr8
Date: 2011-05-17 03:09:12 + (Tue, 17 May 2011)
New Revision: 24763
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/SettingsPreferences.java
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
Log:
fixed handling of 'EntryNodes' preference
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/SettingsPreferences.java
===
---
projects/android/trunk/Orbot/src/org/torproject/android/SettingsPreferences.java
2011-05-17 03:08:30 UTC (rev 24762)
+++
projects/android/trunk/Orbot/src/org/torproject/android/SettingsPreferences.java
2011-05-17 03:09:12 UTC (rev 24763)
@@ -28,6 +28,9 @@
private boolean hasRoot = false;
+
+ private final static int HIDDEN_SERVICE_PREF_IDX = 6;
+
protected void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
@@ -77,12 +80,11 @@
}
- int hiddenGroupIdx = 6;
- prefHiddenServices =
((CheckBoxPreference)((PreferenceCategory)this.getPreferenceScreen().getPreference(hiddenGroupIdx)).getPreference(0));
+ prefHiddenServices =
((CheckBoxPreference)((PreferenceCategory)this.getPreferenceScreen().getPreference(HIDDEN_SERVICE_PREF_IDX)).getPreference(0));
prefHiddenServices.setOnPreferenceClickListener(this);
-
((PreferenceCategory)this.getPreferenceScreen().getPreference(hiddenGroupIdx)).getPreference(1).setEnabled(prefHiddenServices.isChecked());
-
((PreferenceCategory)this.getPreferenceScreen().getPreference(hiddenGroupIdx)).getPreference(2).setEnabled(prefHiddenServices.isChecked());
+
((PreferenceCategory)this.getPreferenceScreen().getPreference(HIDDEN_SERVICE_PREF_IDX)).getPreference(1).setEnabled(prefHiddenServices.isChecked());
+
((PreferenceCategory)this.getPreferenceScreen().getPreference(HIDDEN_SERVICE_PREF_IDX)).getPreference(2).setEnabled(prefHiddenServices.isChecked());
};
@@ -113,8 +115,8 @@
else if (preference == prefHiddenServices)
{
-
((PreferenceCategory)this.getPreferenceScreen().getPreference(5)).getPreference(1).setEnabled(prefHiddenServices.isChecked());
-
((PreferenceCategory)this.getPreferenceScreen().getPreference(5)).getPreference(2).setEnabled(prefHiddenServices.isChecked());
+
((PreferenceCategory)this.getPreferenceScreen().getPreference(HIDDEN_SERVICE_PREF_IDX)).getPreference(1).setEnabled(prefHiddenServices.isChecked());
+
((PreferenceCategory)this.getPreferenceScreen().getPreference(HIDDEN_SERVICE_PREF_IDX)).getPreference(2).setEnabled(prefHiddenServices.isChecked());
}
else
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
===
---
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
2011-05-17 03:08:30 UTC (rev 24762)
+++
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
2011-05-17 03:09:12 UTC (rev 24763)
@@ -1137,18 +1137,12 @@
if (value == null || value.length() == 0)
{
resetBuffer.add(name);
- /*
- if (conn != null)
- {
- try {
-
conn.resetConf(Arrays.asList(new String[]{name}));
- } catch (IOException e) {
- Log.w(TAG, Unable to reset
conf,e);
- }
- }*/
+
}
else
+ {
configBuffer.add(name + ' ' + value);
+ }
return false;
}
@@ -1289,13 +1283,10 @@
boolean enableHiddenServices = prefs.getBoolean(pref_hs_enable,
false);
boolean enableStrictNodes = prefs.getBoolean(pref_strict_nodes,
false);
-String entranceNodes = prefs.getString(pref_entrance_nodes, );
-String exitNodes = prefs.getString(pref_exit_nodes, );
-String excludeNodes = prefs.getString(pref_exclude_nodes, );
+String entranceNodes = prefs.getString(pref_entrance_nodes, null);
+String exitNodes = prefs.getString(pref_exit_nodes, null);
+String excludeNodes = prefs.getString(pref_exclude_nodes, null);
-
- //boolean enableTransparentProxy =
[tor-commits] r24764: {projects} updated manifest files with latest version info (projects/android/trunk/Orbot)
Author: n8fr8 Date: 2011-05-17 03:09:25 + (Tue, 17 May 2011) New Revision: 24764 Modified: projects/android/trunk/Orbot/AndroidManifest.xml projects/android/trunk/Orbot/AndroidManifest.xml.debug projects/android/trunk/Orbot/AndroidManifest.xml.production Log: updated manifest files with latest version info Modified: projects/android/trunk/Orbot/AndroidManifest.xml === --- projects/android/trunk/Orbot/AndroidManifest.xml2011-05-17 03:09:12 UTC (rev 24763) +++ projects/android/trunk/Orbot/AndroidManifest.xml2011-05-17 03:09:25 UTC (rev 24764) @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; - package=org.torproject.android android:versionName=0.2.2.25-orbot-alpha-1.0.5.1 android:versionCode=11 + package=org.torproject.android android:versionName=0.2.2.25-orbot-alpha-1.0.5.2 android:versionCode=14 uses-permission android:name=android.permission.INTERNET / uses-permission android:name=android.permission.RECEIVE_BOOT_COMPLETED/ Modified: projects/android/trunk/Orbot/AndroidManifest.xml.debug === --- projects/android/trunk/Orbot/AndroidManifest.xml.debug 2011-05-17 03:09:12 UTC (rev 24763) +++ projects/android/trunk/Orbot/AndroidManifest.xml.debug 2011-05-17 03:09:25 UTC (rev 24764) @@ -1,6 +1,7 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; - package=org.torproject.android android:versionName=0.2.2.25-orbot-alpha-1.0.5.20110503a-dev-debug android:versionCode=10 + package=org.torproject.android android:versionName=0.2.2.25-orbot-alpha-1.0.5.20110503a-dev-debug + android:versionCode=13 uses-permission android:name=android.permission.INTERNET / Modified: projects/android/trunk/Orbot/AndroidManifest.xml.production === --- projects/android/trunk/Orbot/AndroidManifest.xml.production 2011-05-17 03:09:12 UTC (rev 24763) +++ projects/android/trunk/Orbot/AndroidManifest.xml.production 2011-05-17 03:09:25 UTC (rev 24764) @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; - package=org.torproject.android android:versionName=0.2.2.25-orbot-alpha-1.0.5.20110503a android:versionCode=11 + package=org.torproject.android android:versionName=0.2.2.25-orbot-alpha-1.0.5.20110503a android:versionCode=13 uses-permission android:name=android.permission.INTERNET / uses-permission android:name=android.permission.RECEIVE_BOOT_COMPLETED/ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24751: {projects} updated strings files with version number (in projects/android/trunk/Orbot/res: layout values values-ar values-ca values-de values-es values-fa values-mk values-nb val
Author: n8fr8 Date: 2011-05-16 03:49:36 + (Mon, 16 May 2011) New Revision: 24751 Modified: projects/android/trunk/Orbot/res/layout/layout_about.xml projects/android/trunk/Orbot/res/layout/layout_main.xml projects/android/trunk/Orbot/res/values-ar/strings.xml projects/android/trunk/Orbot/res/values-ca/strings.xml projects/android/trunk/Orbot/res/values-de/strings.xml projects/android/trunk/Orbot/res/values-es/strings.xml projects/android/trunk/Orbot/res/values-fa/strings.xml projects/android/trunk/Orbot/res/values-mk/strings.xml projects/android/trunk/Orbot/res/values-nb/strings.xml projects/android/trunk/Orbot/res/values-nl/strings.xml projects/android/trunk/Orbot/res/values-pl/strings.xml projects/android/trunk/Orbot/res/values-pt/strings.xml projects/android/trunk/Orbot/res/values-ru/strings.xml projects/android/trunk/Orbot/res/values-sv/strings.xml projects/android/trunk/Orbot/res/values-zh/strings.xml projects/android/trunk/Orbot/res/values/strings.xml projects/android/trunk/Orbot/res/xml/preferences.xml Log: updated strings files with version number Modified: projects/android/trunk/Orbot/res/layout/layout_about.xml === --- projects/android/trunk/Orbot/res/layout/layout_about.xml2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/layout/layout_about.xml2011-05-16 03:49:36 UTC (rev 24751) @@ -80,7 +80,7 @@ android:paddingLeft=15px android:textStyle=bold android:textColor=#00ff00 / - TextView android:text=Tor v0.2.2.14: https://www.torproject.org; + TextView android:text=Tor v0.2.2.25: https://www.torproject.org; android:layout_width=fill_parent android:layout_height=wrap_content android:autoLink=web Modified: projects/android/trunk/Orbot/res/layout/layout_main.xml === --- projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-05-14 19:14:00 UTC (rev 24750) +++ projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-05-16 03:49:36 UTC (rev 24751) @@ -15,8 +15,8 @@ ImageView android:id=@+id/radioModeImage android:layout_width=wrap_content android:layout_height=wrap_content - android:layout_marginTop=0px - android:layout_marginRight=3px + android:layout_marginTop=3dip + android:layout_marginRight=3dip android:gravity=right android:layout_toRightOf=@+id/radioModeLabel android:layout_alignParentRight=true @@ -34,10 +34,6 @@ android:textColor=#33 / /RelativeLayout - ScrollView android:id=@+id/mainview - android:orientation=vertical - android:layout_width=fill_parent - android:layout_height=fill_parent TableLayout android:id=@+id/mainLayout android:layout_gravity=center android:layout_height=wrap_content @@ -50,6 +46,7 @@ TableRow ImageView android:id=@+id/imgStatus + android:layout_marginTop=30dip android:layout_width=wrap_content android:layout_height=wrap_content android:src=@drawable/toroff/ @@ -60,8 +57,8 @@ android:layout_gravity=center_horizontal android:gravity=center_horizontal android:textStyle=bold - android:width=330px - android:height=75px + android:layout_width=fill_parent + android:layout_height=75px android:textColor=#ff / /TableRow @@ -69,7 +66,6 @@ /TableRow /TableLayout - /ScrollView Modified: projects/android/trunk/Orbot/res/values/strings.xml
[tor-commits] r24752: {projects} updated manifest with version numbers (projects/android/trunk/Orbot)
Author: n8fr8 Date: 2011-05-16 03:49:54 + (Mon, 16 May 2011) New Revision: 24752 Modified: projects/android/trunk/Orbot/AndroidManifest.xml.debug projects/android/trunk/Orbot/AndroidManifest.xml.production Log: updated manifest with version numbers Modified: projects/android/trunk/Orbot/AndroidManifest.xml.debug === --- projects/android/trunk/Orbot/AndroidManifest.xml.debug 2011-05-16 03:49:36 UTC (rev 24751) +++ projects/android/trunk/Orbot/AndroidManifest.xml.debug 2011-05-16 03:49:54 UTC (rev 24752) @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; - package=org.torproject.android android:versionName=1.0.4 android:versionCode=10 + package=org.torproject.android android:versionName=0.2.2.25-orbot-alpha-1.0.5.20110503a-dev-debug android:versionCode=10 uses-permission android:name=android.permission.INTERNET / Modified: projects/android/trunk/Orbot/AndroidManifest.xml.production === --- projects/android/trunk/Orbot/AndroidManifest.xml.production 2011-05-16 03:49:36 UTC (rev 24751) +++ projects/android/trunk/Orbot/AndroidManifest.xml.production 2011-05-16 03:49:54 UTC (rev 24752) @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; - package=org.torproject.android android:versionName=0.2.2.22-orbot-alpha-1.0.5.20110416a-dev android:versionCode=11 + package=org.torproject.android android:versionName=0.2.2.25-orbot-alpha-1.0.5.20110503a android:versionCode=11 uses-permission android:name=android.permission.INTERNET / uses-permission android:name=android.permission.RECEIVE_BOOT_COMPLETED/ ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24753: {projects} added exit node option to preferences (in projects/android/trunk/Orbot/src/org/torproject/android: . service)
Author: n8fr8
Date: 2011-05-16 03:50:10 + (Mon, 16 May 2011)
New Revision: 24753
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/SettingsPreferences.java
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java
Log:
added exit node option to preferences
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/SettingsPreferences.java
===
---
projects/android/trunk/Orbot/src/org/torproject/android/SettingsPreferences.java
2011-05-16 03:49:54 UTC (rev 24752)
+++
projects/android/trunk/Orbot/src/org/torproject/android/SettingsPreferences.java
2011-05-16 03:50:10 UTC (rev 24753)
@@ -77,7 +77,7 @@
}
- int hiddenGroupIdx = 5;
+ int hiddenGroupIdx = 6;
prefHiddenServices =
((CheckBoxPreference)((PreferenceCategory)this.getPreferenceScreen().getPreference(hiddenGroupIdx)).getPreference(0));
prefHiddenServices.setOnPreferenceClickListener(this);
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
===
---
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
2011-05-16 03:49:54 UTC (rev 24752)
+++
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
2011-05-16 03:50:10 UTC (rev 24753)
@@ -1288,6 +1288,10 @@
boolean enableHiddenServices = prefs.getBoolean(pref_hs_enable,
false);
+boolean enableStrictExitNodes =
prefs.getBoolean(pref_strict_exit_nodes, false);
+String exitNodes = prefs.getString(pref_exit_nodes, );
+
+
//boolean enableTransparentProxy =
prefs.getBoolean(TorConstants.PREF_TRANSPARENT, false);
if (currentStatus == STATUS_ON)
@@ -1303,6 +1307,14 @@
logException(unable to setup transproxy,e);
}
}
+
+if (exitNodes.length() 0)
+{
+
+ mBinder.updateConfiguration(ExitNodes, exitNodes,
false);
+ mBinder.updateConfiguration(StrictExitNodes,
enableStrictExitNodes ? 1 : 0, false);
+
+}
if (useBridges)
{
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java
===
---
projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java
2011-05-16 03:49:54 UTC (rev 24752)
+++
projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java
2011-05-16 03:50:10 UTC (rev 24753)
@@ -335,15 +335,17 @@
script.append(ipTablesPath);
script.append( -I FORWARD);
- script.append( -s 192.168.43.0/24 -j ACCEPT);
+ script.append( -j ACCEPT);
script.append( || exit\n);
+ /*
script.append(ipTablesPath);
script.append( -P FORWARD DROP);
script.append( || exit\n);
+ */
script.append(ipTablesPath);
- script.append( -t nat -I POSTROUTING -s 192.168.43.0/24 -j
MASQUERADE);
+ script.append( -t nat -I POSTROUTING -j MASQUERADE);
script.append( || exit\n);
String[] cmdAdd = {script.toString()};
@@ -372,8 +374,8 @@
purgeIptables(context);
- //enableWifiHotspotRules(context);
-
+ enableWifiHotspotRules(context);
+
int torUid = context.getApplicationInfo().uid;
// Set up port redirection
@@ -472,6 +474,8 @@
String msg = res.toString();
TorService.logMessage(cmdAdd[0] + ;errCode= + code + ;resp=
+ msg);
+
+
return code;
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24754: {} adding tor control java lib to project (projects/android/trunk/Orbot/libs)
Author: n8fr8 Date: 2011-05-16 03:51:08 + (Mon, 16 May 2011) New Revision: 24754 Added: projects/android/trunk/Orbot/libs/jtorctrl.jar Log: adding tor control java lib to project Added: projects/android/trunk/Orbot/libs/jtorctrl.jar === (Binary files differ) Property changes on: projects/android/trunk/Orbot/libs/jtorctrl.jar ___ Added: svn:executable + * Added: svn:mime-type + application/octet-stream ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24735: {projects} fixed onboot handling and updated transproxy (in projects/android/trunk/Orbot/src/org/torproject/android: . service)
Author: n8fr8
Date: 2011-05-10 02:08:16 + (Tue, 10 May 2011)
New Revision: 24735
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java
projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java
Log:
fixed onboot handling and updated transproxy
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java
===
--- projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java
2011-05-10 01:43:30 UTC (rev 24734)
+++ projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java
2011-05-10 02:08:16 UTC (rev 24735)
@@ -1,5 +1,7 @@
package org.torproject.android;
+import org.torproject.android.service.TorService;
+
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -8,10 +10,18 @@
@Override
public void onReceive(Context context, Intent intent) {
- Intent serviceIntent = new Intent();
-
serviceIntent.setAction(org.torproject.android.service.TorService);
- context.startService(serviceIntent);
+ if (intent.getAction() != null
+
intent.getAction().equals(android.intent.action.BOOT_COMPLETED))
+ {
+ //Phase 1: Launch a service
+ Intent service = new Intent();
+ service.setAction(onboot);
+ service.setClass(context, TorService.class);
+ context.startService(service);
+ }
+
+
}
Modified: projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
===
--- projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
2011-05-10 01:43:30 UTC (rev 24734)
+++ projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
2011-05-10 02:08:16 UTC (rev 24735)
@@ -68,7 +68,6 @@
//if Tor binary is not running, then start the service up
startService(new Intent(INTENT_TOR_SERVICE));
- bindService ();
setTheme(android.R.style.Theme_Black_NoTitleBar);
@@ -81,6 +80,9 @@
lblStatus.setOnLongClickListener(this);
imgStatus = (ImageView)findViewById(R.id.imgStatus);
imgStatus.setOnLongClickListener(this);
+
+
+
}
/*
@@ -248,13 +250,10 @@
protected void onPause() {
super.onPause();
- if (progressDialog != null)
- {
- progressDialog.dismiss();
- progressDialog = null;
- }
-
+ hideProgressDialog();
+ if (aDialog != null)
+ aDialog.dismiss();
}
public void onSaveInstanceState(Bundle savedInstanceState) {
@@ -333,6 +332,8 @@
protected void onResume() {
super.onResume();
+ bindService();
+
updateStatus();
if (getIntent() == null)
@@ -423,7 +424,6 @@
updateStatus ();
-
}
/* (non-Javadoc)
@@ -432,7 +432,7 @@
protected void onStop() {
super.onStop();
- unbindService();
+ //unbindService();
}
@@ -478,13 +478,20 @@
}
}
+ AlertDialog aDialog = null;
+
private void showAlert(String title, String msg, boolean button)
{
- AlertDialog aDialog = null;
+ try
+ {
+ if (aDialog != null aDialog.isShowing())
+ aDialog.dismiss();
+ }
+ catch (Exception e){} //swallow any errors
if (button)
{
-aDialog = new AlertDialog.Builder(this)
+ aDialog = new AlertDialog.Builder(this)
.setIcon(R.drawable.icon)
.setTitle(title)
.setMessage(msg)
@@ -520,13 +527,8 @@
{
imgStatus.setImageResource(R.drawable.toron);
- if (progressDialog != null)
- {
- progressDialog.dismiss();
- progressDialog = null;
- }
+ hideProgressDialog();
-
[tor-commits] r24737: {projects} project file modifications (projects/android/trunk/Orbot)
Author: n8fr8 Date: 2011-05-10 02:08:50 + (Tue, 10 May 2011) New Revision: 24737 Modified: projects/android/trunk/Orbot/AndroidManifest.xml projects/android/trunk/Orbot/BUILD projects/android/trunk/Orbot/CHANGELOG Log: project file modifications Modified: projects/android/trunk/Orbot/AndroidManifest.xml === --- projects/android/trunk/Orbot/AndroidManifest.xml2011-05-10 02:08:28 UTC (rev 24736) +++ projects/android/trunk/Orbot/AndroidManifest.xml2011-05-10 02:08:50 UTC (rev 24737) @@ -1,6 +1,6 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; - package=org.torproject.android android:versionName=0.2.2.22-orbot-alpha-1.0.5.20110503a-dev android:versionCode=11 + package=org.torproject.android android:versionName=0.2.2.25-orbot-alpha-1.0.5 android:versionCode=11 uses-permission android:name=android.permission.INTERNET / uses-permission android:name=android.permission.RECEIVE_BOOT_COMPLETED/ @@ -46,9 +46,8 @@ receiver android:name=.OnBootReceiver intent-filter - action - android:name=android.intent.action.BOOT_COMPLETED / - category android:name=android.intent.category.HOME / + action android:name=android.intent.action.BOOT_COMPLETED / + category android:name=android.intent.category.HOME / /intent-filter /receiver Modified: projects/android/trunk/Orbot/BUILD === --- projects/android/trunk/Orbot/BUILD 2011-05-10 02:08:28 UTC (rev 24736) +++ projects/android/trunk/Orbot/BUILD 2011-05-10 02:08:50 UTC (rev 24737) @@ -73,7 +73,7 @@ cd ~/mydroid/external/libevent svn co https://levent.svn.sourceforge.net/svnroot/levent/tags/release-1.4.12-stable/libevent/ . - export LIBEVENTDIR=`pwd` + export LIBEVENTDIR=`cd $DROID_ROOT/external/libevent pwd` ./autogen.sh # Put the contents of http://pastebin.ca/1577207 in /tmp/libevent-patch patch /tmp/libevent-patch @@ -81,14 +81,14 @@ make Copy over the libevent library: - cp .libs/libevent.a ~/mydroid/out/target/product/generic/obj/lib + cp .libs/libevent.a $DROID_ROOT/out/target/product/generic/obj/lib Fetch and build Tor: - export OPENSSLDIR=`cd ~/mydroid/external/openssl/include/ pwd` - export ZLIBDIR=`cd ~/mydroid/external/zlib pwd` + export OPENSSLDIR=`cd $DROID_ROOT/external/openssl/include/ pwd` + export ZLIBDIR=`cd $DROID_ROOT/external/zlib pwd` - cd ~/mydroid/external/tor + cd $DROID_ROOT/external/tor git clone git://git.torproject.org/git/tor.git cd tor/ ./autogen.sh @@ -98,17 +98,16 @@ make At this point, you'll have a Tor binary that can be run on an Android handset. +You can verify the ARM binary was properly built using the following command: + +file src/or/tor + +You should see something like: +src/or/tor: ELF 32-bit LSB executable, ARM, version 1 (SYSV), dynamically linked (uses shared libs), not stripped + This isn't enough though and we'll now sew up the binary into a small package that will handle basic Tor controlling features. -We need to build our Java SOCKS library: - - # If you're in Orbot's directory already... - cd ../asocks/ - ant compile - ant jar - cp bin/jar/asocks.jar ../Orbot/libs - We need to get the TorControl library for Java: (see also https://svn.torproject.org/svn/torctl/trunk/doc/howto.txt) @@ -124,8 +123,8 @@ export APP_SDK=~/Documents/projects/android/android-sdk-linux_x86-1.5_r3/tools cd ../Orbot/ - cp ~/mydroid/external/privoxy/privoxy-3.0.12-stable/privoxy assets/privoxy - cp ~/mydroid/external/tor/tor/src/or/tor assets/tor + cp $DROID_ROOT/external/privoxy/privoxy-3.0.12-stable/privoxy assets/privoxy + cp $DROID_ROOT/external/tor/tor/src/or/tor assets/tor $APP_SDK/android update project --name Orbot --target 3 --path . ant release Modified: projects/android/trunk/Orbot/CHANGELOG === --- projects/android/trunk/Orbot/CHANGELOG 2011-05-10 02:08:28 UTC (rev 24736) +++ projects/android/trunk/Orbot/CHANGELOG 2011-05-10 02:08:50 UTC (rev 24737) @@ -1,6 +1,8 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ 1.0.5 +- fixed tor binary installation issue related to max resource size and compression +- updated start on boot code to test for proper launch event - updated to Tor 0.2.2.25-alpha binary - moved back to single notification bar id to avoid double
[tor-commits] r24738: {} added new drawable graphics resource for errors (projects/android/trunk/Orbot/res/drawable)
Author: n8fr8 Date: 2011-05-10 02:09:51 + (Tue, 10 May 2011) New Revision: 24738 Added: projects/android/trunk/Orbot/res/drawable/torerror.png Log: added new drawable graphics resource for errors Added: projects/android/trunk/Orbot/res/drawable/torerror.png === (Binary files differ) Property changes on: projects/android/trunk/Orbot/res/drawable/torerror.png ___ Added: svn:executable + * Added: svn:mime-type + application/octet-stream ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24717: {projects} fixed 'leaky' dialog box error (in projects/android/trunk/Orbot/src/org/torproject/android: . service)
Author: n8fr8
Date: 2011-05-03 06:41:34 + (Tue, 03 May 2011)
New Revision: 24717
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
Log:
fixed 'leaky' dialog box error
Modified: projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
===
--- projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
2011-05-03 05:58:58 UTC (rev 24716)
+++ projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
2011-05-03 06:41:34 UTC (rev 24717)
@@ -248,6 +248,12 @@
protected void onPause() {
super.onPause();
+ if (progressDialog != null)
+ {
+ progressDialog.dismiss();
+ progressDialog = null;
+ }
+
}
@@ -472,21 +478,18 @@
}
}
- private AlertDialog aDialog = null;
-
private void showAlert(String title, String msg, boolean button)
{
- if (aDialog != null)
- aDialog.dismiss();
+ AlertDialog aDialog = null;
if (button)
{
-aDialog = new AlertDialog.Builder(this)
-.setIcon(R.drawable.icon)
- .setTitle(title)
- .setMessage(msg)
- .setPositiveButton(android.R.string.ok, null)
- .show();
+aDialog = new AlertDialog.Builder(this)
+.setIcon(R.drawable.icon)
+.setTitle(title)
+.setMessage(msg)
+.setPositiveButton(android.R.string.ok, null)
+.show();
}
else
{
@@ -496,6 +499,7 @@
.setMessage(msg)
.show();
}
+
}
/*
* Set the state of the running/not running graphic and label
@@ -515,6 +519,7 @@
{
imgStatus.setImageResource(R.drawable.toron);
+
if (progressDialog != null)
{
progressDialog.dismiss();
@@ -544,8 +549,10 @@
showAlert(getString(R.string.status_activated),getString(R.string.connect_first_time),true);
}
+
if (mItemOnOff != null)
mItemOnOff.setTitle(R.string.menu_stop);
+
}
else if (torStatus == STATUS_CONNECTING)
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
===
---
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
2011-05-03 05:58:58 UTC (rev 24716)
+++
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
2011-05-03 06:41:34 UTC (rev 24717)
@@ -600,14 +600,13 @@
else
{
TorTransProxy.purgeIptables(this);
- showAlert(Status, Transparent proxying
DISABLED);
-
+ showAlert(Status, Transparent proxying:
DISABLED);
}
}
else
{
TorTransProxy.purgeIptables(this);
- showAlert(Status, Transparent proxying DISABLED);
+ showAlert(Status, Transparent proxying: DISABLED);
}
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24718: {projects} small fixes to fix progress dialog and alert box glitches (projects/android/trunk/Orbot/src/org/torproject/android)
Author: n8fr8
Date: 2011-05-03 06:49:25 + (Tue, 03 May 2011)
New Revision: 24718
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
Log:
small fixes to fix progress dialog and alert box glitches
Modified: projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
===
--- projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
2011-05-03 06:41:34 UTC (rev 24717)
+++ projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
2011-05-03 06:49:25 UTC (rev 24718)
@@ -500,6 +500,7 @@
.show();
}
+aDialog.setCanceledOnTouchOutside(true);
}
/*
* Set the state of the running/not running graphic and label
@@ -518,7 +519,6 @@
if (torStatus == STATUS_ON)
{
imgStatus.setImageResource(R.drawable.toron);
-
if (progressDialog != null)
{
@@ -559,11 +559,8 @@
{
imgStatus.setImageResource(R.drawable.torstarting);
- if (progressDialog == null)
- {
- progressDialog
=ProgressDialog.show(this, , getString(R.string.status_starting_up));
- }
- else
+
+ if (progressDialog != null)
progressDialog.setMessage(torServiceMsg);
if (mItemOnOff != null)
@@ -594,7 +591,6 @@
progressDialog = null;
}
-
imgStatus.setImageResource(R.drawable.toroff);
lblStatus.setText(getString(R.string.status_disabled) + \n +
getString(R.string.press_to_start));
@@ -725,11 +721,7 @@
break;
case TorServiceConstants.ENABLE_TOR_MSG:
- if (progressDialog == null)
- {
- progressDialog =
ProgressDialog.show(Orbot.this, , getString(R.string.status_starting_up));
- }
-
+
createProgressDialog(getString(R.string.status_starting_up));
updateStatus((String)msg.getData().getString(HANDLER_TOR_MSG));
@@ -745,6 +737,17 @@
}
}
+private synchronized void createProgressDialog (String msg)
+{
+ if (progressDialog == null)
+ {
+ progressDialog =
ProgressDialog.show(Orbot.this, , msg);
+
+ progressDialog.setCancelable(true);
+ }
+
+}
+
};
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24713: {projects} merged __sporkbomb's xclnt patch for fixing transproxy all m (projects/android/trunk/Orbot/src/org/torproject/android/service)
Author: n8fr8
Date: 2011-05-03 05:56:04 + (Tue, 03 May 2011)
New Revision: 24713
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java
Log:
merged __sporkbomb's xclnt patch for fixing transproxy all mode
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java
===
---
projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java
2011-05-03 05:54:24 UTC (rev 24712)
+++
projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java
2011-05-03 05:56:04 UTC (rev 24713)
@@ -125,19 +125,52 @@
}
*/
- public static int setTransparentProxyingByApp(Context context,
TorifiedApp[] apps, boolean forceAll) throws Exception
+ public static int testOwnerModule(Context context) throws Exception
{
boolean runRoot = true;
boolean waitFor = true;
- //android.os.Debug.waitForDebugger();
+ //redirectDNSResolvConf(); //not working yet
+ int torUid = context.getApplicationInfo().uid;
+
+ String ipTablesPath = new File(context.getDir(bin,
0),iptables).getAbsolutePath();
+ StringBuilder script = new StringBuilder();
+
+ StringBuilder res = new StringBuilder();
+ int code = -1;
+
+ // Allow everything for Tor
+ script.append(ipTablesPath);
+ script.append( -t filter);
+ script.append( -A OUTPUT);
+ script.append( -m owner --uid-owner );
+ script.append(torUid);
+ script.append( -j ACCEPT);
+ script.append( || exit\n);
+
+ String[] cmdAdd = {script.toString()};
+
+ code = TorServiceUtils.doShellCommand(cmdAdd, res, runRoot,
waitFor);
+ String msg = res.toString();
+ TorService.logMessage(cmdAdd[0] + ;errCode= + code + ;resp=
+ msg);
+
+
+ return code;
+}
+
+
+
+ public static int setTransparentProxyingByApp(Context context,
TorifiedApp[] apps) throws Exception
+ {
+
+ boolean runRoot = true;
+ boolean waitFor = true;
+
//redirectDNSResolvConf(); //not working yet
String ipTablesPath = new File(context.getDir(bin,
0),iptables).getAbsolutePath();
-
- boolean ipTablesOld = false;
StringBuilder script = new StringBuilder();
@@ -145,14 +178,12 @@
int code = -1;
purgeIptables(context);
-
- script = new StringBuilder();
-
+
//build up array of shell cmds to execute under one root context
for (int i = 0; i apps.length; i++)
{
- if (forceAll || apps[i].isTorified()) //if Tor
Everything on or app is set to true
+ if (apps[i].isTorified()) //if app is set to true
{
if
(apps[i].getUsername().equals(TorServiceConstants.TOR_APP_USERNAME))
@@ -170,14 +201,8 @@
script.append( -m owner --uid-owner );
script.append(apps[i].getUid());
script.append( -m tcp --syn);
-
- if (ipTablesOld)
- script.append( -j DNAT --to
127.0.0.1:);
- else
- script.append( -j REDIRECT --to-ports
);
-
+ script.append( -j REDIRECT --to-ports );
script.append(TOR_TRANSPROXY_PORT);
-
script.append( || exit\n);
//DNS
@@ -187,57 +212,37 @@
script.append(apps[i].getUid());
script.append( -m udp --dport );
script.append(STANDARD_DNS_PORT);
+ script.append( -j REDIRECT --to-ports );
+ script.append(TOR_DNS_PORT);
+ script.append( || exit\n);
- if (ipTablesOld)
- script.append( -j DNAT --to
127.0.0.1:);
- else
- script.append( -j REDIRECT --to-ports
);
+
[tor-commits] r24714: {projects} general cleanup on detecting iptables status and startup/shu (in projects/android/trunk/Orbot/src/org/torproject/android: . service)
Author: n8fr8
Date: 2011-05-03 05:56:40 + (Tue, 03 May 2011)
New Revision: 24714
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
projects/android/trunk/Orbot/src/org/torproject/android/WizardHelper.java
projects/android/trunk/Orbot/src/org/torproject/android/service/ITorService.aidl
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
projects/android/trunk/Orbot/src/org/torproject/android/service/TorServiceConstants.java
projects/android/trunk/Orbot/src/org/torproject/android/service/TorServiceUtils.java
Log:
general cleanup on detecting iptables status and startup/shutdown calls
Modified: projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
===
--- projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
2011-05-03 05:56:04 UTC (rev 24713)
+++ projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
2011-05-03 05:56:40 UTC (rev 24714)
@@ -75,6 +75,12 @@
prefs = PreferenceManager.getDefaultSharedPreferences(this);
+ setContentView(R.layout.layout_main);
+
+ lblStatus = (TextView)findViewById(R.id.lblStatus);
+ lblStatus.setOnLongClickListener(this);
+ imgStatus = (ImageView)findViewById(R.id.imgStatus);
+ imgStatus.setOnLongClickListener(this);
}
/*
@@ -199,8 +205,8 @@
stopTor();
+ stopService(new Intent(ITorService.class.getName()));
-
NotificationManager mNotificationManager =
(NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
mNotificationManager.cancelAll();
@@ -321,7 +327,6 @@
protected void onResume() {
super.onResume();
-showMain();
updateStatus();
if (getIntent() == null)
@@ -427,21 +432,6 @@
/*
-* Show the main form UI
-*/
- private void showMain ()
-{
-
- setContentView(R.layout.layout_main);
-
- lblStatus = (TextView)findViewById(R.id.lblStatus);
- lblStatus.setOnLongClickListener(this);
- imgStatus = (ImageView)findViewById(R.id.imgStatus);
- imgStatus.setOnLongClickListener(this);
-
-}
-
- /*
* Launch the system activity for Uri viewing with the provided url
*/
private void openBrowser(String url)
@@ -482,11 +472,16 @@
}
}
+ private AlertDialog aDialog = null;
+
private void showAlert(String title, String msg, boolean button)
{
+ if (aDialog != null)
+ aDialog.dismiss();
+
if (button)
{
-new AlertDialog.Builder(this)
+aDialog = new AlertDialog.Builder(this)
.setIcon(R.drawable.icon)
.setTitle(title)
.setMessage(msg)
@@ -495,7 +490,7 @@
}
else
{
-new AlertDialog.Builder(this)
+aDialog = new AlertDialog.Builder(this)
.setIcon(R.drawable.icon)
.setTitle(title)
.setMessage(msg)
@@ -519,7 +514,7 @@
if (torStatus == STATUS_ON)
{
imgStatus.setImageResource(R.drawable.toron);
- // imgStatus.clearAnimation();
+
if (progressDialog != null)
{
progressDialog.dismiss();
@@ -535,8 +530,6 @@
if (torServiceMsg.length() 0)
showAlert(Update, torServiceMsg,
false);
- SharedPreferences prefs =
PreferenceManager.getDefaultSharedPreferences(this);
-
boolean showFirstTime =
prefs.getBoolean(connect_first_time,true);
if (showFirstTime)
@@ -572,7 +565,7 @@
}
else if (torStatus == STATUS_OFF)
{
-
imgStatus.setImageResource(R.drawable.torstopping);
+ imgStatus.setImageResource(R.drawable.toroff);
if (progressDialog != null)
{
@@ -615,10 +608,6 @@
private void startTor () throws RemoteException
[tor-commits] r24715: {projects} updating strings, layouts and drawables. removing unneeded b (in projects/android/trunk/Orbot/res: drawable layout raw values)
Author: n8fr8 Date: 2011-05-03 05:58:19 + (Tue, 03 May 2011) New Revision: 24715 Added: projects/android/trunk/Orbot/res/drawable/tornotificationerr.png Removed: projects/android/trunk/Orbot/res/raw/busybox_g1 Modified: projects/android/trunk/Orbot/res/layout/layout_main.xml projects/android/trunk/Orbot/res/values/strings.xml Log: updating strings, layouts and drawables. removing unneeded busybox binary. Added: projects/android/trunk/Orbot/res/drawable/tornotificationerr.png === (Binary files differ) Property changes on: projects/android/trunk/Orbot/res/drawable/tornotificationerr.png ___ Added: svn:mime-type + application/octet-stream Modified: projects/android/trunk/Orbot/res/layout/layout_main.xml === --- projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-05-03 05:56:40 UTC (rev 24714) +++ projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-05-03 05:58:19 UTC (rev 24715) @@ -61,7 +61,7 @@ android:gravity=center_horizontal android:textStyle=bold android:width=330px - android:height=125px + android:height=75px android:textColor=#ff / /TableRow Deleted: projects/android/trunk/Orbot/res/raw/busybox_g1 === (Binary files differ) Modified: projects/android/trunk/Orbot/res/values/strings.xml === --- projects/android/trunk/Orbot/res/values/strings.xml 2011-05-03 05:56:40 UTC (rev 24714) +++ projects/android/trunk/Orbot/res/values/strings.xml 2011-05-03 05:58:19 UTC (rev 24715) @@ -34,6 +34,7 @@ string name=menu_wizardWizard/string + string name=button_helpHelp/string string name=button_closeClose/string string name=button_aboutAbout/string ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24716: {projects} updating project files, including re-enabling onBoot mode fo (projects/android/trunk/Orbot)
Author: n8fr8 Date: 2011-05-03 05:58:58 + (Tue, 03 May 2011) New Revision: 24716 Modified: projects/android/trunk/Orbot/AndroidManifest.xml projects/android/trunk/Orbot/AndroidManifest.xml.production projects/android/trunk/Orbot/CHANGELOG projects/android/trunk/Orbot/LICENSE Log: updating project files, including re-enabling onBoot mode for Orbot service Modified: projects/android/trunk/Orbot/AndroidManifest.xml === --- projects/android/trunk/Orbot/AndroidManifest.xml2011-05-03 05:58:19 UTC (rev 24715) +++ projects/android/trunk/Orbot/AndroidManifest.xml2011-05-03 05:58:58 UTC (rev 24716) @@ -1,8 +1,9 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; - package=org.torproject.android android:versionName=0.2.2.22-orbot-alpha-1.0.5-dev-debug android:versionCode=11 + package=org.torproject.android android:versionName=0.2.2.22-orbot-alpha-1.0.5.20110503a-dev android:versionCode=11 uses-permission android:name=android.permission.INTERNET / + uses-permission android:name=android.permission.RECEIVE_BOOT_COMPLETED/ application android:icon=@drawable/icon android:label=@string/app_name android:debuggable=false @@ -32,7 +33,10 @@ activity android:name=.AppManager android:label=@string/app_name/ activity android:name=.WizardActivity android:label=@string/app_name/ - service android:name=.service.TorService android:process=:remote + service android:enabled=true + android:name=.service.TorService + android:exported=false + intent-filter action android:name=org.torproject.android.service.ITorService / action android:name=org.torproject.android.service.TOR_SERVICE / @@ -40,6 +44,13 @@ /service + receiver android:name=.OnBootReceiver + intent-filter + action + android:name=android.intent.action.BOOT_COMPLETED / + category android:name=android.intent.category.HOME / + /intent-filter + /receiver /application Modified: projects/android/trunk/Orbot/AndroidManifest.xml.production === --- projects/android/trunk/Orbot/AndroidManifest.xml.production 2011-05-03 05:58:19 UTC (rev 24715) +++ projects/android/trunk/Orbot/AndroidManifest.xml.production 2011-05-03 05:58:58 UTC (rev 24716) @@ -1,11 +1,11 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; - package=org.torproject.android android:versionName=0.2.2.14-orbot-alpha-1.0.3 android:versionCode=9 + package=org.torproject.android android:versionName=0.2.2.22-orbot-alpha-1.0.5.20110416a-dev android:versionCode=11 uses-permission android:name=android.permission.INTERNET / - + uses-permission android:name=android.permission.RECEIVE_BOOT_COMPLETED/ -application android:icon=@drawable/icon android:label=@string/app_name android:debuggable=false +application android:icon=@drawable/icon android:label=@string/app_name android:debuggable=true activity android:name=.Orbot android:theme=@android:style/Theme.NoTitleBar @@ -33,7 +33,10 @@ activity android:name=.AppManager android:label=@string/app_name/ activity android:name=.WizardActivity android:label=@string/app_name/ - service android:name=.service.TorService android:process=:remote + service android:enabled=true + android:name=.service.TorService + android:exported=false + intent-filter action android:name=org.torproject.android.service.ITorService / action android:name=org.torproject.android.service.TOR_SERVICE / @@ -41,6 +44,13 @@ /service + receiver android:name=.OnBootReceiver + intent-filter + action + android:name=android.intent.action.BOOT_COMPLETED / + category android:name=android.intent.category.HOME / + /intent-filter + /receiver /application Modified: projects/android/trunk/Orbot/CHANGELOG === --- projects/android/trunk/Orbot/CHANGELOG 2011-05-03 05:58:19 UTC (rev 24715) +++ projects/android/trunk/Orbot/CHANGELOG 2011-05-03 05:58:58 UTC (rev 24716) @@ -1,6 +1,7 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at
[tor-commits] r24645: {projects} Improved transproxy code for background service (projects/android/trunk/Orbot/src/org/torproject/android/service)
Author: n8fr8
Date: 2011-04-17 06:04:27 + (Sun, 17 Apr 2011)
New Revision: 24645
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/service/Api.java
projects/android/trunk/Orbot/src/org/torproject/android/service/ITorService.aidl
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
projects/android/trunk/Orbot/src/org/torproject/android/service/TorServiceConstants.java
projects/android/trunk/Orbot/src/org/torproject/android/service/TorServiceUtils.java
projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java
Log:
Improved transproxy code for background service
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/service/Api.java
===
--- projects/android/trunk/Orbot/src/org/torproject/android/service/Api.java
2011-04-17 06:03:32 UTC (rev 24644)
+++ projects/android/trunk/Orbot/src/org/torproject/android/service/Api.java
2011-04-17 06:04:27 UTC (rev 24645)
@@ -801,23 +801,29 @@
boolean changed = false;
try {
// Check iptables_g1
- File file = new File(ctx.getDir(bin,0),
iptables_g1);
+ File file = new File(ctx.getDir(bin,0), iptables);
+
if ((!file.exists()) isARMv6()) {
copyRawFile(ctx, R.raw.iptables_g1, file,
755);
changed = true;
}
+
// Check iptables_n1
- file = new File(ctx.getDir(bin,0), iptables_n1);
+ file = new File(ctx.getDir(bin,0), iptables);
if ((!file.exists()) (!isARMv6())) {
copyRawFile(ctx, R.raw.iptables_n1, file,
755);
changed = true;
}
+
// Check busybox
+ /*
file = new File(ctx.getDir(bin,0), busybox_g1);
if (!file.exists()) {
copyRawFile(ctx, R.raw.busybox_g1, file, 755);
changed = true;
}
+ */
+
if (changed) {
Toast.makeText(ctx,
R.string.status_install_success, Toast.LENGTH_LONG).show();
}
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/service/ITorService.aidl
===
---
projects/android/trunk/Orbot/src/org/torproject/android/service/ITorService.aidl
2011-04-17 06:03:32 UTC (rev 24644)
+++
projects/android/trunk/Orbot/src/org/torproject/android/service/ITorService.aidl
2011-04-17 06:04:27 UTC (rev 24645)
@@ -37,6 +37,11 @@
* Set configuration
**/
boolean updateConfiguration (String name, String value, boolean
saveToDisk);
+
+/**
+* Set configuration
+**/
+void processSettings();
/**
* Set configuration
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
===
---
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
2011-04-17 06:03:32 UTC (rev 24644)
+++
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
2011-04-17 06:04:27 UTC (rev 24645)
@@ -4,6 +4,7 @@
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.Socket;
import java.util.ArrayList;
@@ -18,8 +19,10 @@
import org.torproject.android.AppManager;
import org.torproject.android.Orbot;
+import org.torproject.android.ProcessSettingsAsyncTask;
import org.torproject.android.R;
import org.torproject.android.TorConstants;
+import org.torproject.android.Utils;
import android.app.AlertDialog;
import android.app.Notification;
@@ -31,6 +34,7 @@
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.os.IBinder;
+import android.os.Looper;
import android.os.RemoteCallbackList;
import android.os.RemoteException;
import android.preference.PreferenceManager;
@@ -39,6 +43,7 @@
public class TorService extends Service implements TorServiceConstants,
Runnable, EventHandler
{
+ private static boolean ENABLE_DEBUG_LOG = false;
private static int currentStatus = STATUS_READY;
@@ -48,6 +53,7 @@
private static TorService _torInstance;
private static final int NOTIFY_ID = 1;
+ private static int NOTIFY_ID_ERROR = 2;
private static final int MAX_START_TRIES =
[tor-commits] r24633: {projects} updating our license to include Privoxy (projects/android/trunk/Orbot)
Author: n8fr8 Date: 2011-04-16 13:16:49 + (Sat, 16 Apr 2011) New Revision: 24633 Modified: projects/android/trunk/Orbot/LICENSE Log: updating our license to include Privoxy Modified: projects/android/trunk/Orbot/LICENSE === --- projects/android/trunk/Orbot/LICENSE2011-04-15 16:39:35 UTC (rev 24632) +++ projects/android/trunk/Orbot/LICENSE2011-04-16 13:16:49 UTC (rev 24633) @@ -3,7 +3,7 @@ It also lists the licenses for other components used by Orbot. -For more information about Orbot, see http://guardianproject.info/ +For more information about Orbot, see https://guardianproject.info/apps/orbot If you got this file as a part of a larger bundle, there may be other license terms that you should be aware of. @@ -41,15 +41,21 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * -Orbot contains a binary distribution of the JSocks library: -http://code.google.com/p/jsocks-mirror/ -which is licensed under the GNU Lesser General Public License: -http://www.gnu.org/licenses/lgpl.html +Orbot contains a binary distribution of Privoxy (http://www.privoxy.org/) +Copyright © 2001-2010 by Privoxy Developers ijbswa-develop...@lists.sourceforge.net +http://www.privoxy.org/user-manual/copyright.html -* -Orbot contains the source code for HttpProxy developed and freely licensed -by: Julian Robichaux -- http://www.nsftools.com +Some source code is based on code Copyright © 1997 by Anonymous Coders and Junkbusters, Inc. +and licensed under the GNU General Public License. +Privoxy is free software; you can redistribute it and/or modify it under the terms of the +GNU General Public License, version 2, as published by the Free Software Foundation. + +This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; +without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +See the GNU General Public License for details. +http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + ** Orbot contains a binary distribution of Tor: @@ -63,7 +69,6 @@ If you got this file as a part of a larger bundle, there may be other license terms that you should be aware of. - === Tor is distributed under this license: ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24634: {projects} added Privoxy info and link to about dialog (projects/android/trunk/Orbot/res/layout)
Author: n8fr8 Date: 2011-04-16 13:21:22 + (Sat, 16 Apr 2011) New Revision: 24634 Modified: projects/android/trunk/Orbot/res/layout/layout_about.xml Log: added Privoxy info and link to about dialog Modified: projects/android/trunk/Orbot/res/layout/layout_about.xml === --- projects/android/trunk/Orbot/res/layout/layout_about.xml2011-04-16 13:16:49 UTC (rev 24633) +++ projects/android/trunk/Orbot/res/layout/layout_about.xml2011-04-16 13:21:22 UTC (rev 24634) @@ -94,7 +94,13 @@ android:textColorLink=#ff android:paddingLeft=15px android:textColor=#ff / - + TextView android:text=Privoxy v3.0.12: http://www.privoxy.org; + android:layout_width=fill_parent + android:layout_height=wrap_content + android:autoLink=web + android:textColorLink=#ff + android:paddingLeft=15px + android:textColor=#ff / /LinearLayout /ScrollView /LinearLayout ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24626: {projects} updated version number (projects/android/trunk/Orbot)
Author: n8fr8 Date: 2011-04-15 16:36:36 + (Fri, 15 Apr 2011) New Revision: 24626 Modified: projects/android/trunk/Orbot/AndroidManifest.xml Log: updated version number Modified: projects/android/trunk/Orbot/AndroidManifest.xml === --- projects/android/trunk/Orbot/AndroidManifest.xml2011-04-15 05:57:52 UTC (rev 24625) +++ projects/android/trunk/Orbot/AndroidManifest.xml2011-04-15 16:36:36 UTC (rev 24626) @@ -1,10 +1,9 @@ ?xml version=1.0 encoding=utf-8? manifest xmlns:android=http://schemas.android.com/apk/res/android; - package=org.torproject.android android:versionName=1.0.5 android:versionCode=11 + package=org.torproject.android android:versionName=0.2.2.22-orbot-alpha-1.0.5-dev-debug android:versionCode=11 uses-permission android:name=android.permission.INTERNET / - uses-permission android:name=android.permission.RECEIVE_BOOT_COMPLETED / - + application android:icon=@drawable/icon android:label=@string/app_name android:debuggable=false activity android:name=.Orbot @@ -40,13 +39,6 @@ /intent-filter /service - receiver android:name=.boot.OnbootBroadcastReceiver - intent-filter - action - android:name=android.intent.action.BOOT_COMPLETED / - category android:name=android.intent.category.HOME / - /intent-filter - /receiver /application ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24627: {projects} update to service with new transproxy/iptables code (projects/android/trunk/Orbot/src/org/torproject/android/service)
Author: n8fr8
Date: 2011-04-15 16:37:33 + (Fri, 15 Apr 2011)
New Revision: 24627
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/service/TorBinaryInstaller.java
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
projects/android/trunk/Orbot/src/org/torproject/android/service/TorServiceConstants.java
projects/android/trunk/Orbot/src/org/torproject/android/service/TorServiceUtils.java
projects/android/trunk/Orbot/src/org/torproject/android/service/TorTransProxy.java
Log:
update to service with new transproxy/iptables code
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/service/TorBinaryInstaller.java
===
---
projects/android/trunk/Orbot/src/org/torproject/android/service/TorBinaryInstaller.java
2011-04-15 16:36:36 UTC (rev 24626)
+++
projects/android/trunk/Orbot/src/org/torproject/android/service/TorBinaryInstaller.java
2011-04-15 16:37:33 UTC (rev 24627)
@@ -12,18 +12,23 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import org.torproject.android.R;
+
+import android.content.Context;
import android.util.Log;
public class TorBinaryInstaller implements TorServiceConstants {
- String installPath = null;
- String apkPath = null;
+ String installPath;
+ String apkPath;
+ Context context;
- public TorBinaryInstaller (String installPath, String apkPath)
+ public TorBinaryInstaller (Context context, String installPath, String
apkPath)
{
this.installPath = installPath;
this.apkPath = apkPath;
+ this.context = context;
}
/*
@@ -39,13 +44,42 @@
Log.d(TAG,Privoxy binary exists= + privoxyBinaryExists);
if (!(torBinaryExists privoxyBinaryExists) || force)
- installFromZip ();
+ installFromRaw ();
+
+
}
+ //
/*
* Extract the Tor binary from the APK file using ZIP
*/
+ private void installFromRaw ()
+ {
+
+
+ InputStream is =
context.getResources().openRawResource(R.raw.tor);
+ streamToFile(is,installPath + TOR_BINARY_ASSET_KEY);
+
+
+ is =
context.getResources().openRawResource(R.raw.torrc);
+ streamToFile(is,installPath + TORRC_ASSET_KEY);
+
+ is =
context.getResources().openRawResource(R.raw.privoxy);
+ streamToFile(is,installPath + PRIVOXY_ASSET_KEY);
+
+ is =
context.getResources().openRawResource(R.raw.privoxy_config);
+ streamToFile(is,installPath + PRIVOXYCONFIG_ASSET_KEY);
+
+
+
+ Log.d(TAG,SUCCESS: installed tor, privoxy binaries
from raw);
+
+
+ }
+ /*
+* Extract the Tor binary from the APK file using ZIP
+*/
private void installFromZip ()
{
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
===
---
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
2011-04-15 16:36:36 UTC (rev 24626)
+++
projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java
2011-04-15 16:37:33 UTC (rev 24627)
@@ -52,12 +52,16 @@
private static final int MAX_START_TRIES = 3;
private ArrayListString configBuffer = null;
-
+private ArrayListString resetBuffer = null;
+
-private String appHome = /data/data/ + TOR_APP_USERNAME + /;;
-private String torBinaryPath = appHome + TOR_BINARY_ASSET_KEY;
-private String privoxyPath = appHome + PRIVOXY_ASSET_KEY;
+private String appHome;
+private String appBinHome;
+private String appDataHome;
+private String torBinaryPath;
+private String privoxyPath;
+
private boolean hasRoot = false;
@@ -323,7 +327,8 @@
String[] cmd = { SHELL_CMD_KILL + ' ' + procId + };
TorServiceUtils.doShellCommand(cmd,log, false, false);
-
+ try { Thread.sleep(500); }
+ catch (Exception e){}
}
while ((procId = TorServiceUtils.findProcessId(privoxyPath)) !=
-1)
@@ -333,7 +338,8 @@
String[] cmd = { SHELL_CMD_KILL + ' ' + procId + };
[tor-commits] r24628: {projects} update to string for wizard with gibberbot link (in projects/android/trunk/Orbot/res: layout values values-ar values-ca values-de values-es values-fa values-mk values-
Author: n8fr8 Date: 2011-04-15 16:37:58 + (Fri, 15 Apr 2011) New Revision: 24628 Modified: projects/android/trunk/Orbot/res/layout/layout_main.xml projects/android/trunk/Orbot/res/layout/layout_wizard_tips.xml projects/android/trunk/Orbot/res/values-ar/strings.xml projects/android/trunk/Orbot/res/values-ca/strings.xml projects/android/trunk/Orbot/res/values-de/strings.xml projects/android/trunk/Orbot/res/values-es/strings.xml projects/android/trunk/Orbot/res/values-fa/strings.xml projects/android/trunk/Orbot/res/values-mk/strings.xml projects/android/trunk/Orbot/res/values-nl/strings.xml projects/android/trunk/Orbot/res/values-pl/strings.xml projects/android/trunk/Orbot/res/values-ru/strings.xml projects/android/trunk/Orbot/res/values-zh/strings.xml projects/android/trunk/Orbot/res/values/strings.xml Log: update to string for wizard with gibberbot link Modified: projects/android/trunk/Orbot/res/layout/layout_main.xml === --- projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -58,7 +58,7 @@ android:layout_gravity=center_horizontal android:gravity=center_horizontal android:textStyle=bold - android:width=300px + android:width=330px android:height=75px android:textColor=#ff / Modified: projects/android/trunk/Orbot/res/layout/layout_wizard_tips.xml === --- projects/android/trunk/Orbot/res/layout/layout_wizard_tips.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/layout/layout_wizard_tips.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -17,7 +17,7 @@ TextView android:text=@string/wizard_tips_msg android:layout_gravity=left android:textColor=#ff android:id=@+id/TextView01 android:layout_width=wrap_content android:layout_height=wrap_content/TextView -Button android:text=@string/wizard_tips_otrchat android:layout_gravity=left android:drawableLeft=@drawable/icon_otrchat android:layout_marginTop=10px android:id=@+id/WizardRootButtonInstallOtrchat android:layout_width=wrap_content android:layout_height=wrap_content/ +Button android:text=@string/wizard_tips_otrchat android:layout_gravity=left android:drawableLeft=@drawable/ic_launcher_gibberbot android:layout_marginTop=10px android:id=@+id/WizardRootButtonInstallOtrchat android:layout_width=wrap_content android:layout_height=wrap_content/ Button android:text=@string/wizard_tips_orweb android:drawableLeft=@drawable/icon_orweb android:layout_marginTop=10px android:id=@+id/WizardRootButtonInstallOrweb android:layout_width=wrap_content android:layout_height=wrap_content/ Modified: projects/android/trunk/Orbot/res/values/strings.xml === --- projects/android/trunk/Orbot/res/values/strings.xml 2011-04-15 16:37:33 UTC (rev 24627) +++ projects/android/trunk/Orbot/res/values/strings.xml 2011-04-15 16:37:58 UTC (rev 24628) @@ -94,7 +94,7 @@ string name=wizard_tips_tricksOrbot-enabled Apps/string string name=wizard_tips_msgWe encourage you to download amp; use apps that know how to connect directly to Orbot. Click on the buttons below to install./string -string name=wizard_tips_otrchatOTRCHAT - Secure instant messaging client for Android/string +string name=wizard_tips_otrchatGibberbot - Secure instant messaging client for Android/string string name=wizard_tips_orwebORWEB (Android 1.x Only) - Browser designed for privacy amp; for Orbot/string string name=wizard_tips_proxyProxy Settings - Learn how to configure apps to work with Orbot/string @@ -108,8 +108,8 @@ string name=wizard_finalOrbot is ready!/string string name=wizard_final_msgHundreds of thousands of people around the world use Tor for a wide variety of reasons: journalists and bloggers, human rights workers, law enforcement officers, soldiers, corporations, citizens of repressive regimes, and just ordinary citizens... and now you are ready to, as well!/string -string name=otrchat_apk_urlhttps://guardianproject.info/getgibber/string -string name=orweb_apk_urlhttps://guardianproject.info/getorweb/string +string name=otrchat_apk_urlmarket://search?q=pname:info.guardianproject.otr.app.im/string +string
[tor-commits] r24629: {} new gibberbot icon for wizard (projects/android/trunk/Orbot/res/drawable)
Author: n8fr8 Date: 2011-04-15 16:38:19 + (Fri, 15 Apr 2011) New Revision: 24629 Added: projects/android/trunk/Orbot/res/drawable/ic_launcher_gibberbot.png Log: new gibberbot icon for wizard Added: projects/android/trunk/Orbot/res/drawable/ic_launcher_gibberbot.png === (Binary files differ) Property changes on: projects/android/trunk/Orbot/res/drawable/ic_launcher_gibberbot.png ___ Added: svn:mime-type + application/octet-stream ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] r24631: {projects} handling settings update to stop hanging (projects/android/trunk/Orbot/src/org/torproject/android)
Author: n8fr8
Date: 2011-04-15 16:39:22 + (Fri, 15 Apr 2011)
New Revision: 24631
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java
projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
Log:
handling settings update to stop hanging
Modified:
projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java
===
--- projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java
2011-04-15 16:38:53 UTC (rev 24630)
+++ projects/android/trunk/Orbot/src/org/torproject/android/OnBootReceiver.java
2011-04-15 16:39:22 UTC (rev 24631)
@@ -14,5 +14,6 @@
}
+
}
Modified: projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
===
--- projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
2011-04-15 16:38:53 UTC (rev 24630)
+++ projects/android/trunk/Orbot/src/org/torproject/android/Orbot.java
2011-04-15 16:39:22 UTC (rev 24631)
@@ -16,6 +16,7 @@
import android.app.Activity;
import android.app.AlertDialog;
import android.app.NotificationManager;
+import android.app.ProgressDialog;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
@@ -44,10 +45,10 @@
{
/* Useful UI bits */
- private TextView txtMessageLog = null; //the full screen log view of
Tor control messages
+ //private TextView txtMessageLog = null; //the full screen log view of
Tor control messages
private TextView lblStatus = null; //the main text display widget
private ImageView imgStatus = null; //the main touchable image for
activating Orbot
-// private ProgressDialog progressDialog;
+ private ProgressDialog progressDialog;
private MenuItem mItemOnOff = null;
/* Some tracking bits */
@@ -59,6 +60,8 @@
/* The primary interface we will be calling on the service. */
ITorService mService = null;
private boolean autoStartOnBind = false;
+
+ SharedPreferences prefs;
Orbot mOrbot = null;
@@ -69,9 +72,9 @@
mOrbot = this;
setTheme(android.R.style.Theme_Black_NoTitleBar);
- //setTitle(getString(R.string.app_name) + ' ' +
getString(R.string.app_version));
-showMain();
-
+
+ prefs = PreferenceManager.getDefaultSharedPreferences(this);
+
}
/*
@@ -93,8 +96,8 @@
mItem = menu.add(0, 7, Menu.NONE, getString(R.string.menu_verify));
mItem.setIcon(R.drawable.ic_menu_check);
-mItem = menu.add(0,6, Menu.NONE, getString(R.string.menu_log));
-mItem.setIcon(R.drawable.ic_menu_reports);
+ // mItem = menu.add(0,6, Menu.NONE, getString(R.string.menu_log));
+ // mItem.setIcon(R.drawable.ic_menu_reports);
mItem = menu.add(0, 3, Menu.NONE, getString(R.string.menu_info));
mItem.setIcon(R.drawable.ic_menu_about);
@@ -146,10 +149,6 @@
{
showSettings();
}
- else if (item.getItemId() == 6)
- {
- showMessageLog();
- }
else if (item.getItemId() == 3)
{
showHelp();
@@ -193,6 +192,7 @@
* (non-Javadoc)
* @see android.app.Activity#onKeyDown(int, android.view.KeyEvent)
*/
+ /*
public boolean onKeyDown(int keyCode, KeyEvent event){
if(keyCode==KeyEvent.KEYCODE_BACK){
@@ -209,7 +209,7 @@
return super.onKeyDown(keyCode, event);
- }
+ }*/
/* (non-Javadoc)
* @see android.app.Activity#onPause()
@@ -306,7 +306,8 @@
protected void onResume() {
super.onResume();
-
+showMain();
+
if (getIntent() == null)
return;
@@ -361,7 +362,8 @@
else
{
-
+ //setTitle(getString(R.string.app_name) + ' ' +
getString(R.string.app_version));
+
NotificationManager mNotificationManager =
(NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
mNotificationManager.cancelAll();
@@ -382,6 +384,7 @@
new WizardHelper(this).showWizard();
}
+
}
}
@@ -400,9 +403,6 @@
}
-
-
-
/* (non-Javadoc)
* @see android.app.Activity#onStop()
*/
@@ -419,7 +419,7 @@
*/
private void showMain ()
{
- bindService();
[tor-commits] r24291: {website} modified version for new Android build (website/trunk/include)
Author: n8fr8 Date: 2011-03-02 21:15:28 + (Wed, 02 Mar 2011) New Revision: 24291 Modified: website/trunk/include/versions.wmi Log: modified version for new Android build Modified: website/trunk/include/versions.wmi === --- website/trunk/include/versions.wmi 2011-03-02 19:30:13 UTC (rev 24290) +++ website/trunk/include/versions.wmi 2011-03-02 21:15:28 UTC (rev 24291) @@ -47,8 +47,8 @@ define-tag version-vidalia-stable whitespace=delete0.2.10/define-tag -define-tag version-androidbundle-tor whitespace=delete0.2.2.14-alpha/define-tag -define-tag version-androidbundle-orbot whitespace=delete1.0.4/define-tag +define-tag version-androidbundle-tor whitespace=delete0.2.2.22-alpha/define-tag +define-tag version-androidbundle-orbot whitespace=delete1.0.4.1/define-tag define-tag version-androidbundle-privoxy whitespace=deleteprivoxy-3.0.12-stable/define-tag define-tag version-androidbundle-libevent whitespace=deletelibevent-1.4.12-stable/define-tag define-tag package-androidbundle-alpha whitespace=deletedist/android/version-androidbundle-tor-orbot-version-androidbundle-orbot.apk/define-tag ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
