December 2013 - tor-commits - lists.torproject.org

[orbot/master] move minimum device support to API 9 or 2.3
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit d40016b54a53ccee66416a8a996bb26b03cc793a Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 12:30:09 2013 -0500 move minimum device support to API 9 or 2.3 --- AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8477cb9..552837a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -9,7 +9,7 @@ <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"/> + <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="18"/> <application android:name=".OrbotApp" android:icon="@drawable/ic_launcher" android:label="@string/app_name"

1 0

[orbot/master] updated to android-18
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit fbd4fdc8576b84b855884ffbb741e54e26213e9e Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 12:43:12 2013 -0500 updated to android-18 --- project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.properties b/project.properties index 0629393..0a52332 100644 --- a/project.properties +++ b/project.properties @@ -8,5 +8,5 @@ # project structure. # Project target. -target=android-17 +target=android-18 android.library.reference.1=external/ActionBarSherlock/actionbarsherlock

1 0

[orbot/master] remove simple file sharing server from build process
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit a8ca9276105e57bae5832defdf68d4263315dba8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 13:24:15 2013 -0500 remove simple file sharing server from build process --- external/Makefile | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/external/Makefile b/external/Makefile index 17466ae..5c32404 100644 --- a/external/Makefile +++ b/external/Makefile @@ -247,33 +247,6 @@ privoxy-clean: -rm -rf privoxy #------------------------------------------------------------------------------# -# SimpleServer library # -simple/bin/simple.jar: - tar xzvf simple.tar.gz - mv simple-* simple - test -d simple/bin || mkdir simple/bin - cd simple/src && \ - javac -source 1.6 -target 1.6 org/simpleframework/http/core/ContainerServer.java -d ../bin - cd simple/src && \ - javac -source 1.6 -target 1.6 org/simpleframework/transport/connect/Connection.java -d ../bin - cd simple/src && \ - javac -source 1.6 -target 1.6 org/simpleframework/transport/connect/SocketConnection.java -d ../bin - cd simple/bin && \ - jar cvf simple.jar * - -simple-build-stamp: simple/bin/simple.jar - touch simple-build-stamp - -simple: simple-build-stamp - test -d bin || mkdir bin - cp simple/bin/simple.jar bin - -simple-clean: - - rm -f bin/simple.jar - - rm -f simple-build-stamp - - rm -rf simple - -#------------------------------------------------------------------------------# # JTorControl library jtorctl/bin/jtorctl.jar: @@ -299,13 +272,12 @@ 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 simple +assets: tor privoxy jtorctl obfsproxy 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/simple.jar ../libs install bin/tor ../libs/armeabi/libtor.so assets-clean: @@ -313,7 +285,6 @@ assets-clean: -rm ../libs/armeabi/libprivoxy.so -rm ../libs/armeabi/libobfsproxy.so -rm ../libs/jtorctl.jar - -rm ../libs/simple.jar #------------------------------------------------------------------------------# # cleanup, cleanup, put the toys away

1 0

[orbot/master] more removal of share service from core Orbot
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 6a125a9dee9e28dbbefa523fb853ecc1889100a0 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 13:34:16 2013 -0500 more removal of share service from core Orbot moving to a separate app --- .../torproject/android/service/ITorService.aidl | 5 -- src/org/torproject/android/service/TorService.java | 74 +------------------- 2 files changed, 2 insertions(+), 77 deletions(-) diff --git a/src/org/torproject/android/service/ITorService.aidl b/src/org/torproject/android/service/ITorService.aidl index a7514c7..4891b55 100644 --- a/src/org/torproject/android/service/ITorService.aidl +++ b/src/org/torproject/android/service/ITorService.aidl @@ -54,11 +54,6 @@ interface ITorService { String getInfo (String args); /** - * Add Onion Share - */ - String addOnionShare (in Uri uriData, String contentType); - - /** * change identity */ void newIdentity (); diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 9116767..304cd40 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2011, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */ +/* Copyright (c) 2009-2011, Nathan Freitas, Orbot / The Guardian Project - https://guardianproject.info/apps/orbot */ /* See LICENSE for licensing information */ /* * Code for iptables binary management taken from DroidWall GPLv3 @@ -30,8 +30,6 @@ import org.torproject.android.R; import org.torproject.android.TorConstants; import org.torproject.android.Utils; import org.torproject.android.settings.AppManager; -import org.torproject.android.share.ShareItem; -import org.torproject.android.share.ShareService; import android.app.Application; import android.app.Notification; @@ -76,13 +74,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private ArrayList<String> configBuffer = null; private ArrayList<String> resetBuffer = null; - - //Orbot file sharing service - - private ShareService mShareServe = null; //if hidden services activated - private String mShareServeHost = null; - private int mShareServePort = -1; - + // private String appHome; private File appBinHome; private File appCacheHome; @@ -342,19 +334,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - private void stopShareService () - { - try - { - if (mShareServe != null) - mShareServe.stopService(); - } - catch (Exception e) - { - Log.e(TAG, "error stopping share service",e); - } - } - private void stopTor () { currentStatus = STATUS_OFF; @@ -375,8 +354,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (hasRoot) disableTransparentProxy(); - stopShareService(); - sendCallbackStatusMessage(getString(R.string.status_disabled)); } @@ -1100,12 +1077,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst startNotification(getString(R.string.status_activated),prefPersistNotifications); - - - //we load this here from the file directory based on data - //written by Tor binary - mShareServeHost = getHiddenServiceHostname (); - } @@ -1496,10 +1467,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst } - public String addOnionShare (Uri data, String contentType) - { - return addOnionShareImpl (data, contentType); - } }; private ArrayList<String> callbackBuffer = new ArrayList<String>(); @@ -1859,20 +1826,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst hsPort = Integer.parseInt(hsPortConfig.split(" ")[0]); - //start this for the first port specified - if (mShareServe == null) - { - - mShareServe = new ShareService(10, this); - } - - //we load this here from the file directory based on data - //written by Tor binary - mShareServeHost = getHiddenServiceHostname (); - mShareServePort = hsPort; - mShareServe.startService(hsPort); - - } catch (NumberFormatException e) { Log.e(this.TAG,"error parsing hsport",e); } catch (Exception e) { @@ -1893,29 +1846,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst return true; } - public String addOnionShareImpl (Uri data, String contentType) - { - try - { - - ShareItem si = new ShareItem(); - si.mUriData = data; - si.mContentType = contentType; - - String guid = mShareServe.addShare(si); - - String shareUrl = "http://" + mShareServeHost + ':' + mShareServePort + '/' + guid; - - return shareUrl; - } - catch (Exception e) - { - Log.e(TAG,"unable to handle share",e); - } - - return null; - } - //using Google DNS for now as the public DNS server private String writeDNSFile () throws IOException {

1 0

[orbot/master] adding geoip ipv4 db back in for now
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 420dd1e966fc3c288f89207fb1948c3ef4357f85 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 15:27:54 2013 -0500 adding geoip ipv4 db back in for now --- res/raw/geoip.mp3 | Bin 0 -> 1210843 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/res/raw/geoip.mp3 b/res/raw/geoip.mp3 new file mode 100644 index 0000000..4b5ce6d Binary files /dev/null and b/res/raw/geoip.mp3 differ

1 0

[orbot/master] remove simple jar from project (moving sharing to sep app)
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit c58f009e84ba3247fb41e7f0771c4520afcf792a Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 13:24:46 2013 -0500 remove simple jar from project (moving sharing to sep app) --- libs/simple.jar | Bin 199014 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/libs/simple.jar b/libs/simple.jar deleted file mode 100755 index 3ad5bbd..0000000 Binary files a/libs/simple.jar and /dev/null differ

1 0

[orbot/master] updating to Android 18 / 4.4
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 6e795961f742882cbc7af3bd987d0b66e63e02ea Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 15:28:15 2013 -0500 updating to Android 18 / 4.4 --- project.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.properties b/project.properties index 0a52332..3b45b07 100644 --- a/project.properties +++ b/project.properties @@ -8,5 +8,5 @@ # project structure. # Project target. -target=android-18 +target=android-19 android.library.reference.1=external/ActionBarSherlock/actionbarsherlock

1 0

[orbot/master] remove "ShareService" from projet (moving to separate app)
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 528642149d6c769a9e00380719675d0ac0e66ae5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 13:24:25 2013 -0500 remove "ShareService" from projet (moving to separate app) --- src/org/torproject/android/share/ShareItem.java | 10 -- src/org/torproject/android/share/ShareService.java | 189 -------------------- 2 files changed, 199 deletions(-) diff --git a/src/org/torproject/android/share/ShareItem.java b/src/org/torproject/android/share/ShareItem.java deleted file mode 100644 index 06ec235..0000000 --- a/src/org/torproject/android/share/ShareItem.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.torproject.android.share; - -import android.net.Uri; - -public class ShareItem { - - public String mContentType; - public long mContentLength; - public Uri mUriData; -} diff --git a/src/org/torproject/android/share/ShareService.java b/src/org/torproject/android/share/ShareService.java deleted file mode 100644 index 163db24..0000000 --- a/src/org/torproject/android/share/ShareService.java +++ /dev/null @@ -1,189 +0,0 @@ -package org.torproject.android.share; - -import java.io.BufferedOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.InetSocketAddress; -import java.net.SocketAddress; -import java.util.HashMap; -import java.util.concurrent.Executor; -import java.util.concurrent.Executors; - -import org.simpleframework.http.Path; -import org.simpleframework.http.Request; -import org.simpleframework.http.Response; -import org.simpleframework.http.core.Container; -import org.simpleframework.http.core.ContainerServer; -import org.simpleframework.transport.Server; -import org.simpleframework.transport.connect.Connection; -import org.simpleframework.transport.connect.SocketConnection; - -import android.content.ContentResolver; -import android.content.Context; -import android.content.res.AssetFileDescriptor; -import android.database.Cursor; -import android.provider.MediaStore; -import android.util.Log; - -public class ShareService implements Container, Runnable { - - private final static String TAG = "OrbotShare"; - - private final static String LOCALHOST = "127.0.0.1"; - private int mPort = -1; - private Thread thread = null; - - public static class Task implements Runnable { - - private final Response response; - private final Request request; - - public Task(Request request, Response response) { - this.response = response; - this.request = request; - } - - public void run() { - try { - - Path path = request.getPath(); - String rPath = path.toString(); - if (rPath.length() > 0) - rPath = rPath.substring(1); - - ShareItem sItem = null; - - if (sShareItems != null) - sItem = sShareItems.get(rPath); - - if (sItem != null) - { - - long time = System.currentTimeMillis(); - - response.setValue("Server", "OrbotShare/1.0 (Orbot 0.0.12-alpha)"); - response.setDate("Date", time); - response.setDate("Last-Modified", time); - response.setValue("Content-Type", sItem.mContentType); - - - ContentResolver cr = sContext.getContentResolver(); - InputStream is = cr.openInputStream(sItem.mUriData); - - AssetFileDescriptor fileDesc = cr.openAssetFileDescriptor(sItem.mUriData, "r"); - fileDesc.getLength(); - - response.setValue("Content-Length", fileDesc.getLength()+""); - - String fileName = rPath; - - String scheme = sItem.mUriData.getScheme(); - if (scheme.equals("file")) { - fileName = sItem.mUriData.getLastPathSegment(); - } - else if (scheme.equals("content")) { - String[] proj = { MediaStore.Images.Media.TITLE }; - Cursor cursor = cr.query(sItem.mUriData, proj, null, null, null); - if (cursor != null && cursor.getCount() != 0) { - int columnIndex = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.TITLE); - cursor.moveToFirst(); - fileName = cursor.getString(columnIndex); - } - } - - //force file to be downloaded - response.setValue("Content-Disposition","attachment; filename=" + fileName); - - BufferedOutputStream bos = new BufferedOutputStream(response.getOutputStream()); - - byte[] buffer = new byte[1024]; - int len = -1; - while ( (len = is.read(buffer)) != -1) - { - bos.write(buffer, 0, len); - } - - bos.flush(); - bos.close(); - } - else - { - response.setCode(404); - response.close(); - } - - } catch(Exception e) { - Log.e(TAG,"error handling request",e); - try { - response.setCode(500); - response.close(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } - } - } - - public ShareService(int size, Context context) { - this.executor = Executors.newFixedThreadPool(size); - sContext = context; - } - - public void handle(Request request, Response response) { - Task task = new Task(request, response); - - executor.execute(task); - } - - - public void startService (int port) throws Exception { - - mPort = port; - thread = new Thread(this); - thread.start(); - } - - public void run () - { - try - { - mServer = new ContainerServer(this); - mConnection = new SocketConnection(mServer); - SocketAddress address = new InetSocketAddress("0.0.0.0", mPort); - - mConnection.connect(address); - } - catch (Exception e) - { - Log.e(TAG,"error starting share service!",e); - } - } - - public void stopService () throws Exception { - mConnection.close(); - } - - public synchronized String addShare (ShareItem sItem) - { - if (sShareItems == null) - { - sShareItems = new HashMap<String,ShareItem>(); - - } - - String guid = java.util.UUID.randomUUID().toString().substring(0,6);//short guid - - sShareItems.put (guid, sItem); - - return guid; - } - - private final Executor executor; - - private Server mServer; - private Connection mConnection; - - private static HashMap<String, ShareItem> sShareItems; - private static Context sContext; -} \ No newline at end of file

1 0

[orbot/master] change "network conn" preference to be more clear
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit a0de73667f21468215e38b1bb80e8f5d4393fe9e Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 13:25:03 2013 -0500 change "network conn" preference to be more clear --- res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 2d0c671..21592b6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -238,7 +238,7 @@ <string name="bandwidth_">Bandwidth:</string> <string name="down">down</string> <string name="up">up</string> - <string name="pref_disable_network_title">Network Auto-Sleep</string> - <string name="pref_disable_network_summary">Put Tor to sleep when there is no network connectivity</string> + <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> </resources>

1 0

[orbot/master] update for 0.2.4.20 constant
by n8fr8＠torproject.org 30 Dec '13

30 Dec '13

commit 5870a674d8486251c0c87f37128cd4cad05980d5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Dec 27 15:27:09 2013 -0500 update for 0.2.4.20 constant --- 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 7739eb1..9900623 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.16-rc-bump"; + public static final String BINARY_TOR_VERSION = "0.2.4.20"; 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