tor-commits December 2013

tor-commits@lists.torproject.org

25 participants
992 discussions

[orbot/master] more updates for moving binaries to libs/armeabi
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 1739473a1df9cae391b00a7edbb004e429fb23bb Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 15:27:20 2013 -0500 more updates for moving binaries to libs/armeabi --- .../android/service/CheckBinariesAsyncTask.java | 32 ---- .../android/service/TorBinaryInstaller.java | 6 +- src/org/torproject/android/service/TorService.java | 188 ++++++-------------- 3 files changed, 53 insertions(+), 173 deletions(-) diff --git a/src/org/torproject/android/service/CheckBinariesAsyncTask.java b/src/org/torproject/android/service/CheckBinariesAsyncTask.java deleted file mode 100644 index 7ab0c50..0000000 --- a/src/org/torproject/android/service/CheckBinariesAsyncTask.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.torproject.android.service; - -import org.torproject.android.service.TorService; - -import android.os.AsyncTask; -import android.os.RemoteException; - -public class CheckBinariesAsyncTask extends AsyncTask<TorService, Integer, Long> -{ - - - @Override - protected Long doInBackground(TorService... torService) { - - try { - torService[0].checkTorBinaries(false); - } catch (Exception e) { - e.printStackTrace(); - } - - return 100L; - } - - protected void onProgressUpdate(Integer... progress) { - - } - - protected void onPostExecute(Long result) { - - } - -} diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java b/src/org/torproject/android/service/TorBinaryInstaller.java index cf6bc47..45705ae 100644 --- a/src/org/torproject/android/service/TorBinaryInstaller.java +++ b/src/org/torproject/android/service/TorBinaryInstaller.java @@ -42,7 +42,7 @@ public class TorBinaryInstaller implements TorServiceConstants { /* * Extract the Tor binary from the APK file using ZIP */ - public boolean installFromRaw () throws IOException, FileNotFoundException + public boolean installResources () throws IOException, FileNotFoundException { InputStream is; @@ -66,7 +66,7 @@ public class TorBinaryInstaller implements TorServiceConstants { /* * Extract the Tor binary from the APK file using ZIP */ - /* + public boolean installGeoIP () throws IOException, FileNotFoundException { @@ -78,7 +78,7 @@ public class TorBinaryInstaller implements TorServiceConstants { streamToFile(is, outFile, false, true); return true; - }*/ + } /* private static void copyAssetFile(Context ctx, String asset, File file) throws IOException, InterruptedException diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 304cd40..d557187 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -83,6 +83,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private File fileTor; private File filePrivoxy; private File fileObfsProxy; + private File fileTorRc; private TorTransProxy mTransProxy; @@ -157,6 +158,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst /* (non-Javadoc) * @see android.app.Service#onLowMemory() */ + @Override public void onLowMemory() { super.onLowMemory(); @@ -168,12 +170,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst /* (non-Javadoc) * @see android.app.Service#onUnbind(android.content.Intent) */ + @Override public boolean onUnbind(Intent intent) { // logNotice( "onUnbind Called: " + intent.getAction()); - - return super.onUnbind(intent); @@ -224,6 +225,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst /* (non-Javadoc) * @see android.app.Service#onRebind(android.content.Intent) */ + @Override public void onRebind(Intent intent) { super.onRebind(intent); @@ -237,9 +239,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst /* (non-Javadoc) * @see android.app.Service#onStart(android.content.Intent, int) */ - public void onStart(Intent intent, int startId) { - super.onStart(intent, startId); - + public int onStartCommand(Intent intent, int flags, int startId) { + _torInstance = this; initTorPaths(); @@ -250,23 +251,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - new Thread () - { - - public void run () - { - try { - checkTorBinaries (false); - } catch (Exception e) { - - logNotice("unable to find tor binaries: " + e.getMessage()); - showToolbarNotification(getString(R.string.error_installing_binares), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1); - - Log.e(TAG, "error checking tor binaries", e); - } - } - }.start(); - if (intent != null && intent.getAction()!=null && intent.getAction().equals("onboot")) @@ -279,6 +263,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst setTorProfile(PROFILE_ON); } } + + // We want this service to continue running until it is explicitly + // stopped, so return sticky. + return START_STICKY; + } public static SharedPreferences getSharedPrefs (Context context) @@ -508,91 +497,46 @@ public class TorService extends Service implements TorServiceConstants, TorConst appCacheHome = getDir("data",Application.MODE_PRIVATE); appLibsHome = new File(getApplicationInfo().nativeLibraryDir); - fileTor = new File(appLibsHome, TOR_BINARY_ASSET_KEY); - filePrivoxy = new File(appLibsHome, PRIVOXY_ASSET_KEY); - fileObfsProxy = new File(appLibsHome, OBFSPROXY_ASSET_KEY); - - - } - - public boolean checkTorBinaries (boolean forceInstall) throws Exception - { - - SharedPreferences prefs =getSharedPrefs(getApplicationContext()); - - initTorPaths(); - - String currTorBinary = prefs.getString(TorServiceConstants.PREF_BINARY_TOR_VERSION_INSTALLED, null); - String currPrivoxyBinary = prefs.getString(TorServiceConstants.PREF_BINARY_PRIVOXY_VERSION_INSTALLED, null); - - StringBuilder cmdLog = new StringBuilder(); - int exitCode = -1; + fileTor = new File(appLibsHome, TOR_BINARY_ASSET_KEY); + if (fileTor.exists()) + logNotice ("Tor binary exists: " + fileTor.getAbsolutePath()); + else + throw new RuntimeException("Tor binary not installed"); - if (currTorBinary == null || (!currTorBinary.equals(TorServiceConstants.BINARY_TOR_VERSION))) - if (fileTor.exists()) - { - if (currentStatus != STATUS_OFF) - stopTor(); - - String[] cmds = {"rm " + fileTor.getAbsolutePath()}; - exitCode = TorServiceUtils.doShellCommand(cmds, cmdLog, false, true); - - } - - if (currPrivoxyBinary == null || (!currPrivoxyBinary.equals(TorServiceConstants.BINARY_PRIVOXY_VERSION))) - if (filePrivoxy.exists()) - { - if (currentStatus != STATUS_OFF) - stopTor(); - - - String[] cmds = {"rm " + filePrivoxy.getAbsolutePath()}; - exitCode = TorServiceUtils.doShellCommand(cmds, cmdLog, false, true); - - } + filePrivoxy = new File(appLibsHome, PRIVOXY_ASSET_KEY); + if (filePrivoxy.exists()) + logNotice ("Privoxy binary exists: " + filePrivoxy.getAbsolutePath()); + else + throw new RuntimeException("Privoxy binary not installed"); + fileObfsProxy = new File(appLibsHome, OBFSPROXY_ASSET_KEY); + if (fileObfsProxy.exists()) + logNotice ("Obfsproxy binary exists: " + fileObfsProxy.getAbsolutePath()); + else + throw new RuntimeException("Obfsproxy binary not installed"); - - logNotice( "checking Tor binaries"); + fileTorRc = new File(appBinHome, TORRC_ASSET_KEY); - if ((!(fileTor.exists() && filePrivoxy.exists())) || forceInstall) + if (!fileTorRc.exists()) { - stopTor(); - TorBinaryInstaller installer = new TorBinaryInstaller(this, appBinHome); - boolean success = installer.installFromRaw(); - - - if (success) - { - - Editor edit = prefs.edit(); - edit.putString(TorServiceConstants.PREF_BINARY_TOR_VERSION_INSTALLED, TorServiceConstants.BINARY_TOR_VERSION); - edit.putString(TorServiceConstants.PREF_BINARY_PRIVOXY_VERSION_INSTALLED, TorServiceConstants.BINARY_PRIVOXY_VERSION); - edit.commit(); - - logNotice(getString(R.string.status_install_success)); - - //showToolbarNotification(getString(R.string.status_install_success), NOTIFY_ID, R.drawable.ic_stat_tor); - - } - else - { - - logNotice(getString(R.string.status_install_fail)); - - sendCallbackStatusMessage(getString(R.string.status_install_fail)); - - return false; - } - + try { + boolean success = installer.installResources(); + } catch (FileNotFoundException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + - setBinaryPerms(); - - return true; } + + /* private void setBinaryPerms () throws Exception { @@ -610,7 +554,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst String[] cmd3 = {SHELL_CMD_CHMOD + ' ' + CHMOD_EXE_VALUE + ' ' + fileObfsProxy.getAbsolutePath()}; TorServiceUtils.doShellCommand(cmd3, log, false, true); - } + }*/ private boolean mHasRoot = false; private boolean mEnableTransparentProxy = false; @@ -647,7 +591,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { - setBinaryPerms(); + //setBinaryPerms(); runTorShellCmd(); runPrivoxyShellCmd(); @@ -1250,40 +1194,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst _torInstance = this; initTorPaths(); - - //if Tor was deleted for some reason, do this again! - if (!fileTor.exists()) - { - new Thread () - { - public void run () - { - try { - checkTorBinaries (false); - } catch (Exception e) { - - logNotice("unable to find tor binaries: " + e.getMessage()); - showToolbarNotification(getString(R.string.error_installing_binares), ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1); - - Log.e(TAG, "error checking tor binaries", e); - } - } - }.start(); - } - - - - new Thread () - { - - public void run () - { - findExistingProc (); - } - - - }.start(); - + findExistingProc (); + if (ITorService.class.getName().equals(intent.getAction())) { return mBinder; } @@ -1667,19 +1579,19 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (entranceNodes.length() > 0 || exitNodes.length() > 0 || excludeNodes.length() > 0) { //only apple GeoIP if you need it - File fileGeoIP = new File(appBinHome,"geoip"); + File fileGeoIP = new File(appBinHome,GEOIP_ASSET_KEY); try { - if (!fileGeoIP.exists()) + if ((!fileGeoIP.exists())) { - //TorBinaryInstaller installer = new TorBinaryInstaller(this, appBinHome); - //boolean success = installer.installGeoIP(); + TorBinaryInstaller installer = new TorBinaryInstaller(this, appBinHome); + boolean success = installer.installGeoIP(); - //TODO get GEOIP add-on here } mBinder.updateConfiguration("GeoIPFile", fileGeoIP.getAbsolutePath(), false); + } catch (Exception e) {

1 0

[orbot/master] updating tor to 0.2.4.20
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 8666b1b4df802ee7c8401dc5a40898a99a326c37 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 15:29:03 2013 -0500 updating tor to 0.2.4.20 --- external/tor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/tor b/external/tor index e719d05..3cb5c70 160000 --- a/external/tor +++ b/external/tor @@ -1 +1 @@ -Subproject commit e719d05fd296a9dd59af9becb21ef3ff1c426b3c +Subproject commit 3cb5c70beec5bf46b9e70b1fc6287a1c1c7847ee

1 0

[orbot/master] run Tor from link to keep compatibility with OrbotHelper class
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 3069fb5af464210447b4b8272e68aa7e3fd7ac56 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 21:43:55 2013 -0500 run Tor from link to keep compatibility with OrbotHelper class some apps use our OrbotHelper.java class and are expecting the Tor binary process to be at /data/data/org.torproject.android/app_bin/tor so we link that path to the lib/libtor.so path --- src/org/torproject/android/service/TorService.java | 148 +++++++++++++------- .../android/service/TorServiceConstants.java | 2 + 2 files changed, 97 insertions(+), 53 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index d557187..2175e4c 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -80,7 +80,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst private File appCacheHome; private File appLibsHome; - private File fileTor; + private File fileTorOrig; + private File fileTorLink; + private File filePrivoxy; private File fileObfsProxy; private File fileTorRc; @@ -117,41 +119,40 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - private boolean findExistingProc () + private boolean findExistingProc () { - int procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath()); - - if (procId != -1) - { - logNotice("Found existing Tor process"); - - sendCallbackLogMessage (getString(R.string.found_existing_tor_process)); - - try { - currentStatus = STATUS_CONNECTING; - - initControlConnection(); - - processSettingsImpl(); - - currentStatus = STATUS_ON; - - return true; - - } catch (RuntimeException e) { - Log.d(TAG,"Unable to connect to existing Tor instance,",e); - currentStatus = STATUS_OFF; - - } catch (Exception e) { - Log.d(TAG,"Unable to connect to existing Tor instance,",e); - currentStatus = STATUS_OFF; - - - } - } - - return false; - + try + { + if (fileTorLink == null) + initTorPathLink(); + + int procId = TorServiceUtils.findProcessId(fileTorLink.getAbsolutePath()); + + if (procId != -1) + { + logNotice("Found existing Tor process"); + + sendCallbackLogMessage (getString(R.string.found_existing_tor_process)); + + currentStatus = STATUS_CONNECTING; + + initControlConnection(); + + processSettingsImpl(); + + currentStatus = STATUS_ON; + + return true; + + } + + return false; + } + catch (Exception e) + { + Log.e(TAG,"error finding proc",e); + return false; + } } @@ -229,10 +230,17 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void onRebind(Intent intent) { super.onRebind(intent); - initTorPaths(); - - sendCallbackLogMessage("Welcome back, Carter!"); + try + { + initTorPaths(); + sendCallbackLogMessage("Welcome back, Carter!"); + } + catch (Exception e) + { + Log.e(TAG,"unable to init Tor",e); + throw new RuntimeException("Unable to init Tor"); + } } @@ -243,8 +251,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst _torInstance = this; - initTorPaths(); - + try + { + initTorPaths(); + } + catch (Exception e) + { + Log.e(TAG,"error setting up Tor",e); + throw new RuntimeException("Unable to start Tor"); + } + IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); registerReceiver(mNetworkStateReceiver , mNetworkStateFilter); @@ -419,6 +435,20 @@ public class TorService extends Service implements TorServiceConstants, TorConst return null; } + private void initTorPathLink () throws Exception + { + + fileTorLink = new File(appBinHome,"tor"); + + StringBuilder log = new StringBuilder(); + + String[] cmdDel = { "rm " + fileTorLink.getAbsolutePath() }; + TorServiceUtils.doShellCommand(cmdDel,log, false, false); + + String[] cmd = { SHELL_CMD_LINK + ' ' + fileTorOrig.getAbsolutePath() + ' ' + fileTorLink.getAbsolutePath() }; + TorServiceUtils.doShellCommand(cmd,log, false, false); + logNotice("link command output: " + log.toString()); + } private void killTorProcess () throws Exception { @@ -444,7 +474,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst int killDelayMs = 300; - while ((procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath())) != -1) + while ((procId = TorServiceUtils.findProcessId(fileTorLink.getAbsolutePath())) != -1) { logNotice("Found Tor PID=" + procId + " - killing now..."); @@ -490,16 +520,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst } } - private void initTorPaths () + private void initTorPaths () throws IOException { appBinHome = getDir("bin",Application.MODE_PRIVATE); appCacheHome = getDir("data",Application.MODE_PRIVATE); appLibsHome = new File(getApplicationInfo().nativeLibraryDir); - fileTor = new File(appLibsHome, TOR_BINARY_ASSET_KEY); - if (fileTor.exists()) - logNotice ("Tor binary exists: " + fileTor.getAbsolutePath()); + fileTorOrig = new File(appLibsHome, TOR_BINARY_ASSET_KEY); + if (fileTorOrig.exists()) + { + logNotice ("Tor binary exists: " + fileTorOrig.getAbsolutePath()); + } else throw new RuntimeException("Tor binary not installed"); @@ -587,6 +619,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst sendCallbackStatusMessage(getString(R.string.status_starting_up)); + initTorPathLink (); + killTorProcess (); try { @@ -688,6 +722,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private void runTorShellCmd() throws Exception { + SharedPreferences prefs =getSharedPrefs(getApplicationContext()); StringBuilder log = new StringBuilder(); @@ -703,7 +738,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst String[] torCmd = { "export HOME=" + appBinHome.getAbsolutePath(), - fileTor.getAbsolutePath() + " DataDirectory " + appCacheHome.getAbsolutePath() + " -f " + torrcPath + " || exit\n" + fileTorLink.getAbsolutePath() + " DataDirectory " + appCacheHome.getAbsolutePath() + " -f " + torrcPath + " || exit\n" }; boolean runAsRootFalse = false; @@ -724,12 +759,12 @@ public class TorService extends Service implements TorServiceConstants, TorConst Thread.sleep(torRetryWaitTimeMS); - procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath()); + procId = TorServiceUtils.findProcessId(fileTorLink.getAbsolutePath()); if (procId == -1) { Thread.sleep(torRetryWaitTimeMS); - procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath()); + procId = TorServiceUtils.findProcessId(fileTorLink.getAbsolutePath()); attempts++; } else @@ -1193,9 +1228,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst _torInstance = this; - initTorPaths(); - findExistingProc (); - + try + { + initTorPaths(); + findExistingProc (); + } + catch (Exception e) + { + Log.e(TAG,"error onBind",e); + } + if (ITorService.class.getName().equals(intent.getAction())) { return mBinder; } @@ -1243,7 +1285,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst processSettingsImpl (); - } catch (RemoteException e) { + } catch (Exception e) { logException ("error applying mPrefs",e); } @@ -1528,7 +1570,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } }; - private boolean processSettingsImpl () throws RemoteException + private boolean processSettingsImpl () throws RemoteException, IOException { SharedPreferences prefs = getSharedPrefs(getApplicationContext()); diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 9900623..c22b2bb 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -38,6 +38,8 @@ public interface TorServiceConstants { public final static String SHELL_CMD_RM = "rm"; public final static String SHELL_CMD_PS = "ps"; public final static String SHELL_CMD_PIDOF = "pidof"; + public final static String SHELL_CMD_LINK = "ln -s"; + public final static String CHMOD_EXE_VALUE = "700";

1 0

[orbot/master] adding back in jtorctrl jar file
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 95461da3865113317d3c02ec1d223bd89e023ced Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 15:28:39 2013 -0500 adding back in jtorctrl jar file --- libs/jtorctl.jar | Bin 14744 -> 14744 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/libs/jtorctl.jar b/libs/jtorctl.jar index 566e593..1335f12 100755 Binary files a/libs/jtorctl.jar and b/libs/jtorctl.jar differ

1 0

[orbot/master] update menu, strings, icons for ChatSecure (from Gibberbot)
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 17f7d46e5c0f2b35383620e72bffe2dc1cd727f5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 21:43:33 2013 -0500 update menu, strings, icons for ChatSecure (from Gibberbot) --- res/drawable/ic_chatsecure.png | Bin 0 -> 4013 bytes res/drawable/ic_launcher_gibberbot.png | Bin 4741 -> 0 bytes res/layout/layout_wizard_tips.xml | 2 +- res/menu/main.xml | 20 ++++++++++++++++---- res/values/strings.xml | 10 +++++++--- 5 files changed, 24 insertions(+), 8 deletions(-) diff --git a/res/drawable/ic_chatsecure.png b/res/drawable/ic_chatsecure.png new file mode 100644 index 0000000..aaddd88 Binary files /dev/null and b/res/drawable/ic_chatsecure.png differ diff --git a/res/drawable/ic_launcher_gibberbot.png b/res/drawable/ic_launcher_gibberbot.png deleted file mode 100644 index 0dadd41..0000000 Binary files a/res/drawable/ic_launcher_gibberbot.png and /dev/null differ diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml index c7d1f98..98b7196 100644 --- a/res/layout/layout_wizard_tips.xml +++ b/res/layout/layout_wizard_tips.xml @@ -81,7 +81,7 @@ android:layout_height="wrap_content" android:layout_gravity="left" android:layout_marginTop="10px" - android:drawableLeft="@drawable/ic_launcher_gibberbot" + android:drawableLeft="@drawable/ic_chatsecure" android:text="@string/wizard_tips_gibberbot" /> diff --git a/res/menu/main.xml b/res/menu/main.xml index 7870c32..4b98c27 100755 --- a/res/menu/main.xml +++ b/res/menu/main.xml @@ -32,13 +32,25 @@ android:showAsAction="always" /> - <item android:id="@+id/menu_verify" + <item + android:id="@+id/menu_verify_list" android:title="@string/menu_verify" android:icon="@drawable/ic_action_browse" - android:showAsAction="always" - - /> + android:showAsAction="always" + > + <menu> + <item android:id="@+id/menu_verify" + android:title="@string/menu_verify_browser" + android:icon="@drawable/ic_action_browse" + /> + <item android:id="@+id/menu_use_chatsecure" + android:title="@string/menu_use_chatsecure" + android:icon="@drawable/ic_chatsecure" + /> + + </menu> + </item> <item android:id="@+id/menu_about" android:title="@string/menu_about" android:icon="@drawable/ic_menu_about" diff --git a/res/values/strings.xml b/res/values/strings.xml index 21592b6..cb03c10 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -72,7 +72,7 @@ <string name="wizard_configure_select_apps">Select Individual Apps for Tor</string> <string name="wizard_tips_tricks">Orbot-enabled Apps</string> <string name="wizard_tips_msg">The apps below were developed to work with Orbot. Click each button to install now, or you can find them later on Google Play, at GuardianProject.info website or via F-Droid.org.</string> - <string name="wizard_tips_otrchat">Gibberbot - Secure instant messaging client for Android</string> + <string name="wizard_tips_otrchat">ChatSecure - Secure instant messaging client for Android</string> <string name="wizard_tips_proxy">Proxy Settings - Learn how to configure apps to work with Orbot</string> <string name="wizard_tips_duckgo">DuckDuckGo Search Engine app</string> <string name="duckgo_apk_url">https://duckduckgo.com/android/latest.apk</string> @@ -104,8 +104,8 @@ <string name="wizard_permissions_no_root_msg">Your device does not appear to be rooted or provide \'Superuser\' access.\n\nIn order to you to benefit from Tor, you will need to use apps built to work with Orbot, or that support HTTP or SOCKS proxy settings.\n\n</string>  <string name="wizard_tips_title">Orbot-Enabled Apps</string> - <string name="wizard_tips_gibberbot">Gibberbot: Secure chat app with Off-the-Record Encryption</string> - <string name="gibberbot_apk_url">https://guardianproject.info/releases/gibberbot-latest.apk</string> + <string name="wizard_tips_gibberbot">ChatSecure: Secure chat app with Off-the-Record Encryption</string> + <string name="gibberbot_apk_url">https://guardianproject.info/releases/chatsecure-latest.apk</string> <string name="wizard_tips_orweb">Orweb: Privacy-enhanced browser that works through Tor</string> <string name="orweb_apk_url">https://guardianproject.info/releases/orweb-latest.apk</string> <string name="wizard_tips_play">Find all Guardian Project apps on Google Play</string> @@ -241,4 +241,8 @@ <string name="pref_disable_network_title">No Network Auto-Sleep</string> <string name="pref_disable_network_summary">Put Tor to sleep when there is no internet available</string> <string name="newnym">You\'ve switched to a new Tor identity!</string> + + <string name="menu_verify_browser">Check Browser</string> + <string name="menu_use_chatsecure">Use ChatSecure</string> + </resources>

1 0

[orbot/master] set to 1.0.1e release
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 468076e3af317d65a656d57b1d7b642984ceead6 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 15:58:29 2013 -0500 set to 1.0.1e release --- external/openssl | 1 + 1 file changed, 1 insertion(+) diff --git a/external/openssl b/external/openssl new file mode 160000 index 0000000..46ebd9e --- /dev/null +++ b/external/openssl @@ -0,0 +1 @@ +Subproject commit 46ebd9e3bb623d3c15ef2203038956f3f7213620

1 0

[orbot/master] updating SDK and removing share intents
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit f3cbb6ed8888c851fc4b338eaa092da828ca7520 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 15:28:28 2013 -0500 updating SDK and removing share intents --- AndroidManifest.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 552837a..043dea2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="12.0.5" - android:versionCode="61" + android:versionName="13.0.0" + android:versionCode="62" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/> - <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="18"/> + <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="19"/> <application android:name=".OrbotApp" android:icon="@drawable/ic_launcher" android:label="@string/app_name" @@ -51,7 +51,7 @@ <action android:name="org.torproject.android.START_TOR" /> </intent-filter> -  + </activity>

1 0

[orbot/master] improvements on notification code
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit c80c5d49dff75577e33f2518c6e09bd0ee50d386 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Dec 28 00:43:51 2013 -0500 improvements on notification code --- src/org/torproject/android/service/TorService.java | 131 ++++++++++---------- 1 file changed, 68 insertions(+), 63 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 2175e4c..af4198e 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -31,6 +31,7 @@ import org.torproject.android.TorConstants; import org.torproject.android.Utils; import org.torproject.android.settings.AppManager; +import android.annotation.SuppressLint; import android.app.Application; import android.app.Notification; import android.app.NotificationManager; @@ -43,12 +44,13 @@ import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.net.ConnectivityManager; -import android.net.Uri; import android.os.Build; +import android.os.Handler; import android.os.IBinder; import android.os.RemoteCallbackList; import android.os.RemoteException; import android.support.v4.app.NotificationCompat; +import android.support.v4.app.NotificationCompat.Builder; import android.util.Log; public class TorService extends Service implements TorServiceConstants, TorConstants, Runnable, EventHandler @@ -96,9 +98,11 @@ public class TorService extends Service implements TorServiceConstants, TorConst private long lastRead = -1; private long lastWritten = -1; + private static int notificationCounter = 0; private NotificationManager mNotificationManager = null; + public void logMessage(String msg) { if (ENABLE_DEBUG_LOG) @@ -196,32 +200,22 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - private void showToolbarNotification (String notifyMsg, int notifyId, int icon, int flags) - { - - - - CharSequence tickerText = notifyMsg; - long when = System.currentTimeMillis(); + @SuppressLint("NewApi") + private void showToolbarNotification (String notifyMsg, int notifyId, int icon, int flags) + { + + if (mNotifyBuilder == null) + startNotification(getString(R.string.status_activated),prefPersistNotifications); - Notification notification = new Notification(icon, tickerText, when); + mNotifyBuilder.setContentText(notifyMsg); + mNotifyBuilder.setSmallIcon(icon); - if (prefPersistNotifications && flags != -1) - notification.flags |= flags; - - Context context = getApplicationContext(); - CharSequence contentTitle = getString(R.string.app_name); - CharSequence contentText = notifyMsg; + mNotificationManager.notify( + NOTIFY_ID, + mNotifyBuilder.getNotification()); + - Intent notificationIntent = new Intent(this, Orbot.class); - PendingIntent contentIntent = PendingIntent.getActivity(this, 0, notificationIntent, 0); - - notification.setLatestEventInfo(context, contentTitle, contentText, contentIntent); - - mNotificationManager.notify(notifyId, notification); - - - } + } /* (non-Javadoc) * @see android.app.Service#onRebind(android.content.Intent) @@ -857,7 +851,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private void initControlConnection () throws Exception, RuntimeException { - while (true) + while (conn == null) { try { @@ -1010,40 +1004,37 @@ public class TorService extends Service implements TorServiceConstants, TorConst } } - NotificationCompat.Builder mNotifyBuilder; + Builder mNotifyBuilder; + + @SuppressLint("NewApi") + private void startNotification (String message, boolean persistent) + { + //Reusable code. + Intent intent = new Intent(TorService.this, Orbot.class); + PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0); - private void startNotification (String message, boolean persistent) - { - - if (mNotifyBuilder == null) - { - mNotifyBuilder = new NotificationCompat.Builder(this) - .setContentTitle(getString(R.string.app_name)) - .setContentText( getString(R.string.status_activated)) - .setSmallIcon(R.drawable.ic_stat_tor); + mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + + if (mNotifyBuilder == null) + { + mNotifyBuilder = new NotificationCompat.Builder(this) + .setContentTitle(getString(R.string.app_name)) + .setContentText( getString(R.string.status_activated)) + .setSmallIcon(R.drawable.ic_stat_tor); + + mNotifyBuilder.setContentIntent(pendIntent); + } + + mNotifyBuilder.setOngoing(persistent); + mNotifyBuilder.setContentText(message); + + mNotificationManager.notify( + NOTIFY_ID, + mNotifyBuilder.getNotification()); - Intent intent = new Intent(TorService.this, Orbot.class); - PendingIntent pendIntent = PendingIntent.getActivity(TorService.this, 0, intent, 0); - mNotifyBuilder.setContentIntent(pendIntent); - - - } - - if (mNotificationManager == null) - { - mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - - } - - mNotifyBuilder.setOngoing(persistent); - mNotifyBuilder.setContentText(message); + } - mNotificationManager.notify( - NOTIFY_ID, - mNotifyBuilder.getNotification()); - } - public void message(String severity, String msg) { @@ -1129,6 +1120,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst mTotalTrafficRead += read; sendCallbackStatusMessage(written, read, mTotalTrafficWritten, mTotalTrafficRead); + + if(++notificationCounter%10==0) + startService(new Intent(INTENT_TOR_SERVICE)); + } lastWritten = written; @@ -1228,15 +1223,25 @@ public class TorService extends Service implements TorServiceConstants, TorConst _torInstance = this; - try - { - initTorPaths(); - findExistingProc (); - } - catch (Exception e) + + + Thread thread = new Thread () { - Log.e(TAG,"error onBind",e); - } + + public void run () + { + try + { + initTorPaths(); + findExistingProc (); + } + catch (Exception e) + { + Log.e(TAG,"error onBind",e); + } + } + }; + thread.start(); if (ITorService.class.getName().equals(intent.getAction())) { return mBinder;

1 0

[orbot/master] remove simple server source bundle
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 867ff53b8b858fdfe3d24bfe136ec5c60dc19545 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 21:44:55 2013 -0500 remove simple server source bundle --- external/simple.tar.gz | Bin 1083375 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/external/simple.tar.gz b/external/simple.tar.gz deleted file mode 100644 index 069956b..0000000 Binary files a/external/simple.tar.gz and /dev/null differ

1 0

[orbot/master] adding new iptables/xtables build from source
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 76b15ddf5830341c2410b1c3ee48baf4177935e5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Dec 28 09:10:05 2013 -0500 adding new iptables/xtables build from source --- .gitignore | 3 --- .gitmodules | 3 +++ external/Makefile | 26 +++++++++++++++++++------- external/iptables | 1 + 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 543565d..4824f92 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,5 @@ external/bin/ external/include/ -external/iptables.foo/ -external/iptables/ external/jtorctl-build-stamp external/lib/ external/libevent-build-stamp @@ -13,7 +11,6 @@ external/test.c external/test.h.gch external/tor-build-stamp external/translation/ -external/simple* bin gen native diff --git a/.gitmodules b/.gitmodules index b9a36f9..0e89bae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,3 +19,6 @@ [submodule "external/openssl"] path = external/openssl url = git://git.openssl.org/openssl +[submodule "external/iptables"] + path = external/iptables + url = git://git.netfilter.org/iptables diff --git a/external/Makefile b/external/Makefile index 95f7f87..5c7f770 100644 --- a/external/Makefile +++ b/external/Makefile @@ -17,7 +17,7 @@ EXTERNAL_ROOT = $(CWD) # Android NDK setup: NDK_BASE ?= /usr/local/android-ndk -NDK_PLATFORM_LEVEL ?= 8 +NDK_PLATFORM_LEVEL ?= 9 NDK_TOOLCHAIN_VERSION=4.6 NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-arm NDK_UNAME:=`uname -s | tr '[A-Z]' '[a-z]'` @@ -125,24 +125,34 @@ libevent-clean: # iptables iptables/Makefile: + cp iptables-patch-1 iptables + cp iptables-patch-2 iptables + cp iptables-patch-3 iptables + -cd iptables && \ + patch -N -p1 --reject-file=- < iptables-patch-1 + -cd iptables && \ + patch -N -p1 --reject-file=- < iptables-patch-2 + -cd iptables && \ + patch -N -p1 --reject-file=- < iptables-patch-3 cd iptables && ./autogen.sh cp config.sub iptables cp config.guess iptables cd iptables && \ - CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -DNO_SHARED_LIBS -DXTABLES_INTERNAL -DIPTABLES_VERSION=\"1.4.10\" =-DXTABLES_VERSION=\"1.4.10\" # -DIPT_LIB_DIR=\"$(IPT_LIBDIR)\" -DXTABLES_LIBDIR -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" \ - ./configure \ - --host=$(HOST) \ - --disable-shared + CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" \ + ./configure --host=$(HOST) --disable-shared --enable-static iptables-build-stamp: iptables/Makefile $(MAKE) -C iptables touch iptables-build-stamp + cp iptables/iptables/xtables-multi bin/xtables iptables: iptables-build-stamp iptables-clean: -rm -f iptables-build-stamp - -cd iptables + -rm bin/xtables + -cd iptables && \ + git clean -fdx #------------------------------------------------------------------------------# # tor @@ -273,15 +283,17 @@ jtorctl-clean: #in order to stop Android OS (older devices) from trying to compress/decompress it #this is related to a bug in compression of assets and resources > 1MB -assets: tor privoxy jtorctl obfsproxy +assets: tor privoxy jtorctl obfsproxy iptables install -d ../libs/armeabi install -d ../libs install bin/privoxy ../libs/armeabi/libprivoxy.so install bin/obfsproxy ../libs/armeabi/libobfsproxy.so install bin/jtorctl.jar ../libs install bin/tor ../libs/armeabi/libtor.so + install bin/xtables ../libs/armeabi/libxtables.so assets-clean: + -rm ../libs/armeabi/libxtables.so -rm ../libs/armeabi/libtor.so -rm ../libs/armeabi/libprivoxy.so -rm ../libs/armeabi/libobfsproxy.so diff --git a/external/iptables b/external/iptables new file mode 160000 index 0000000..99b85b7 --- /dev/null +++ b/external/iptables @@ -0,0 +1 @@ +Subproject commit 99b85b7837707bd6c6d578c9328e1321fceb8082

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2013