tor-commits July 2013

tor-commits@lists.torproject.org

19 participants
1044 discussions

[orbot/master] new builds of binaries
by n8fr8＠torproject.org 22 Jul '13

22 Jul '13

commit edd855f5ad66a065a3e0c33c92a3ec5b5f6e7bb6 Author: n8fr8 <nathan(a)freitas.net> Date: Mon Jul 22 13:56:48 2013 -0400 new builds of binaries --- res/raw/obfsproxy | Bin 963309 -> 996900 bytes res/raw/privoxy | Bin 346549 -> 298048 bytes res/raw/tor.mp3 | Bin 2187576 -> 2120597 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/obfsproxy b/res/raw/obfsproxy index c751ec3..5bdab95 100755 Binary files a/res/raw/obfsproxy and b/res/raw/obfsproxy differ diff --git a/res/raw/privoxy b/res/raw/privoxy index c7a1e92..ffb4ee1 100755 Binary files a/res/raw/privoxy and b/res/raw/privoxy differ diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 index e7aa0ea..3b1bb3b 100644 Binary files a/res/raw/tor.mp3 and b/res/raw/tor.mp3 differ

1 0

[orbot/master] fixes for prefs/settings management
by n8fr8＠torproject.org 22 Jul '13

22 Jul '13

commit 21d1023adabbefb97f7c98a87686693808ffaa2f Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jul 22 15:18:02 2013 -0400 fixes for prefs/settings management --- src/org/torproject/android/Orbot.java | 26 +-- src/org/torproject/android/service/TorService.java | 175 ++++++++++---------- .../torproject/android/settings/AppManager.java | 2 +- .../android/settings/SettingsPreferences.java | 10 +- .../android/wizard/ChooseLocaleWizardActivity.java | 2 +- .../android/wizard/ConfigureTransProxy.java | 4 +- src/org/torproject/android/wizard/LotsaText.java | 6 +- src/org/torproject/android/wizard/Permissions.java | 4 +- 8 files changed, 115 insertions(+), 114 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 002ddd8..0c47441 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -4,18 +4,14 @@ package org.torproject.android; import java.util.Locale; -import java.util.StringTokenizer; import org.torproject.android.service.ITorService; import org.torproject.android.service.ITorServiceCallback; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.settings.ProcessSettingsAsyncTask; import org.torproject.android.settings.SettingsPreferences; -import org.torproject.android.share.ShareItem; -import org.torproject.android.share.ShareService; import org.torproject.android.wizard.ChooseLocaleWizardActivity; -import android.annotation.SuppressLint; import android.app.AlertDialog; import android.app.NotificationManager; import android.content.ComponentName; @@ -25,6 +21,7 @@ import android.content.Intent; import android.content.ServiceConnection; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; +import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.Configuration; import android.net.Uri; @@ -33,7 +30,6 @@ import android.os.Handler; import android.os.IBinder; import android.os.Message; import android.os.RemoteException; -import android.os.StrictMode; import android.preference.PreferenceManager; import android.text.ClipboardManager; import android.text.Layout; @@ -55,7 +51,7 @@ import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; -public class Orbot extends SherlockActivity implements TorConstants, OnLongClickListener +public class Orbot extends SherlockActivity implements TorConstants, OnLongClickListener, OnSharedPreferenceChangeListener { /* Useful UI bits */ private TextView lblStatus = null; //the main text display widget @@ -99,6 +95,9 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick StrictMode.setVmPolicy(vmpolicy); } */ + + prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + prefs.registerOnSharedPreferenceChangeListener(this); Orbot.setCurrent(this); @@ -110,8 +109,6 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick startService(new Intent(INTENT_TOR_SERVICE)); - prefs = PreferenceManager.getDefaultSharedPreferences(this); - doLayout(); } @@ -368,7 +365,6 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick private void enableHiddenServicePort (int hsPort) { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); Editor pEdit = prefs.edit(); String hsPortString = prefs.getString("pref_hs_ports", ""); @@ -522,7 +518,6 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); boolean showWizard = prefs.getBoolean("show_wizard",true); @@ -586,7 +581,6 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick private void startWizard () { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); Editor pEdit = prefs.edit(); pEdit.putBoolean("wizardscreen1",true); @@ -1075,11 +1069,10 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick private void setLocale () { - SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this); Configuration config = getResources().getConfiguration(); - String lang = settings.getString(PREF_DEFAULT_LOCALE, ""); + String lang = prefs.getString(PREF_DEFAULT_LOCALE, ""); if (! "".equals(lang) && ! config.locale.getLanguage().equals(lang)) { @@ -1123,5 +1116,12 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick //return count+" kB"; } + + @Override + public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, + String key) { + + + } } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 3520ec1..de3fc10 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -44,15 +44,14 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; +import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.net.ConnectivityManager; import android.net.Uri; -import android.os.AsyncTask; import android.os.IBinder; import android.os.RemoteCallbackList; import android.os.RemoteException; import android.preference.PreferenceManager; import android.util.Log; -import android.widget.Toast; public class TorService extends Service implements TorServiceConstants, TorConstants, Runnable, EventHandler { @@ -97,9 +96,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst private long mTotalTrafficWritten = 0; private long mTotalTrafficRead = 0; private boolean mConnectivity = true; + + private long lastRead = -1; + private long lastWritten = -1; + private NotificationManager mNotificationManager = null; + + SharedPreferences mPrefs = null; + public void logMessage(String msg) { if (ENABLE_DEBUG_LOG) @@ -246,6 +252,19 @@ public class TorService extends Service implements TorServiceConstants, TorConst _torInstance = this; + mPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + mPrefs.registerOnSharedPreferenceChangeListener(new OnSharedPreferenceChangeListener() + { + + @Override + public void onSharedPreferenceChanged( + SharedPreferences sharedPreferences, String key) { + updateSettings(); + + } + + }); + initTorPaths(); IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); @@ -276,9 +295,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (intent != null && intent.getAction()!=null && intent.getAction().equals("onboot")) { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - - boolean startOnBoot = prefs.getBoolean("pref_start_boot",false); + boolean startOnBoot = mPrefs.getBoolean("pref_start_boot",false); if (startOnBoot) { @@ -347,9 +364,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { currentStatus = STATUS_OFF; - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - - boolean hasRoot = prefs.getBoolean(PREF_HAS_ROOT,false); + boolean hasRoot = mPrefs.getBoolean(PREF_HAS_ROOT,false); try { @@ -407,9 +422,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private String getHiddenServiceHostname () { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - - boolean enableHiddenServices = prefs.getBoolean("pref_hs_enable", false); + boolean enableHiddenServices = mPrefs.getBoolean("pref_hs_enable", false); if (enableHiddenServices) { @@ -420,7 +433,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst try { String onionHostname = Utils.readString(new FileInputStream(file)).trim(); showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + onionHostname, HS_NOTIFY_ID, R.drawable.ic_stat_tor, Notification.FLAG_ONGOING_EVENT); - Editor pEdit = prefs.edit(); + Editor pEdit = mPrefs.edit(); pEdit.putString("pref_hs_hostname",onionHostname); pEdit.commit(); @@ -534,9 +547,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst initTorPaths(); - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - String currTorBinary = prefs.getString(TorServiceConstants.PREF_BINARY_TOR_VERSION_INSTALLED, null); - String currPrivoxyBinary = prefs.getString(TorServiceConstants.PREF_BINARY_PRIVOXY_VERSION_INSTALLED, null); + String currTorBinary = mPrefs.getString(TorServiceConstants.PREF_BINARY_TOR_VERSION_INSTALLED, null); + String currPrivoxyBinary = mPrefs.getString(TorServiceConstants.PREF_BINARY_PRIVOXY_VERSION_INSTALLED, null); StringBuilder cmdLog = new StringBuilder(); int exitCode = -1; @@ -579,7 +591,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (success) { - Editor edit = prefs.edit(); + Editor edit = mPrefs.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(); @@ -625,17 +637,30 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - public void initTor () throws Exception + private boolean mHasRoot = false; + private boolean mEnableTransparentProxy = false; + private boolean mTransProxyAll = false; + private boolean mTransProxyTethering = false; + + private void updateSettings () { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false); + android.os.Debug.waitForDebugger(); + + mHasRoot = mPrefs.getBoolean(PREF_HAS_ROOT,false); + mEnableTransparentProxy = mPrefs.getBoolean("pref_transparent", false); + mTransProxyAll = mPrefs.getBoolean("pref_transparent_all", false); + mTransProxyTethering = mPrefs.getBoolean("pref_transparent_tethering", false); + + ENABLE_DEBUG_LOG = mPrefs.getBoolean("pref_enable_logging",false); Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG); - boolean hasRoot = prefs.getBoolean(PREF_HAS_ROOT,false); - boolean enableTransparentProxy = prefs.getBoolean("pref_transparent", false); - boolean transProxyAll = prefs.getBoolean("pref_transparent_all", false); - boolean transProxyTethering = prefs.getBoolean("pref_transparent_tethering", false); - + prefPersistNotifications = mPrefs.getBoolean(TorConstants.PREF_PERSIST_NOTIFICATIONS, true); + } + + public void initTor () throws Exception + { + + updateSettings (); currentStatus = STATUS_CONNECTING; @@ -652,10 +677,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst runTorShellCmd(); runPrivoxyShellCmd(); - if (hasRoot && enableTransparentProxy) - enableTransparentProxy(transProxyAll, transProxyTethering); - - //new Thread (new TotalUpdaterRunnable()).start(); + if (mHasRoot && mEnableTransparentProxy) + enableTransparentProxy(mTransProxyAll, mTransProxyTethering); } catch (Exception e) { @@ -751,8 +774,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst String torrcPath = new File(appBinHome, TORRC_ASSET_KEY).getAbsolutePath(); - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - boolean transProxyTethering = prefs.getBoolean("pref_transparent_tethering", false); + boolean transProxyTethering = mPrefs.getBoolean("pref_transparent_tethering", false); if (transProxyTethering) { @@ -1033,7 +1055,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } } - private void startNotification (String message) + private void startNotification (String message, boolean persistent) { Notification notice = new Notification(R.drawable.ic_stat_tor, getString(R.string.status_activated), System.currentTimeMillis()); @@ -1045,7 +1067,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst //This method is deprecated. Use Notification.Builder instead. notice.setLatestEventInfo(TorService.this,getString(R.string.app_name), message, pendIntent); - if (prefPersistNotifications) + if (persistent) { notice.flags |= Notification.FLAG_NO_CLEAR; notice.flags |= Notification.FLAG_ONGOING_EVENT; @@ -1072,7 +1094,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { currentStatus = STATUS_ON; - startNotification(getString(R.string.status_activated)); + startNotification(getString(R.string.status_activated),prefPersistNotifications); @@ -1133,28 +1155,26 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void bandwidthUsed(long read, long written) { + if (read != lastRead || written != lastWritten) + { StringBuilder sb = new StringBuilder(); sb.append("Bandwidth: "); sb.append(formatCount(read)); sb.append(" down / "); sb.append(formatCount(written)); sb.append(" up"); - - if (mConnectivity && prefPersistNotifications) - startNotification(sb.toString()); - - mTotalTrafficWritten += written; - mTotalTrafficRead += read; - /* - try - { - mTotalTrafficWritten = Long.parseLong(conn.getInfo("traffic/written")); - mTotalTrafficRead = Long.parseLong(conn.getInfo("traffic/read")); + + if (mConnectivity && prefPersistNotifications) + startNotification(sb.toString(),prefPersistNotifications); + + mTotalTrafficWritten += written; + mTotalTrafficRead += read; + + sendCallbackStatusMessage(written, read, mTotalTrafficWritten, mTotalTrafficRead); } - catch (IOException ioe){} - */ - sendCallbackStatusMessage(written, read, mTotalTrafficWritten, mTotalTrafficRead); + lastWritten = written; + lastRead = read; } @@ -1269,12 +1289,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - - ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false); - Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG); - - prefPersistNotifications = prefs.getBoolean(TorConstants.PREF_PERSIST_NOTIFICATIONS, true); new Thread () { @@ -1335,7 +1349,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst } catch (RemoteException e) { - logException ("error applying prefs",e); + logException ("error applying mPrefs",e); } } @@ -1589,16 +1603,16 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (!mConnectivity) { logNotice("No network connectivity. Putting Tor to sleep..."); - startNotification(getString(R.string.no_internet_connection_tor)); + startNotification(getString(R.string.no_internet_connection_tor),prefPersistNotifications); } else { logNotice("Network connectivity is good. Waking Tor up..."); - startNotification(getString(R.string.status_activated)); + startNotification(getString(R.string.status_activated),prefPersistNotifications); } } catch (RemoteException e) { - logException ("error applying prefs",e); + logException ("error applying mPrefs",e); } } } @@ -1606,34 +1620,27 @@ public class TorService extends Service implements TorServiceConstants, TorConst private boolean processSettingsImpl () throws RemoteException { - - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); - - prefPersistNotifications = prefs.getBoolean(TorConstants.PREF_PERSIST_NOTIFICATIONS, true); - ENABLE_DEBUG_LOG = prefs.getBoolean("pref_enable_logging",false); - Log.i(TAG,"debug logging:" + ENABLE_DEBUG_LOG); - - boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false); + boolean useBridges = mPrefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false); - //boolean autoUpdateBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_UPDATED, false); + //boolean autoUpdateBridges = mPrefs.getBoolean(TorConstants.PREF_BRIDGES_UPDATED, false); - boolean becomeRelay = prefs.getBoolean(TorConstants.PREF_OR, false); - boolean ReachableAddresses = prefs.getBoolean(TorConstants.PREF_REACHABLE_ADDRESSES,false); - boolean enableHiddenServices = prefs.getBoolean("pref_hs_enable", false); + boolean becomeRelay = mPrefs.getBoolean(TorConstants.PREF_OR, false); + boolean ReachableAddresses = mPrefs.getBoolean(TorConstants.PREF_REACHABLE_ADDRESSES,false); + boolean enableHiddenServices = mPrefs.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", ""); + boolean enableStrictNodes = mPrefs.getBoolean("pref_strict_nodes", false); + String entranceNodes = mPrefs.getString("pref_entrance_nodes", ""); + String exitNodes = mPrefs.getString("pref_exit_nodes", ""); + String excludeNodes = mPrefs.getString("pref_exclude_nodes", ""); - String proxyType = prefs.getString("pref_proxy_type", null); + String proxyType = mPrefs.getString("pref_proxy_type", null); if (proxyType != null) { - String proxyHost = prefs.getString("pref_proxy_host", null); - String proxyPort = prefs.getString("pref_proxy_port", null); - String proxyUser = prefs.getString("pref_proxy_username", null); - String proxyPass = prefs.getString("pref_proxy_password", null); + String proxyHost = mPrefs.getString("pref_proxy_host", null); + String proxyPort = mPrefs.getString("pref_proxy_port", null); + String proxyUser = mPrefs.getString("pref_proxy_username", null); + String proxyPass = mPrefs.getString("pref_proxy_password", null); if (proxyHost != null && proxyPort != null) { @@ -1688,7 +1695,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (useBridges) { - String bridgeList = prefs.getString(TorConstants.PREF_BRIDGES_LIST,getString(R.string.default_bridges)); + String bridgeList = mPrefs.getString(TorConstants.PREF_BRIDGES_LIST,getString(R.string.default_bridges)); if (bridgeList == null || bridgeList.length() == 0) { @@ -1711,7 +1718,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst showToolbarNotification(getString(R.string.notification_using_bridges) + ": " + bridgeList, TRANSPROXY_NOTIFY_ID, R.drawable.ic_stat_tor, -1); - boolean obfsBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_OBFUSCATED, false); + boolean obfsBridges = mPrefs.getBoolean(TorConstants.PREF_BRIDGES_OBFUSCATED, false); String bridgeCfgKey = "bridge"; if (obfsBridges) @@ -1745,7 +1752,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (ReachableAddresses) { String ReachableAddressesPorts = - prefs.getString(TorConstants.PREF_REACHABLE_ADDRESSES_PORTS, "*:80,*:443"); + mPrefs.getString(TorConstants.PREF_REACHABLE_ADDRESSES_PORTS, "*:80,*:443"); mBinder.updateConfiguration("ReachableAddresses", ReachableAddressesPorts, false); @@ -1766,8 +1773,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst { if (becomeRelay && (!useBridges) && (!ReachableAddresses)) { - int ORPort = Integer.parseInt(prefs.getString(TorConstants.PREF_OR_PORT, "9001")); - String nickname = prefs.getString(TorConstants.PREF_OR_NICKNAME, "Orbot"); + int ORPort = Integer.parseInt(mPrefs.getString(TorConstants.PREF_OR_PORT, "9001")); + String nickname = mPrefs.getString(TorConstants.PREF_OR_NICKNAME, "Orbot"); String dnsFile = writeDNSFile (); @@ -1797,7 +1804,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst mBinder.updateConfiguration("HiddenServiceDir",appCacheHome.getAbsolutePath(), false); //mBinder.updateConfiguration("RendPostPeriod", "600 seconds", false); //possible feature to investigate - String hsPorts = prefs.getString("pref_hs_ports",""); + String hsPorts = mPrefs.getString("pref_hs_ports",""); StringTokenizer st = new StringTokenizer (hsPorts,","); String hsPortConfig = null; diff --git a/src/org/torproject/android/settings/AppManager.java b/src/org/torproject/android/settings/AppManager.java index ae03924..bbf2644 100644 --- a/src/org/torproject/android/settings/AppManager.java +++ b/src/org/torproject/android/settings/AppManager.java @@ -272,7 +272,7 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC if (apps == null) return; - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); // final SharedPreferences prefs = context.getSharedPreferences(PREFS_KEY, 0); diff --git a/src/org/torproject/android/settings/SettingsPreferences.java b/src/org/torproject/android/settings/SettingsPreferences.java index f0fbafd..e6adcf9 100644 --- a/src/org/torproject/android/settings/SettingsPreferences.java +++ b/src/org/torproject/android/settings/SettingsPreferences.java @@ -46,16 +46,10 @@ public class SettingsPreferences addPreferencesFromResource(R.xml.preferences); - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); hasRoot = prefs.getBoolean("has_root",false); - if (!hasRoot) - { - hasRoot = prefs.getBoolean("use_whispercore", false); - - } - init(); } @@ -170,7 +164,7 @@ public class SettingsPreferences } else if (preference == prefLocale) { - SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(this); + SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); Configuration config = getResources().getConfiguration(); diff --git a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java index c958221..a8bebe9 100644 --- a/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java +++ b/src/org/torproject/android/wizard/ChooseLocaleWizardActivity.java @@ -116,7 +116,7 @@ public class ChooseLocaleWizardActivity extends Activity implements TorConstants private void setLocalePref(int selId) { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getBaseContext()); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); Configuration config = getResources().getConfiguration(); diff --git a/src/org/torproject/android/wizard/ConfigureTransProxy.java b/src/org/torproject/android/wizard/ConfigureTransProxy.java index 49aa2e3..974c968 100644 --- a/src/org/torproject/android/wizard/ConfigureTransProxy.java +++ b/src/org/torproject/android/wizard/ConfigureTransProxy.java @@ -76,7 +76,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { private void setupUI () { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); boolean transEnabled = prefs.getBoolean(PREF_TRANSPARENT, false); @@ -162,7 +162,7 @@ public class ConfigureTransProxy extends Activity implements TorConstants { RadioButton rb1 = (RadioButton)findViewById(R.id.radio1); RadioButton rb2 = (RadioButton)findViewById(R.id.radio2); - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); Editor pEdit = prefs.edit(); pEdit.putBoolean(PREF_TRANSPARENT, rb0.isChecked()); diff --git a/src/org/torproject/android/wizard/LotsaText.java b/src/org/torproject/android/wizard/LotsaText.java index 3393157..2bff373 100644 --- a/src/org/torproject/android/wizard/LotsaText.java +++ b/src/org/torproject/android/wizard/LotsaText.java @@ -39,7 +39,7 @@ public class LotsaText extends Activity implements TorConstants{ super.onStart(); setContentView(R.layout.scrollingtext_buttons_view); - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); boolean wizardScreen1 = prefs.getBoolean("wizardscreen1",true); if(wizardScreen1) @@ -71,7 +71,7 @@ public class LotsaText extends Activity implements TorConstants{ private void stepOne() { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); Editor pEdit = prefs.edit(); pEdit.putBoolean("wizardscreen1",true); @@ -104,7 +104,7 @@ public class LotsaText extends Activity implements TorConstants{ private void stepTwo() { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); Editor pEdit = prefs.edit(); pEdit.putBoolean("wizardscreen1",false); diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java index ad0cd44..b93ba19 100644 --- a/src/org/torproject/android/wizard/Permissions.java +++ b/src/org/torproject/android/wizard/Permissions.java @@ -115,7 +115,7 @@ public class Permissions extends Activity implements TorConstants { boolean isChecked) { - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); Editor pEdit = prefs.edit(); @@ -144,7 +144,7 @@ public class Permissions extends Activity implements TorConstants { public void onClick(View v) { //Check and Install iptables - TorTransProxy.testOwnerModule(this) - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); boolean hasRoot = prefs.getBoolean("has_root",false);

1 0

[orbot/master] updates for building
by n8fr8＠torproject.org 22 Jul '13

22 Jul '13

commit 303ceb416aafa9e06f328e908ea9da880ceadd05 Author: n8fr8 <nathan(a)freitas.net> Date: Mon Jul 22 13:57:10 2013 -0400 updates for building --- .classpath | 5 +++-- .gitmodules | 7 +++++-- AndroidManifest.xml | 6 +++--- build.xml | 11 ++++++++++- external/ActionBarSherlock | 1 + external/Makefile | 18 ++++++++++-------- libs/jtorctl.jar | Bin 14733 -> 14736 bytes libs/simple.jar | Bin 199011 -> 199014 bytes project.properties | 2 +- update-ant-build.sh | 6 ++++++ 10 files changed, 39 insertions(+), 17 deletions(-) diff --git a/.classpath b/.classpath index d2c46be..61e0502 100644 --- a/.classpath +++ b/.classpath @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="src" path="gen"/> <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> <classpathentry kind="lib" path="libs/jtorctl.jar"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="gen"/> + <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/> <classpathentry kind="output" path="bin/classes"/> </classpath> diff --git a/.gitmodules b/.gitmodules index 2e4434f..cdcc96c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "external/openssl-static"] path = external/openssl-static - url = https://github.com/guardianproject/openssl-android.git + url = https://github.com/guardianproject/android-external-openssl-ndk-static.git [submodule "external/tor"] path = external/tor url = https://git.torproject.org/git/tor.git @@ -15,4 +15,7 @@ url = https://git.torproject.org/git/jtorctl [submodule "external/obfsproxy"] path = external/obfsproxy - url = https://git.torproject.org/obfsproxy.git + url = https://git.torproject.org/pluggable-transports/obfsproxy-legacy.git +[submodule "external/ActionBarSherlock"] + path = external/ActionBarSherlock + url = https://github.com/JakeWharton/ActionBarSherlock.git diff --git a/AndroidManifest.xml b/AndroidManifest.xml index da87f00..f3660e7 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="v12-beta-tor-0.2.4.15-rc" - android:versionCode="56" + android:versionName="12.0.1" + android:versionCode="57" 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-sdk android:minSdkVersion="5" android:targetSdkVersion="17"/> + <uses-sdk android:minSdkVersion="5" android:targetSdkVersion="18"/> <application android:name=".OrbotApp" android:icon="@drawable/ic_launcher" android:label="@string/app_name" diff --git a/build.xml b/build.xml index ab0a0be..4b3d666 100644 --- a/build.xml +++ b/build.xml @@ -28,6 +28,15 @@ --> <property file="ant.properties" /> +  + <property environment="env" /> + <condition property="sdk.dir" value="${env.ANDROID_HOME}"> + <isset property="env.ANDROID_HOME" /> + </condition> +  <fail - message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var" + message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable." unless="sdk.dir" /> diff --git a/external/ActionBarSherlock b/external/ActionBarSherlock new file mode 160000 index 0000000..c0d437c --- /dev/null +++ b/external/ActionBarSherlock @@ -0,0 +1 @@ +Subproject commit c0d437ce4c47cb344e5d96414ffbf5f1a85c26d0 diff --git a/external/Makefile b/external/Makefile index 45bdafa..72da8a1 100644 --- a/external/Makefile +++ b/external/Makefile @@ -20,9 +20,11 @@ NDK_BASE ?= /usr/local/android-ndk NDK_PLATFORM_LEVEL ?= 8 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]'` -#NDK_TOOLCHAIN=$(NDK_BASE)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/$(NDK_UNAME)-x86 -NDK_TOOLCHAIN=$(NDK_BASE)/toolchains/arm-linux-androideabi-4.6/prebuilt/$(NDK_UNAME)-x86 +NDK_UNAME:=`uname -s | tr '[A-Z]' '[a-z]'` +NDK_PROCESSOR:=`uname -m` + +#NDK_TOOLCHAIN=$(NDK_BASE)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR) +NDK_TOOLCHAIN=$(NDK_BASE)/toolchains/arm-linux-androideabi-4.6/prebuilt/$(NDK_UNAME)-$(NDK_PROCESSOR) # to use the real HOST tag, you need the latest libtool files: # http://stackoverflow.com/questions/4594736/configure-does-not-recognize-and… @@ -58,25 +60,25 @@ all: assets #------------------------------------------------------------------------------# # openssl-static -openssl-static/obj/local/armeabi/libcrypto.a: +lib/libcrypto.a: cd openssl-static && \ ndk-build -openssl-static/obj/local/armeabi/libssl.a: +lib/libssl.a: cp config.sub openssl-static cp config.guess openssl-static cd openssl-static && \ ndk-build -openssl-static-build-stamp: openssl-static/obj/local/armeabi/libcrypto.a openssl-static/obj/local/armeabi/libssl.a +openssl-static-build-stamp: lib/libcrypto.a lib/libssl.a touch openssl-static-build-stamp openssl-static: openssl-static-build-stamp test -d lib || mkdir lib test -d include || mkdir include test -d include/openssl || mkdir include/openssl - cp openssl-static/obj/local/armeabi/libcrypto.a lib - cp openssl-static/obj/local/armeabi/libssl.a lib + cp openssl-static/obj/local/armeabi/libcrypto.a lib/libcrypto.a + cp openssl-static/obj/local/armeabi/libssl.a lib/libssl.a cp openssl-static/include/openssl/* include/openssl openssl-static-clean: diff --git a/libs/jtorctl.jar b/libs/jtorctl.jar index 6aa755a..b6393b9 100755 Binary files a/libs/jtorctl.jar and b/libs/jtorctl.jar differ diff --git a/libs/simple.jar b/libs/simple.jar index 440f753..3ad5bbd 100755 Binary files a/libs/simple.jar and b/libs/simple.jar differ diff --git a/project.properties b/project.properties index 6bf01f1..0629393 100644 --- a/project.properties +++ b/project.properties @@ -9,4 +9,4 @@ # Project target. target=android-17 -android.library.reference.1=../ActionBarSherlock/library +android.library.reference.1=external/ActionBarSherlock/actionbarsherlock diff --git a/update-ant-build.sh b/update-ant-build.sh new file mode 100755 index 0000000..f819eb7 --- /dev/null +++ b/update-ant-build.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +# make sure your Android SDK tools path is set in SDK_BASE +android update project --path . --name Orbot --subprojects +android update project --path external/ActionBarSherlock/actionbarsherlock -t android-17 +

1 0

[orbot/master] make Orbot just one process
by n8fr8＠torproject.org 22 Jul '13

22 Jul '13

commit bebb143fb9ef521a82b547ce7962d2b28dfe6f39 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jul 22 15:18:15 2013 -0400 make Orbot just one process --- AndroidManifest.xml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index f3660e7..45b45a0 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -8,18 +8,17 @@ <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="5" android:targetSdkVersion="18"/> <application android:name=".OrbotApp" android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:configChanges="locale|orientation|screenSize" - android:theme="@style/Theme.Sherlock" - android:largeHeap="true" + android:theme="@style/Theme.Sherlock" android:persistent="true" android:allowBackup="false" android:allowClearUserData="true" - android:hardwareAccelerated="true" > <activity android:name=".Orbot" android:configChanges="orientation|screenSize" @@ -76,7 +75,6 @@ <service android:enabled="true" android:name=".service.TorService" android:exported="false" - android:process=":orbot" > <intent-filter> <action android:name="org.torproject.android.service.ITorService" />

1 0

[orbot/master] update Tor binary version number to ensure upgrade
by n8fr8＠torproject.org 22 Jul '13

22 Jul '13

commit d407f3216614b89c52ba9e261a2d651a61c60823 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jul 22 15:20:47 2013 -0400 update Tor binary version number to ensure upgrade --- src/org/torproject/android/service/TorServiceConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 0dca5d2..b4a39a6 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -76,7 +76,7 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; - public static final String BINARY_TOR_VERSION = "0.2.4.10-alpha"; + public static final String BINARY_TOR_VERSION = "0.2.4.15-rc"; public static final String BINARY_PRIVOXY_VERSION = "3.0.12"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INTALLED"; public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INTALLED";

1 0

[orbot/master] updated classpath for latest eclipse
by n8fr8＠torproject.org 22 Jul '13

22 Jul '13

commit 5b574078c792ef08c75ce67c520b1d8ef5dad427 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jul 22 15:18:26 2013 -0400 updated classpath for latest eclipse --- .classpath | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.classpath b/.classpath index 61e0502..807316f 100644 --- a/.classpath +++ b/.classpath @@ -3,8 +3,8 @@ <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> <classpathentry kind="lib" path="libs/jtorctl.jar"/> <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> + <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/> <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="gen"/> - <classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/> <classpathentry kind="output" path="bin/classes"/> </classpath>

1 0

[orbot/master] updated git submodules to public https paths
by n8fr8＠torproject.org 22 Jul '13

22 Jul '13

commit 179ef6e04d227a679470b202c2746000271d4f92 Author: n8fr8 <nathan(a)freitas.net> Date: Wed Jul 17 22:46:31 2013 -0400 updated git submodules to public https paths --- .gitmodules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index e2b481e..2e4434f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,18 +1,18 @@ [submodule "external/openssl-static"] path = external/openssl-static - url = git://github.com/guardianproject/android-external-openssl-ndk-static.git + url = https://github.com/guardianproject/openssl-android.git [submodule "external/tor"] path = external/tor - url = git://git.torproject.org/git/tor.git + url = https://git.torproject.org/git/tor.git [submodule "external/libevent"] path = external/libevent - url = git://github.com/libevent/libevent.git + url = https://github.com/libevent/libevent.git [submodule "external/jtorctrl"] path = external/jtorctrl - url = git://git.torproject.org/git/jtorctl + url = https://git.torproject.org/git/jtorctl [submodule "external/jtorctl"] path = external/jtorctl - url = git://git.torproject.org/git/jtorctl + url = https://git.torproject.org/git/jtorctl [submodule "external/obfsproxy"] path = external/obfsproxy - url = git://git.torproject.org/obfsproxy.git + url = https://git.torproject.org/obfsproxy.git

1 0

[orbot/master] updating commit peg for ndk8 fix
by n8fr8＠torproject.org 22 Jul '13

22 Jul '13

commit 42b111a2169a63b6ea86645d03a513a36c8c6829 Author: n8fr8 <nathan(a)freitas.net> Date: Mon Jul 22 13:39:40 2013 -0400 updating commit peg for ndk8 fix --- external/openssl-static | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/openssl-static b/external/openssl-static index 85061d0..f868a13 160000 --- a/external/openssl-static +++ b/external/openssl-static @@ -1 +1 @@ -Subproject commit 85061d07ccc04ee40f9cc66cbac86d53196d1f3f +Subproject commit f868a13ded01370683cfb3035dc8fb6615e673ba

1 0

[metrics-web/master] Fix relay flags graph.
by karsten＠torproject.org 22 Jul '13

22 Jul '13

commit 5cd41cc149fecf41b72b555830114f7a0c61698d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jul 22 18:57:00 2013 +0200 Fix relay flags graph. When we added HSDir to relay flags graph, we forgot to change the number 5 to 6 for available flags. --- rserve/graphs.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rserve/graphs.R b/rserve/graphs.R index 89edff5..69f9aa9 100644 --- a/rserve/graphs.R +++ b/rserve/graphs.R @@ -613,10 +613,10 @@ plot_relayflags <- function(start, end, flags, path) { missing <- setdiff(dates, networksize$date) if (length(missing) > 0) networksize <- rbind(data.frame( - date = as.Date(rep(missing, 5), origin = "1970-01-01"), + date = as.Date(rep(missing, 6), origin = "1970-01-01"), variable = paste("avg_", c("running", "exit", "guard", "fast", "stable", "hsdir"), sep = ""), - value = rep(NA, length(missing) * 5)), networksize) + value = rep(NA, length(missing) * 6)), networksize) date_breaks <- date_breaks( as.numeric(max(as.Date(end, "%Y-%m-%d")) - min(as.Date(networksize$date, "%Y-%m-%d"))))

1 0

[translation/orbot_completed] Update translations for orbot_completed
by translation＠torproject.org 22 Jul '13

22 Jul '13

commit 0e4dca33f30e5cf4af55f9e872b64c888fea8431 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jul 22 12:45:15 2013 +0000 Update translations for orbot_completed --- values-it/strings.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/values-it/strings.xml b/values-it/strings.xml index 84211ec..2746cf4 100644 --- a/values-it/strings.xml +++ b/values-it/strings.xml @@ -129,9 +129,7 @@ <string name="pref_entrance_node">Nodi di entrata</string> <string name="pref_entrance_node_summary">Identificativi, nicknames, paesi ed indirizzi del primo hop</string> <string name="pref_entrance_node_dialog">Inserisci nodi di entrata</string> -  - <string name="pref_proxy_title">Proxy di rete in uscita</string> + <string name="pref_proxy_title">Proxy di Rete in Uscita (Facoltativo)</string> <string name="pref_proxy_type_title">Tipo proxy</string> <string name="pref_proxy_type_summary">Protocolli da utilizzare per i server proxy: HTTP, HTTPS, Socks4, Socks5</string> <string name="pref_proxy_type_dialog">Inserisci tipo proxy</string> @@ -141,6 +139,12 @@ <string name="pref_proxy_port_title">Porta proxy</string> <string name="pref_proxy_port_summary">Porta del server proxy</string> <string name="pref_proxy_port_dialog">Inserire la porta del proxy</string> + <string name="pref_proxy_username_title">Nome Utente del Proxy in Uscita</string> + <string name="pref_proxy_username_summary">Nome Utente del Proxy (Facoltativo)</string> + <string name="pref_proxy_username_dialog">Inserisci Nome Utente del Proxy</string> + <string name="pref_proxy_password_title">Password del Proxy in Uscita</string> + <string name="pref_proxy_password_summary">Password del Proxy (Facoltativo)</string> + <string name="pref_proxy_password_dialog">Inserisci Password Proxy</string> <string name="status">Stato</string> <string name="setting_up_full_transparent_proxying_">Configurazione del proxying completamente trasparente...</string> <string name="setting_up_app_based_transparent_proxying_">Configurazione del proxying trasparente basato su applicazione...</string> @@ -221,4 +225,5 @@ <string name="wizard_locale_msg">Lasciare la predefinita o cambiare la lingua corrente</string> <string name="powered_by">powered by the Tor Project</string> <string name="btn_save_settings">Salva impostazioni</string> + <string name="no_internet_connection_tor">Nessuna connessione internet; Tor è in standby...</string> </resources>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2013