April 2015 - tor-commits - lists.torproject.org

[orbot/master] remove integrated pluto code
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 431dff53a487a108cc18040785bd4dcda5113086 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Feb 5 10:53:21 2015 -0500 remove integrated pluto code --- src/org/torproject/android/pluto/PlutoFactory.java | 14 -- .../torproject/android/pluto/PlutoInstaller.java | 194 -------------------- .../torproject/android/pluto/PlutoInstance.java | 9 - 3 files changed, 217 deletions(-) diff --git a/src/org/torproject/android/pluto/PlutoFactory.java b/src/org/torproject/android/pluto/PlutoFactory.java deleted file mode 100644 index 094bc5e..0000000 --- a/src/org/torproject/android/pluto/PlutoFactory.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.torproject.android.pluto; - -public class PlutoFactory { - - - //load pluto.properties from res/raw/pluto.properties - - //ensure the PT binaries are installed and exe - - //expose the installed PT's via a simple factory instance interface .getPlutoInstance("obfs3") - - //return instance with interface for getting exe path, directly starting/stopping, monitoring status, etc - -} diff --git a/src/org/torproject/android/pluto/PlutoInstaller.java b/src/org/torproject/android/pluto/PlutoInstaller.java deleted file mode 100644 index 4c312c4..0000000 --- a/src/org/torproject/android/pluto/PlutoInstaller.java +++ /dev/null @@ -1,194 +0,0 @@ -/* Copyright (c) 2009, Nathan Freitas, Orbot / The Guardian Project - http://openideals.com/guardian */ -/* See LICENSE for licensing information */ - -package org.torproject.android.pluto; - -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.StringBufferInputStream; -import java.util.ArrayList; -import java.util.concurrent.TimeoutException; -import java.util.zip.ZipEntry; -import java.util.zip.ZipInputStream; - -import org.sufficientlysecure.rootcommands.Shell; -import org.sufficientlysecure.rootcommands.command.SimpleCommand; -import org.torproject.android.R; -import org.torproject.android.TorConstants; - -import android.content.Context; -import android.os.Build; -import android.util.Log; - -public class PlutoInstaller { - - - private File installFolder; - private Context context; - - private final static int FILE_WRITE_BUFFER_SIZE = 1024; - private final static String CHMOD_EXE_VALUE = "770"; - private final static String COMMAND_RM_FORCE = "rm -f "; - - public PlutoInstaller (Context context, File installFolder) - { - this.installFolder = installFolder; - this.context = context; - } - - public boolean installBinaries () throws Exception - { - - InputStream is; - File outFile; - - installFolder.mkdirs(); - - Shell shell = Shell.startShell(new ArrayList<String>(),installFolder.getAbsolutePath()); - - String ptAsset = null; - - is = context.getResources().openRawResource(R.raw.obfsclient); - - outFile = new File(installFolder, ptAsset); - shell.add(new SimpleCommand(COMMAND_RM_FORCE + outFile.getAbsolutePath())).waitForFinish(); - streamToFile(is,outFile, false, true); - - enableBinExec (outFile); - - return true; - } - - private boolean enableBinExec (File fileBin) throws Exception - { - - if (!fileBin.canExecute()) - { - Shell shell = Shell.startShell(); - shell.add(new SimpleCommand("chmod " + CHMOD_EXE_VALUE + ' ' + fileBin.getCanonicalPath())).waitForFinish(); - - File fileTest = new File(fileBin.getCanonicalPath()); - shell.close(); - } - - return fileBin.canExecute(); - } - - - /* - * Write the inputstream contents to the file - */ - public static boolean streamToFile(InputStream stm, File outFile, boolean append, boolean zip) throws IOException - - { - byte[] buffer = new byte[FILE_WRITE_BUFFER_SIZE]; - - int bytecount; - - OutputStream stmOut = new FileOutputStream(outFile.getAbsolutePath(), append); - ZipInputStream zis = null; - - if (zip) - { - zis = new ZipInputStream(stm); - ZipEntry ze = zis.getNextEntry(); - stm = zis; - - } - - while ((bytecount = stm.read(buffer)) > 0) - { - - stmOut.write(buffer, 0, bytecount); - - } - - stmOut.close(); - stm.close(); - - if (zis != null) - zis.close(); - - - return true; - - } - - //copy the file from inputstream to File output - alternative impl - public static void copyFile (InputStream is, File outputFile) - { - - try { - outputFile.createNewFile(); - DataOutputStream out = new DataOutputStream(new FileOutputStream(outputFile)); - DataInputStream in = new DataInputStream(is); - - int b = -1; - byte[] data = new byte[1024]; - - while ((b = in.read(data)) != -1) { - out.write(data); - } - - if (b == -1); //rejoice - - // - out.flush(); - out.close(); - in.close(); - // chmod? - - - - } catch (IOException ex) { - Log.e(TorConstants.TAG, "error copying binary", ex); - } - - } - - - - - /** - * Copies a raw resource file, given its ID to the given location - * @param ctx context - * @param resid resource id - * @param file destination file - * @param mode file permissions (E.g.: "755") - * @throws IOException on error - * @throws InterruptedException when interrupted - */ - public static void copyRawFile(Context ctx, int resid, File file, String mode, boolean isZipd) throws IOException, InterruptedException - { - final String abspath = file.getAbsolutePath(); - // Write the iptables binary - final FileOutputStream out = new FileOutputStream(file); - InputStream is = ctx.getResources().openRawResource(resid); - - if (isZipd) - { - ZipInputStream zis = new ZipInputStream(is); - ZipEntry ze = zis.getNextEntry(); - is = zis; - } - - byte buf[] = new byte[1024]; - int len; - while ((len = is.read(buf)) > 0) { - out.write(buf, 0, len); - } - out.close(); - is.close(); - // Change the permissions - Runtime.getRuntime().exec("chmod "+mode+" "+abspath).waitFor(); - } - - - -} diff --git a/src/org/torproject/android/pluto/PlutoInstance.java b/src/org/torproject/android/pluto/PlutoInstance.java deleted file mode 100644 index 4585083..0000000 --- a/src/org/torproject/android/pluto/PlutoInstance.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.torproject.android.pluto; - -import java.io.File; - -public class PlutoInstance { - - public String name; - public File fileBinary; -}

1 0

[orbot/master] ignore more things
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 70643fc29a4806654956886bbd2bae41fb131458 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Feb 5 09:44:45 2015 -0500 ignore more things --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index f94a15f..2289b9d 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ local.properties builds /patches/* /res/raw/*mp3 +obj +releases

1 0

[orbot/master] update pluto to latest
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 22e75a3825bd66b1c3f767d7deae55f539552486 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Feb 5 10:53:55 2015 -0500 update pluto to latest --- external/pluto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/pluto b/external/pluto index bb501fb..356e490 160000 --- a/external/pluto +++ b/external/pluto @@ -1 +1 @@ -Subproject commit bb501fbf5ff545ee04909214ade5e7c9ce935186 +Subproject commit 356e4906370f30aad06ea0e9fa44382149c22597

1 0

[orbot/master] update to latest pluto for meek-client
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 266c29701d548f7e8410a5a73def0d3fa78af8fe Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 14 00:42:51 2015 -0500 update to latest pluto for meek-client --- external/pluto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/pluto b/external/pluto index 356e490..1631763 160000 --- a/external/pluto +++ b/external/pluto @@ -1 +1 @@ -Subproject commit 356e4906370f30aad06ea0e9fa44382149c22597 +Subproject commit 1631763c8dd932785c8cdfaff88f36e2399bcfa3

1 0

[orbot/master] update build files (tmp fix for now)
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 44efced5d4722098dc21a98df3e430e6eb0fb9cb Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Feb 4 16:54:18 2015 -0500 update build files (tmp fix for now) --- procfg.txt | 32 -------------------------------- proguard-project.txt | 48 ++++++++++++++++++++++++++++++------------------ project.properties | 2 +- update-ant-build.sh | 3 +++ 4 files changed, 34 insertions(+), 51 deletions(-) diff --git a/procfg.txt b/procfg.txt deleted file mode 100644 index 7d2b51f..0000000 --- a/procfg.txt +++ /dev/null @@ -1,32 +0,0 @@ --optimizationpasses 5 --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --dontpreverify --dontobfuscate --verbose --optimizations !code/simplification/arithmetic,!field/*,!class/merging/* - --keep public class * extends android.app.Activity --keep public class * extends android.app.Application --keep public class * extends android.app.Service --keep public class * extends android.content.BroadcastReceiver --keep public class * extends android.content.ContentProvider --keep public class com.android.vending.licensing.ILicensingService - --keepclasseswithmembernames class * { - native <methods>; -} - --keepclasseswithmembernames class * { - public <init>(android.content.Context, android.util.AttributeSet); -} - --keepclasseswithmembernames class * { - public <init>(android.content.Context, android.util.AttributeSet, int); -} - --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - diff --git a/proguard-project.txt b/proguard-project.txt index f2fe155..7d2b51f 100644 --- a/proguard-project.txt +++ b/proguard-project.txt @@ -1,20 +1,32 @@ -# To enable ProGuard in your project, edit project.properties -# to define the proguard.config property as described in that file. -# -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in ${sdk.dir}/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the ProGuard -# include property in project.properties. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html +-optimizationpasses 5 +-dontusemixedcaseclassnames +-dontskipnonpubliclibraryclasses +-dontpreverify +-dontobfuscate +-verbose +-optimizations !code/simplification/arithmetic,!field/*,!class/merging/* -# Add any project specific keep options here: +-keep public class * extends android.app.Activity +-keep public class * extends android.app.Application +-keep public class * extends android.app.Service +-keep public class * extends android.content.BroadcastReceiver +-keep public class * extends android.content.ContentProvider +-keep public class com.android.vending.licensing.ILicensingService + +-keepclasseswithmembernames class * { + native <methods>; +} + +-keepclasseswithmembernames class * { + public <init>(android.content.Context, android.util.AttributeSet); +} + +-keepclasseswithmembernames class * { + public <init>(android.content.Context, android.util.AttributeSet, int); +} + +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/project.properties b/project.properties index 7f2e988..7300f9d 100644 --- a/project.properties +++ b/project.properties @@ -6,7 +6,7 @@ # To customize properties used by the Ant build system use, # "ant.properties", and override values to adapt the script to your # project structure. -proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:proguard-project.txt +#proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:proguard-project.txt # Project target. target=android-21 diff --git a/update-ant-build.sh b/update-ant-build.sh index c87a05b..0bcbac2 100755 --- a/update-ant-build.sh +++ b/update-ant-build.sh @@ -4,3 +4,6 @@ android update project -t android-21 --path . --name Orbot --subprojects android update lib-project -t android-21 --path external/appcompat android update lib-project -t android-21 --path external/superuser-commands/RootCommands-Library/ +android update lib-project -t android-21 --path ../Orweb +android update lib-project -t android-21 --path ../OnionKit/libnetcipher +

1 0

[orbot/master] update project and layout for v15 merged browser + VPN
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 6a83a0d2f62fbb303e0646520296f1134e80407a Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 1 12:49:10 2015 -0500 update project and layout for v15 merged browser + VPN --- AndroidManifest.xml | 44 ++++ project.properties | 1 + res/layout-land/layout_main.xml | 169 -------------- res/layout/layout_main.xml | 121 +++++----- res/layout/layout_wizard_permissions.xml | 37 --- res/layout/layout_wizard_root.xml | 51 ----- res/menu/main.xml | 81 ------- src/org/torproject/android/Orbot.java | 133 ++++++----- .../android/wizard/ConfigureTransProxy.java | 241 -------------------- src/org/torproject/android/wizard/LotsaText.java | 2 +- src/org/torproject/android/wizard/Permissions.java | 206 ----------------- .../torproject/android/wizard/TipsAndTricks.java | 7 +- 12 files changed, 179 insertions(+), 914 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2e9aa21..192acaf 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -99,6 +99,50 @@ <activity android:name=".settings.SettingsPreferences" android:label="@string/app_name"/> <activity android:name=".settings.AppManager" android:label="@string/app_name"/> + <activity android:name="info.guardianproject.browser.Browser" + android:label="@string/app_name_orweb" + android:icon="@drawable/icon_orweb" + android:configChanges="locale|orientation|screenSize" + android:launchMode="singleTop" + > + <intent-filter> + <action android:name="android.intent.action.MAIN" /> + <category android:name="android.intent.category.LAUNCHER" /> + </intent-filter> + <intent-filter> + <action android:name="android.intent.action.SEARCH" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + <intent-filter> + <action android:name="android.intent.action.VIEW" /> + + <category android:name="android.intent.category.DEFAULT" /> + <category android:name="android.intent.category.BROWSABLE" /> + <data android:scheme="http" /> + <data android:scheme="https" /> + <data android:scheme="about" /> + </intent-filter> +  + <intent-filter> + <action android:name="android.intent.action.VIEW" /> + + <category android:name="android.intent.category.BROWSABLE" /> + <category android:name="android.intent.category.DEFAULT" /> + <data android:scheme="http" /> --> + <data android:scheme="https" /> + <data android:mimeType="text/html"/> + <data android:mimeType="text/plain"/> + <data android:mimeType="application/xhtml+xml"/> + <data android:mimeType="application/vnd.wap.xhtml+xml"/> + </intent-filter> + + <meta-data android:name="android.app.searchable" + android:resource="@xml/searchable"/> + </activity> + <activity android:label="@string/app_name" android:name="info.guardianproject.browser.EditPreferences"></activity> + + <service android:enabled="true" android:name=".service.TorService" android:permission="org.torproject.android.MANAGE_TOR" diff --git a/project.properties b/project.properties index 2abb592..e87ce9f 100644 --- a/project.properties +++ b/project.properties @@ -12,3 +12,4 @@ proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:proguard target=android-21 android.library.reference.1=external/appcompat android.library.reference.2=external/superuser-commands/RootCommands-Library +android.library.reference.3=../Orweb diff --git a/res/layout-land/layout_main.xml b/res/layout-land/layout_main.xml deleted file mode 100644 index b90faf1..0000000 --- a/res/layout-land/layout_main.xml +++ /dev/null @@ -1,169 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:id="@+id/viewMain" - android:paddingTop="0sp" - android:background="@drawable/tilebg" - > - -  - - -  - - <LinearLayout android:gravity="center_vertical" - android:layout_gravity="center_vertical|left" - android:orientation="vertical" android:layout_width="240dip" - android:layout_height="match_parent" - android:id="@+id/boxStatus" - > - - <org.torproject.android.ImageProgressView - android:id="@+id/imgStatus" - android:layout_width="fill_parent" - android:layout_height="0dp" - android:layout_marginTop="40dp" - android:layout_weight="1" - android:src="@drawable/toroff" - android:layout_gravity="center_horizontal" /> - - <TextView android:id="@+id/lblStatus" - android:text="@string/press_to_start" - android:gravity="center_horizontal" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="20dp" - android:textColor="#ffffff" - android:maxLines="1" - android:fontFamily="sans-serif-light" - - /> - -</LinearLayout> - - <RelativeLayout - android:id="@+id/log" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_margin="6dp" - android:layout_gravity="center_vertical|right" - android:layout_toRightOf="@+id/boxStatus" - - > - - <RelativeLayout - android:id="@+id/rowTrafficLabels" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingLeft="3sp" - android:paddingRight="3sp" - - > - <TextView - android:id="@+id/trafficLabelDown" - android:textColor="#FFFFFFFF" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:textSize="15sp" - android:text="@string/main_layout_download" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" - - /> - <TextView - android:id="@+id/trafficLabelUp" - android:textColor="#FFFFFFFF" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:text="@string/main_layout_upload" - android:textSize="15sp" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" - - /> - - </RelativeLayout> - <RelativeLayout - android:id="@+id/rowTrafficData" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:paddingLeft="3sp" - android:paddingRight="3sp" - android:paddingBottom="3sp" - android:layout_below="@+id/rowTrafficLabels" - > - <TextView - android:id="@+id/trafficDown" - android:textColor="#ccff2a" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:textSize="15sp" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" - - /> - <TextView - android:id="@+id/trafficUp" - android:textColor="#ccff2a" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:textSize="15sp" - android:gravity="center_vertical" - android:fontFamily="sans-serif-light" - - /> - </RelativeLayout> - <TextView - android:id="@+id/orbotLog" - android:textColor="#FFFFFF" - android:textSize="12sp" - android:gravity="left" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_alignParentLeft="true" - android:textIsSelectable="true" - android:layout_below="@+id/rowTrafficData" - android:fontFamily="sans-serif-light" - android:background="#aa333333" - android:padding="3sp" - - /> - </RelativeLayout> - -</RelativeLayout> diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index c1a50c7..965e599 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -1,77 +1,36 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:id="@+id/viewMain" - android:paddingTop="0sp" - android:background="@drawable/tilebg" - > + +<LinearLayout android:gravity="center_vertical|center_horizontal" + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout android:gravity="center_vertical|center_horizontal" + android:orientation="vertical" android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="#686868" + > +  -  - <LinearLayout android:gravity="center_vertical|center_horizontal" - android:orientation="vertical" android:layout_width="fill_parent" - android:layout_height="fill_parent" - - > - - <org.torproject.android.ImageProgressView - android:id="@+id/imgStatus" - android:layout_width="fill_parent" - android:layout_height="0dp" - android:layout_marginTop="40dp" - android:layout_weight="1" - android:src="@drawable/toroff" - android:layout_gravity="center_horizontal" /> - <TextView android:id="@+id/lblStatus" - android:text="@string/press_to_start" + android:text="status status status" android:gravity="center_horizontal" android:textSize="20sp" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="40dp" - android:layout_marginLeft="60dp" - android:layout_marginRight="60dp" + android:layout_marginBottom="10dp" + android:layout_marginTop="10dp" + android:layout_marginLeft="40dp" + android:layout_marginRight="40dp" android:textColor="#ffffff" - android:maxLines="2" + android:maxLines="1" android:fontFamily="sans-serif-light" /> - - + --> + <RelativeLayout android:id="@+id/rowTrafficDown" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" android:paddingLeft="3sp" @@ -130,8 +89,44 @@ android:fontFamily="sans-serif-light" /> </RelativeLayout> + </LinearLayout> + + + <org.torproject.android.ImageProgressView + android:id="@+id/imgStatus" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_marginTop="5dp" + android:padding="0dp" + android:layout_weight="1" + android:src="@drawable/toroff" + android:layout_gravity="center_horizontal" /> + + + <LinearLayout android:gravity="center_horizontal" + android:orientation="horizontal" android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="5dp" + android:background="#686868" + > + + <Button + android:id="@+id/btnBrowser" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Open Browser" /> + + <Button + android:id="@+id/btnVPN" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Start VPN" /> + + </LinearLayout> + </LinearLayout> +  + diff --git a/res/layout/layout_wizard_permissions.xml b/res/layout/layout_wizard_permissions.xml deleted file mode 100644 index 5e3b1ed..0000000 --- a/res/layout/layout_wizard_permissions.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - -<TableLayout android:id="@+id/TableLayout01" android:stretchColumns="*" android:layout_height="fill_parent" android:layout_width="wrap_content"> - -<TableRow android:layout_margin="10dip" android:id="@+id/TableRow01" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent"> - - - <ScrollView android:id="@+id/helpscrollview" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_span="3" - > - <LinearLayout android:background="#575757" android:layout_width="wrap_content" android:id="@+id/linearLayout1" android:layout_height="wrap_content" android:orientation="vertical"> - <TextView android:layout_width="wrap_content" android:textColor="#ffffff" android:layout_height="wrap_content" android:textSize="8pt" android:id="@+id/WizardTextBody1" android:text="this is sample text this is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample text" android:padding="20dip"></TextView> - <Button android:layout_width="wrap_content" android:visibility="gone" android:layout_height="wrap_content" android:gravity="center" android:text="@string/button_grant_superuser" android:id="@+id/grantPermissions" android:layout_gravity="center"></Button> - <TextView android:layout_width="wrap_content" android:layout_gravity="left" android:visibility="gone" android:textColor="#ffffff" android:layout_height="wrap_content" android:textSize="8pt" android:id="@+id/WizardTextBody2" android:text="this is sample text this is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample textthis is sample text" android:padding="20dip"></TextView> - <CheckBox android:id="@+id/checkBox" android:layout_gravity="left" android:text="@string/wizard_permissions_consent" android:layout_height="wrap_content" android:layout_width="wrap_content" android:gravity="center" android:visibility="visible"></CheckBox> - </LinearLayout> - - </ScrollView> - -</TableRow> -<TableRow android:background="#000000" android:layout_marginTop="10dip" android:paddingTop="10dip" android:id="@+id/TableRow01" android:textColor="#00ff00" android:layout_width="fill_parent" android:layout_height="30px"> - <Button android:text="@string/btn_back" android:id="@+id/btnWizard1" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> - <Button android:text="@string/btn_next" android:id="@+id/btnWizard2" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> -</TableRow> -</TableLayout> -</LinearLayout> - - diff --git a/res/layout/layout_wizard_root.xml b/res/layout/layout_wizard_root.xml deleted file mode 100644 index cdda4f4..0000000 --- a/res/layout/layout_wizard_root.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - -<TableLayout android:id="@+id/TableLayout01" android:stretchColumns="*" android:layout_height="fill_parent" android:layout_width="wrap_content"> - -<TableRow android:layout_margin="10dip" android:id="@+id/TableRow01" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="fill_parent"> - - - <ScrollView android:id="@+id/helpscrollview" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_span="3"> - -<LinearLayout - android:background="#575757" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:padding="3px"> -<TextView android:text="@string/wizard_transproxy_msg" android:layout_width="wrap_content" android:textColor="#ffffff" android:layout_height="wrap_content" android:textSize="8pt" android:id="@+id/WizardTextBody1" android:padding="20dip"></TextView> -<RadioGroup android:id="@+id/radioGroup" android:layout_height="wrap_content" android:layout_width="wrap_content" android:paddingLeft="15dip"> - <RadioButton android:text="@string/wizard_configure_all" android:id="@+id/radio0" android:layout_height="wrap_content" android:layout_width="wrap_content"></RadioButton> - <TextView android:layout_height="wrap_content" - android:text="@string/wizard_transproxy_hint" - android:layout_width="wrap_content" - android:textSize="15sp" - android:paddingBottom="10dip" android:paddingRight="20dip"> - </TextView> - <RadioButton android:text="@string/wizard_configure_select_apps" android:id="@+id/radio1" android:layout_height="wrap_content" android:layout_width="wrap_content"></RadioButton> - <RadioButton android:text="@string/wizard_transproxy_none" android:id="@+id/radio2" android:layout_height="wrap_content" android:layout_width="wrap_content"></RadioButton> -</RadioGroup> - - - </LinearLayout> - </ScrollView> - -</TableRow> -<TableRow android:background="#000000" android:layout_marginTop="10dip" android:paddingTop="10dip" android:id="@+id/TableRow01" android:textColor="#00ff00" android:layout_width="fill_parent" android:layout_height="30px"> - <Button android:text="@string/btn_back" android:id="@+id/btnWizard1" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> - <Button android:text="@string/btn_next" android:id="@+id/btnWizard2" android:layout_weight="1" android:layout_width="fill_parent" android:layout_height="wrap_content"></Button> -</TableRow> -</TableLayout> -</LinearLayout> - - - diff --git a/res/menu/main.xml b/res/menu/main.xml deleted file mode 100644 index 3c592b2..0000000 --- a/res/menu/main.xml +++ /dev/null @@ -1,81 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<menu xmlns:yourapp="http://schemas.android.com/apk/res-auto" - xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:id="@+id/menu_start" - android:title="@string/menu_start" - android:icon="@drawable/ic_action_start" - yourapp:showAsAction="never" - /> - - <item android:id="@+id/menu_settings" - android:title="@string/menu_settings" - android:icon="@drawable/ic_action_settings" - yourapp:showAsAction="always" - /> - - <item - android:id="@+id/menu_verify_list" - android:title="@string/menu_verify" - android:icon="@drawable/ic_action_browse" - yourapp:showAsAction="always" - > - <menu> - <item android:id="@+id/menu_verify" - android:title="@string/menu_verify_browser" - android:icon="@drawable/ic_action_browse" - /> - -  - - </menu> - </item> - <item android:id="@+id/menu_about" - android:title="@string/menu_about" - android:icon="@drawable/ic_menu_about" - yourapp:showAsAction="never" - - /> - - <item android:id="@+id/menu_wizard" - android:title="@string/menu_wizard" - android:icon="@drawable/ic_menu_goto" - yourapp:showAsAction="never" - - /> -  - - <item android:id="@+id/menu_exit" - android:title="@string/menu_exit" - android:icon="@drawable/ic_menu_exit" - yourapp:showAsAction="never" - - /> - -</menu> diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index d57eacf..a55f53e 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -4,6 +4,7 @@ package org.torproject.android; import static org.torproject.android.TorConstants.TAG; +import info.guardianproject.browser.Browser; import java.net.URLDecoder; import java.util.Locale; @@ -12,9 +13,7 @@ import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.TorServiceUtils; import org.torproject.android.settings.SettingsPreferences; -import org.torproject.android.vpn.OrbotVpnService; import org.torproject.android.wizard.ChooseLocaleWizardActivity; -import org.torproject.android.wizard.TipsAndTricks; import android.annotation.TargetApi; import android.app.AlertDialog; @@ -22,7 +21,6 @@ import android.app.ProgressDialog; import android.content.BroadcastReceiver; import android.content.Context; import android.content.DialogInterface; -import android.content.DialogInterface.OnClickListener; import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; @@ -41,9 +39,6 @@ import android.os.Message; import android.os.RemoteException; import android.support.v4.content.LocalBroadcastManager; import android.support.v7.app.ActionBarActivity; -import android.text.ClipboardManager; -import android.text.Layout; -import android.text.method.ScrollingMovementMethod; import android.util.Log; import android.view.GestureDetector; import android.view.GestureDetector.SimpleOnGestureListener; @@ -57,7 +52,6 @@ import android.view.View.OnLongClickListener; import android.view.View.OnTouchListener; import android.view.animation.AccelerateInterpolator; import android.widget.Button; -import android.widget.SlidingDrawer; import android.widget.TextView; import android.widget.Toast; @@ -65,16 +59,16 @@ import android.widget.Toast; public class Orbot extends ActionBarActivity implements TorConstants, OnLongClickListener, OnTouchListener, OnSharedPreferenceChangeListener { /* Useful UI bits */ - private TextView lblStatus = null; //the main text display widget + //private TextView lblStatus = null; //the main text display widget private ImageProgressView imgStatus = null; //the main touchable image for activating Orbot private MenuItem mItemOnOff = null; private TextView downloadText = null; private TextView uploadText = null; - private TextView mTxtOrbotLog = null; - private SlidingDrawer mDrawer = null; + // private TextView mTxtOrbotLog = null; + // private SlidingDrawer mDrawer = null; private boolean mDrawerOpen = false; - private View mViewMain = null; + // private View mViewMain = null; /* Some tracking bits */ private int torStatus = TorServiceConstants.STATUS_OFF; //latest status reported from the tor service @@ -96,7 +90,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic doLayout(); - appConflictChecker (); + // appConflictChecker (); // Register to receive messages. @@ -181,19 +175,19 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic { setContentView(R.layout.layout_main); - mViewMain = findViewById(R.id.viewMain); - lblStatus = (TextView)findViewById(R.id.lblStatus); - lblStatus.setOnLongClickListener(this); + // lblStatus = (TextView)findViewById(R.id.lblStatus); +// lblStatus.setOnLongClickListener(this); imgStatus = (ImageProgressView)findViewById(R.id.imgStatus); imgStatus.setOnLongClickListener(this); imgStatus.setOnTouchListener(this); - lblStatus.setText("Initializing the application..."); + // lblStatus.setText("Initializing the application..."); downloadText = (TextView)findViewById(R.id.trafficDown); uploadText = (TextView)findViewById(R.id.trafficUp); - mTxtOrbotLog = (TextView)findViewById(R.id.orbotLog); + // mTxtOrbotLog = (TextView)findViewById(R.id.orbotLog); + /* mDrawer = ((SlidingDrawer)findViewById(R.id.SlidingDrawer)); Button slideButton = (Button)findViewById(R.id.slideButton); if (slideButton != null) @@ -212,8 +206,9 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } }); - } + }*/ + /* ScrollingMovementMethod smm = new ScrollingMovementMethod(); mTxtOrbotLog.setMovementMethod(smm); @@ -227,7 +222,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic Toast.makeText(Orbot.this, "LOG COPIED TO CLIPBOARD", Toast.LENGTH_SHORT).show(); return true; } - }); + });*/ downloadText.setText(formatCount(0) + " / " + formatTotal(0)); uploadText.setText(formatCount(0) + " / " + formatTotal(0)); @@ -235,6 +230,33 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic // Gesture detection mGestureDetector = new GestureDetector(this, new MyGestureDetector()); + Button btnBrowser = (Button)findViewById(R.id.btnBrowser); + btnBrowser.setOnClickListener(new View.OnClickListener () + { + + @Override + public void onClick(View v) { + doTorCheck(); + + } + + + }); + + Button btnVPN = (Button)findViewById(R.id.btnVPN); + btnVPN.setOnClickListener(new View.OnClickListener () + { + + @Override + public void onClick(View v) { + + startVpnService(); + + } + + + }); + } @@ -247,8 +269,10 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } + /* private void appendLogTextAndScroll(String text) { + if(mTxtOrbotLog != null && text != null && text.length() > 0){ if (mTxtOrbotLog.getText().length() > MAX_LOG_LENGTH) @@ -263,7 +287,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic mTxtOrbotLog.scrollBy(0, scrollDelta); } } - } + }*/ /* * Create the UI Options Menu (non-Javadoc) @@ -273,14 +297,14 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.main, menu); + inflater.inflate(R.menu.orbot_main, menu); mItemOnOff = menu.getItem(0); return true; } - + /** private void appConflictChecker () { SharedPreferences sprefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); @@ -300,13 +324,13 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic if (showAppConflict) showAlert(getString(R.string.app_conflict),msg,true); - appendLogTextAndScroll(msg); + // appendLogTextAndScroll(msg); } } sprefs.edit().putBoolean("pref_show_conflict", false).commit(); - } + }*/ @@ -394,12 +418,10 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } - /** - * remove for now... VPN is not ready yet else if (item.getItemId() == R.id.menu_vpn) { - this.startVpnService(); - }*/ + startVpnService(); + } return true; } @@ -451,29 +473,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic private void doTorCheck () { - DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() { - - public void onClick(DialogInterface dialog, int which) { - switch (which){ - case DialogInterface.BUTTON_POSITIVE: - - openBrowser(URL_TOR_CHECK); - - - - break; - - case DialogInterface.BUTTON_NEGATIVE: - - //do nothing - break; - } - } - }; - - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setMessage(R.string.tor_check).setPositiveButton(R.string.btn_okay, dialogClickListener) - .setNegativeButton(R.string.btn_cancel, dialogClickListener).show(); + openBrowser(URL_TOR_CHECK); + } @@ -666,12 +667,19 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic */ private void openBrowser(final String browserLaunchUrl) { + //startIntent("info.guardianproject.browser.Browser",Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl)); + + Intent intentBrowser = new Intent(this, Browser.class); + intentBrowser.setAction(Intent.ACTION_VIEW); + intentBrowser.setData(Uri.parse(browserLaunchUrl)); + startActivity(intentBrowser); + + /** boolean isOrwebInstalled = appInstalledOrNot("info.guardianproject.browser"); boolean isTransProxy = mPrefs.getBoolean("pref_transparent", false); if (isOrwebInstalled) { - startIntent("info.guardianproject.browser",Intent.ACTION_VIEW,Uri.parse(browserLaunchUrl)); } else if (isTransProxy) { @@ -685,7 +693,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic .setIcon(R.drawable.onion32) .setTitle(R.string.install_apps_) .setMessage(R.string.it_doesn_t_seem_like_you_have_orweb_installed_want_help_with_that_or_should_we_just_open_the_browser_) - .setPositiveButton(android.R.string.ok, new OnClickListener () + .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener () { @Override @@ -698,7 +706,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic } }) - .setNegativeButton(android.R.string.no, new OnClickListener () + .setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener () { @Override @@ -712,7 +720,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic }) .show(); - } + }*/ } @@ -894,7 +902,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic imgStatus.setImageResource(R.drawable.toron); String lblMsg = getString(R.string.status_activated); - lblStatus.setText(lblMsg); + //lblStatus.setText(lblMsg); if (mItemOnOff != null) mItemOnOff.setTitle(R.string.menu_stop); @@ -902,7 +910,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic if (torServiceMsg != null && torServiceMsg.length() > 0) { - appendLogTextAndScroll(torServiceMsg); + // appendLogTextAndScroll(torServiceMsg); } boolean showFirstTime = mPrefs.getBoolean("connect_first_time",true); @@ -936,19 +944,20 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic if (mItemOnOff != null) mItemOnOff.setTitle(R.string.menu_stop); - + /** if (lblStatus != null && torServiceMsg != null) if (torServiceMsg.indexOf('%')!=-1) lblStatus.setText(torServiceMsg); + **/ - appendLogTextAndScroll(torServiceMsg); + //appendLogTextAndScroll(torServiceMsg); } else if (torStatus == TorServiceConstants.STATUS_OFF) { imgStatus.setImageResource(R.drawable.toroff); - lblStatus.setText(getString(R.string.status_disabled) + "\n" + getString(R.string.press_to_start)); + //lblStatus.setText(getString(R.string.status_disabled) + "\n" + getString(R.string.press_to_start)); if (mItemOnOff != null) mItemOnOff.setTitle(R.string.menu_start); @@ -970,12 +979,12 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic startService (TorServiceConstants.CMD_START); torStatus = TorServiceConstants.STATUS_CONNECTING; - mTxtOrbotLog.setText(""); +// mTxtOrbotLog.setText(""); //here we update the UI which is a bit sloppy and mixed up code wise //might be best to just call updateStatus() instead of directly manipulating UI in this method - yep makes sense imgStatus.setImageResource(R.drawable.torstarting); - lblStatus.setText(getString(R.string.status_starting_up)); + // lblStatus.setText(getString(R.string.status_starting_up)); //we send a message here to the progressDialog i believe, but we can clarify that shortly Message msg = mHandler.obtainMessage(TorServiceConstants.ENABLE_TOR_MSG); diff --git a/src/org/torproject/android/wizard/ConfigureTransProxy.java b/src/org/torproject/android/wizard/ConfigureTransProxy.java deleted file mode 100644 index ca7f3ac..0000000 --- a/src/org/torproject/android/wizard/ConfigureTransProxy.java +++ /dev/null @@ -1,241 +0,0 @@ -package org.torproject.android.wizard; - -import org.torproject.android.Orbot; -import org.torproject.android.R; -import org.torproject.android.TorConstants; -import org.torproject.android.R.drawable; -import org.torproject.android.R.id; -import org.torproject.android.R.layout; -import org.torproject.android.R.string; -import org.torproject.android.service.TorServiceUtils; -import org.torproject.android.settings.AppManager; - -import android.app.Activity; -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.content.SharedPreferences; -import android.content.SharedPreferences.Editor; -import android.net.Uri; -import android.os.Bundle; -import android.preference.PreferenceManager; -import android.util.Log; -import android.view.KeyEvent; -import android.view.View; -import android.view.View.OnClickListener; -import android.widget.Button; -import android.widget.CheckBox; -import android.widget.CompoundButton; -import android.widget.RadioButton; -import android.widget.RadioGroup; -import android.widget.TextView; -import android.widget.CompoundButton.OnCheckedChangeListener; -import android.widget.Toast; - -public class ConfigureTransProxy extends Activity implements TorConstants { - - private Context context; - private int flag = 0; - - protected void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - context = this; - - } - - @Override - protected void onStart() { - - super.onStart(); - setContentView(R.layout.layout_wizard_root); - - stepSix(); - - } - - @Override - protected void onResume() { - super.onResume(); - - setupUI(); - - - - } - - private void setupUI () - { - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - - boolean transEnabled = prefs.getBoolean(PREF_TRANSPARENT, false); - - if (transEnabled) - { - boolean transAllEnabled = prefs.getBoolean(PREF_TRANSPARENT_ALL, false); - - if (transAllEnabled) - { - RadioButton rb0 = (RadioButton)findViewById(R.id.radio0); - rb0.setChecked(true); - - - } - else - { - RadioButton rb1 = (RadioButton)findViewById(R.id.radio1); - rb1.setChecked(true); - - } - - Button next = ((Button)findViewById(R.id.btnWizard2)); - next.setEnabled(true); - } - - } - - - private void stepSix(){ - - String title = context.getString(R.string.wizard_transproxy_title); - - setTitle(title); - - Button back = ((Button)findViewById(R.id.btnWizard1)); - Button next = ((Button)findViewById(R.id.btnWizard2)); - next.setEnabled(false); - - back.setOnClickListener(new View.OnClickListener() { - - public void onClick(View v) { - finish(); - startActivity(new Intent(ConfigureTransProxy.this, Permissions.class)); - } - }); - - next.setOnClickListener(new View.OnClickListener() { - - public void onClick(View v) { - finish(); - startActivity(new Intent(ConfigureTransProxy.this, TipsAndTricks.class)); - - } - }); - - - RadioButton rb0 = (RadioButton)findViewById(R.id.radio0); - RadioButton rb1 = (RadioButton)findViewById(R.id.radio1); - RadioButton rb2 = (RadioButton)findViewById(R.id.radio2); - - rb1.setOnClickListener(new OnClickListener() - { - - public void onClick(View v) { - - startActivity(new Intent(ConfigureTransProxy.this, AppManager.class)); - } - - }); - - RadioGroup mRadioGroup = (RadioGroup)findViewById(R.id.radioGroup); - mRadioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener (){ - - - public void onCheckedChanged(RadioGroup group, int checkedId){ - Button next = ((Button)findViewById(R.id.btnWizard2)); - next.setEnabled(true); - - RadioButton rb0 = (RadioButton)findViewById(R.id.radio0); - RadioButton rb1 = (RadioButton)findViewById(R.id.radio1); - RadioButton rb2 = (RadioButton)findViewById(R.id.radio2); - - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - - Editor pEdit = prefs.edit(); - pEdit.putBoolean(PREF_TRANSPARENT, rb0.isChecked()); - pEdit.putBoolean(PREF_TRANSPARENT_ALL, rb0.isChecked()); - pEdit.commit(); - - if(rb0.isChecked()) - { - pEdit.putString("radiobutton","rb0"); - pEdit.commit(); - } - - else if(rb1.isChecked()) - { - flag++; - - pEdit.putBoolean(PREF_TRANSPARENT, true); - pEdit.putBoolean(PREF_TRANSPARENT_ALL, false); - pEdit.putString("radiobutton","rb1"); - pEdit.commit(); - - } - else if(rb2.isChecked()) - { - pEdit.putString("radiobutton", "rb2"); - pEdit.commit(); - } - - } - }); - - - } - - /* - private void showWizardFinal () - { - String title = null; - String msg = null; - - - title = context.getString(R.string.wizard_final); - msg = context.getString(R.string.wizard_final_msg); - - DialogInterface.OnClickListener ocListener = new DialogInterface.OnClickListener() { - - public void onClick(DialogInterface dialog, int which) { - startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1); - - } - }; - - - new AlertDialog.Builder(context) - .setIcon(R.drawable.icon) - .setTitle(title) - .setPositiveButton(R.string.button_close, ocListener) - .setMessage(msg) - .show(); - - - - - }*/ - - @Override - protected void onRestoreInstanceState(Bundle savedInstanceState) { - super.onRestoreInstanceState(savedInstanceState); - } - - @Override - protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - - } - - //Code to override the back button! - @Override - public boolean onKeyDown(int keyCode, KeyEvent event) { - if(keyCode == KeyEvent.KEYCODE_BACK){ - finish(); - startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); - return true; - } - return false; - } - -} \ No newline at end of file diff --git a/src/org/torproject/android/wizard/LotsaText.java b/src/org/torproject/android/wizard/LotsaText.java index 536edab..137282f 100644 --- a/src/org/torproject/android/wizard/LotsaText.java +++ b/src/org/torproject/android/wizard/LotsaText.java @@ -117,7 +117,7 @@ public class LotsaText extends Activity implements TorConstants{ public void onClick(View v) { finish(); - startActivity(new Intent(LotsaText.this, Permissions.class)); + startActivity(new Intent(LotsaText.this, TipsAndTricks.class)); } }); diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java deleted file mode 100644 index 229f5bd..0000000 --- a/src/org/torproject/android/wizard/Permissions.java +++ /dev/null @@ -1,206 +0,0 @@ -package org.torproject.android.wizard; - -import org.sufficientlysecure.rootcommands.RootCommands; -import org.torproject.android.R; -import org.torproject.android.TorConstants; -import org.torproject.android.service.TorServiceUtils; - -import android.app.Activity; -import android.content.Context; -import android.content.Intent; -import android.content.SharedPreferences; -import android.content.SharedPreferences.Editor; -import android.os.Bundle; -import android.util.Log; -import android.view.KeyEvent; -import android.view.View; -import android.widget.Button; -import android.widget.CheckBox; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; -import android.widget.TextView; - -public class Permissions extends Activity implements TorConstants { - - private Context context; - - protected void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - context = this; - - } - - @Override - protected void onStart() { - - super.onStart(); - setContentView(R.layout.layout_wizard_permissions); - - stepFourRoot(); - - } - - @Override - protected void onResume() { - super.onResume(); - - - } - - - private void stepFourRoot(){ - - String msg1 = context.getString(R.string.wizard_permissions_root_msg1); - String msg2 = context.getString(R.string.wizard_permissions_root_msg2); - - TextView txtBody1 = ((TextView)findViewById(R.id.WizardTextBody1)); - txtBody1.setText(msg1); - - - TextView txtBody2 = ((TextView)findViewById(R.id.WizardTextBody2)); - txtBody2.setText(msg2); - txtBody2.setVisibility(TextView.VISIBLE); - - Button grantPermissions = ((Button)findViewById(R.id.grantPermissions)); - grantPermissions.setVisibility(Button.VISIBLE); - - Button back = ((Button)findViewById(R.id.btnWizard1)); - Button next = ((Button)findViewById(R.id.btnWizard2)); - next.setEnabled(false); - - CheckBox consent = (CheckBox)findViewById(R.id.checkBox); - consent.setVisibility(CheckBox.VISIBLE); - - consent.setOnCheckedChangeListener(new OnCheckedChangeListener (){ - - public void onCheckedChanged(CompoundButton buttonView, - boolean isChecked) { - - - //this is saying do not use root - - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - - Editor pEdit = prefs.edit(); - - pEdit.putBoolean(PREF_TRANSPARENT, false); - pEdit.putBoolean(PREF_TRANSPARENT_ALL, false); - pEdit.putBoolean(PREF_HAS_ROOT, false); - - pEdit.commit(); - - /* - Button next = ((Button)findViewById(R.id.btnWizard2)); - if(isChecked) - next.setEnabled(true); - else - next.setEnabled(false); - */ - - stepFour(); - - } - - }); - - - grantPermissions.setOnClickListener(new View.OnClickListener() { - - public void onClick(View v) { - //Check and Install iptables - TorTransProxy.testOwnerModule(this) - - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - - boolean hasRoot = RootCommands.rootAccessGiven(); - Editor pEdit = prefs.edit(); - pEdit.putBoolean(PREF_HAS_ROOT,hasRoot); - pEdit.commit(); - - if (!hasRoot) - { - - stepFour(); - - } - else - { - finish(); - startActivity(new Intent(Permissions.this, ConfigureTransProxy.class)); - } - - - } - }); - - back.setOnClickListener(new View.OnClickListener() { - - public void onClick(View v) { - finish(); - startActivity(new Intent(Permissions.this, LotsaText.class)); - } - }); - - - next.setOnClickListener(new View.OnClickListener() { - - - public void onClick(View v) { - finish(); - startActivity(new Intent(Permissions.this, TipsAndTricks.class)); - } - }); - - } - - private void stepFour(){ - - String title = context.getString(R.string.wizard_permissions_title); - String msg = context.getString(R.string.wizard_permissions_no_root_msg); - - setTitle(title); - - TextView txtBody = ((TextView)findViewById(R.id.WizardTextBody1)); - txtBody.setText(msg); - - Button btn1 = ((Button)findViewById(R.id.btnWizard1)); - Button btn2 = ((Button)findViewById(R.id.btnWizard2)); - btn2.setEnabled(true); - - TextView txtBody2 = ((TextView)findViewById(R.id.WizardTextBody2)); - txtBody2.setVisibility(TextView.GONE); - - Button grantPermissions = ((Button)findViewById(R.id.grantPermissions)); - grantPermissions.setVisibility(Button.GONE); - - CheckBox consent = (CheckBox)findViewById(R.id.checkBox); - consent.setVisibility(CheckBox.GONE); - - btn1.setOnClickListener(new View.OnClickListener() { - - public void onClick(View v) { - finish(); - startActivity(new Intent(Permissions.this, LotsaText.class)); - } - }); - - btn2.setOnClickListener(new View.OnClickListener() { - - public void onClick(View v) { - finish(); - startActivity(new Intent(Permissions.this, TipsAndTricks.class)); - } - }); - } - - //Code to override the back button! - public boolean onKeyDown(int keyCode, KeyEvent event) { - if(keyCode == KeyEvent.KEYCODE_BACK){ - finish(); - startActivity(new Intent(getBaseContext(), LotsaText.class)); - return true; - } - return false; - } - -} \ No newline at end of file diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index d10278b..3eea373 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -157,7 +157,7 @@ public class TipsAndTricks extends Activity implements TorConstants { public void onClick(View v) { finish(); - startActivityForResult(new Intent(TipsAndTricks.this, Permissions.class), 1); + startActivityForResult(new Intent(TipsAndTricks.this, LotsaText.class), 1); } }); @@ -184,7 +184,6 @@ public class TipsAndTricks extends Activity implements TorConstants { Button btn1 = ((Button)findViewById(R.id.btnWizard1)); Button btn2 = ((Button)findViewById(R.id.btnWizard2)); - btn2.setText(getString(R.string.btn_finish)); btn1.setVisibility(Button.VISIBLE); @@ -192,7 +191,7 @@ public class TipsAndTricks extends Activity implements TorConstants { public void onClick(View v) { finish(); - startActivity(new Intent(TipsAndTricks.this, Permissions.class)); + startActivity(new Intent(TipsAndTricks.this, LotsaText.class)); } }); @@ -209,7 +208,7 @@ public class TipsAndTricks extends Activity implements TorConstants { public boolean onKeyDown(int keyCode, KeyEvent event) { if(keyCode == KeyEvent.KEYCODE_BACK){ finish(); - startActivity(new Intent(getBaseContext(), Permissions.class)); + startActivity(new Intent(getBaseContext(), LotsaText.class)); return true; } return false;

1 0

[orbot/master] update makefile for badvpn tun2socks
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 753e21f36711a8a605d971e1be5b08e2032d93d1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 1 23:36:07 2015 -0500 update makefile for badvpn tun2socks --- jni/Android.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jni/Android.mk b/jni/Android.mk index edd247b..d103a09 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,3 +1,4 @@ -##include ../OriginalDest/Android.mk -##include ../external/badvpn/Android.mk +APP_PLATFORM := 9 +##include ../external/OriginalDest/Android.mk +include ../external/badvpn/Android.mk ##include ../kalium-jni/jni/Android.mk

1 0

[orbot/master] clean up of manifest for unused functions
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit ee1d54826bfbc06835492b3565091553fba26be5 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 1 23:36:46 2015 -0500 clean up of manifest for unused functions --- AndroidManifest.xml | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 192acaf..416c9b6 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="14.1.4-noPIE" - android:versionCode="132" + android:versionName="15.1.0" + android:versionCode="1510" android:installLocation="auto" > - <uses-sdk android:minSdkVersion="9" android:maxSdkVersion="20" android:targetSdkVersion="19"/> + <uses-sdk android:minSdkVersion="9" android:maxSdkVersion="22" android:targetSdkVersion="22"/> <permission android:name="org.torproject.android.MANAGE_TOR" android:label="@string/permission_manage_tor_label" android:description="@string/permission_manage_tor_description" android:protectionLevel="signature"></permission> <uses-permission android:name="android.permission.INTERNET" /> @@ -14,6 +14,8 @@ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/> <uses-permission android:name="org.torproject.android.MANAGE_TOR"/> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> + <application android:name=".OrbotApp" android:icon="@drawable/ic_launcher" android:label="@string/app_name" @@ -59,22 +61,10 @@ <action android:name="org.torproject.android.START_TOR" /> </intent-filter> -  - </activity>  <activity android:name=".service.DummyActivity" @@ -103,7 +93,6 @@ android:label="@string/app_name_orweb" android:icon="@drawable/icon_orweb" android:configChanges="locale|orientation|screenSize" - android:launchMode="singleTop" > <intent-filter> <action android:name="android.intent.action.MAIN" />

1 0

[orbot/master] more tweaks to new layout
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit cf50ec14335c64c7ad035a45122805c3e08007e1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 1 23:35:57 2015 -0500 more tweaks to new layout --- res/layout/layout_main.xml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index 965e599..ecf32fe 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -3,12 +3,14 @@ <LinearLayout android:gravity="center_vertical|center_horizontal" xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:backgroundTint="@color/panel_background" + > <LinearLayout android:gravity="center_vertical|center_horizontal" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="#686868" + android:background="@color/panel_background" > <!-- @@ -107,20 +109,26 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="5dp" - android:background="#686868" + android:background="@color/panel_background" + > <Button android:id="@+id/btnBrowser" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Open Browser" /> + android:text="Open Browser" + android:enabled="false" + /> <Button android:id="@+id/btnVPN" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Start VPN" /> + android:text="Start VPN" + android:enabled="false" + + /> </LinearLayout>

1 0

[orbot/master] update resources for new design
by n8fr8＠torproject.org 03 Apr '15

03 Apr '15

commit 48f40b34946f8f6d6b8ced47a47319b8a737f8b6 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 2 11:26:43 2015 -0500 update resources for new design --- res/layout/layout_main.xml | 128 ++++++++++++++++++++++++++++++++------------ res/menu/orbot_main.xml | 69 ++++++++++++++++++++++++ res/raw/pluto.properties | 3 ++ res/values/colors.xml | 6 +++ res/xml/preferences.xml | 38 +++---------- 5 files changed, 180 insertions(+), 64 deletions(-) diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index ecf32fe..31ac710 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -4,14 +4,43 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent" - android:backgroundTint="@color/panel_background" > - + + <android.support.v7.widget.Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:background="@color/panel_background" + android:layout_height="?attr/actionBarSize" + + /> + + <android.support.v4.widget.DrawerLayout + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" + > + +<LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:id="@+id/content_frame" + > + <LinearLayout android:gravity="center_vertical|center_horizontal" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/panel_background" + > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:background="@color/panel_background_dark" + + > +  +<menu xmlns:yourapp="http://schemas.android.com/apk/res-auto" + xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:id="@+id/menu_start" + android:title="@string/menu_start" + android:icon="@drawable/ic_action_start" + yourapp:showAsAction="never" + /> + + <item android:id="@+id/menu_settings" + android:title="@string/menu_settings" + android:icon="@drawable/ic_action_settings" + yourapp:showAsAction="always" + /> + + + + <item android:id="@+id/menu_about" + android:title="@string/menu_about" + android:icon="@drawable/ic_menu_about" + yourapp:showAsAction="never" + + /> + + <item android:id="@+id/menu_wizard" + android:title="@string/menu_wizard" + android:icon="@drawable/ic_menu_goto" + yourapp:showAsAction="never" + + /> + + <item android:id="@+id/menu_exit" + android:title="@string/menu_exit" + android:icon="@drawable/ic_menu_exit" + yourapp:showAsAction="never" + + /> + +</menu> diff --git a/res/raw/pluto.properties b/res/raw/pluto.properties new file mode 100644 index 0000000..74c0307 --- /dev/null +++ b/res/raw/pluto.properties @@ -0,0 +1,3 @@ +obfs2=obfsclient +obfs3=obfsclient +scramblesuit=obfsclient diff --git a/res/values/colors.xml b/res/values/colors.xml new file mode 100644 index 0000000..3454a7b --- /dev/null +++ b/res/values/colors.xml @@ -0,0 +1,6 @@ + + <resources> + <color name="panel_background">#460072</color> + <color name="panel_background_dark">#240020</color> + + </resources> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 15f1c32..b84fe76 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -8,14 +8,6 @@ android:title="@string/pref_start_boot_title" android:summary="@string/pref_start_boot_summary" android:enabled="true"/> -<CheckBoxPreference -android:defaultValue="false" -android:key="has_root" -android:title="@string/pref_has_root" -android:summary="@string/pref_has_root_summary" -android:enabled="true"/> - - <CheckBoxPreference android:defaultValue="true" android:key="pref_persistent_notifications" @@ -39,20 +31,19 @@ android:title="@string/pref_use_expanded_notifications_title"/> android:defaultValue="en"> </ListPreference> - </PreferenceCategory> <PreferenceCategory android:title="@string/pref_trans_proxy_group"> <CheckBoxPreference android:defaultValue="false" +android:key="has_root" +android:title="@string/pref_has_root" +android:summary="@string/pref_has_root_summary" +android:enabled="true"/> + +<CheckBoxPreference +android:defaultValue="false" android:key="pref_transparent" android:title="@string/pref_trans_proxy_title" android:summary="@string/pref_trans_proxy_summary" @@ -269,20 +260,5 @@ android:summary="@string/pref_transproxy_flush_summary" android:enabled="true" android:title="@string/pref_transproxy_flush_title"/> - </PreferenceCategory> </PreferenceScreen>

1 0