tor-commits January 2012

tor-commits@lists.torproject.org

14 participants
852 discussions

[orbot/master] cleaned up notify icons
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 08a0376410df43ba720e9032aff4e4b9dd3658bf Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:05:43 2012 -0500 cleaned up notify icons --- res/drawable/tornotification.png | Bin 828 -> 779 bytes res/drawable/tornotificationerr.png | Bin 794 -> 751 bytes res/drawable/tornotificationon.png | Bin 875 -> 826 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/drawable/tornotification.png b/res/drawable/tornotification.png index 7992965..068c3b9 100644 Binary files a/res/drawable/tornotification.png and b/res/drawable/tornotification.png differ diff --git a/res/drawable/tornotificationerr.png b/res/drawable/tornotificationerr.png index 7e09074..90603f8 100644 Binary files a/res/drawable/tornotificationerr.png and b/res/drawable/tornotificationerr.png differ diff --git a/res/drawable/tornotificationon.png b/res/drawable/tornotificationon.png index 01ab68a..68e8a34 100644 Binary files a/res/drawable/tornotificationon.png and b/res/drawable/tornotificationon.png differ

1 0

[orbot/master] updated version string in text for about dialog
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 71e79ea56cc0f4cf9f1acf910a00911c1befec8e Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 16 23:41:38 2012 -0500 updated version string in text for about dialog --- res/values/strings.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 797e8a7..6d3f0f0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -237,7 +237,7 @@ <string name="the_tor_license">The Tor License</string> <string name="https_torproject_org">https://torproject.org</string> <string name="third_party_software">3rd-Party-Software: </string> -<string name="tor_version">Tor v0.2.3.7: https://www.torproject.org</string> +<string name="tor_version">Tor v0.2.3.10: https://www.torproject.org</string> <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string>

1 0

[orbot/master] removed whispersys stuff for now
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit e6d65dbae92e19ab34ee10e468812bd106b92051 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:06:09 2012 -0500 removed whispersys stuff for now --- libs/whispercore.jar | Bin 9849 -> 0 bytes .../torproject/android/service/WhisperManager.java | 93 -------------------- 2 files changed, 0 insertions(+), 93 deletions(-) diff --git a/libs/whispercore.jar b/libs/whispercore.jar deleted file mode 100644 index 914e033..0000000 Binary files a/libs/whispercore.jar and /dev/null differ diff --git a/src/org/torproject/android/service/WhisperManager.java b/src/org/torproject/android/service/WhisperManager.java deleted file mode 100644 index d858af3..0000000 --- a/src/org/torproject/android/service/WhisperManager.java +++ /dev/null @@ -1,93 +0,0 @@ -package org.torproject.android.service; - -import android.content.ContentValues; -import android.content.Context; -import android.database.Cursor; -import android.net.Uri; -import android.util.Log; - -import com.whispersys.providers.Netfilter; - -/* - * Supports interaction with private APIs provided by WhisperSystems SDK - */ -public class WhisperManager { - - - Context context; - - - public boolean isWhisperCore () - { - boolean result = false; - - Cursor cursor = null; - Uri uri = Uri.withAppendedPath(Netfilter.Filter.CONTENT_URI, Netfilter.Filter.Chains.OUTPUT); - - try { - cursor = context.getContentResolver().query(uri, null, null, null, null); - cursor.moveToFirst(); - result = true; - } - catch (Exception e) - { - result = false; - } - - return result; - } - /* - * Usage - The Netfilter provider allows you to query, update, insert, or delete rules from a chain of a table. Callers must provide a CONTENT_URI which specifies the chain of the table they would like to query or modify. - - To query and print the INPUT rules for the filter table, for instance, would look like this: - */ - - public void query () - { - Cursor cursor = null; - Uri uri = Uri.withAppendedPath(Netfilter.Filter.CONTENT_URI, Netfilter.Filter.Chains.OUTPUT); - - try { - cursor = context.getContentResolver().query(uri, null, null, null, null); - - while (cursor.moveToNext()) - for (int i=0;i<cursor.getColumnCount();i++) - Log.w("TestApp", "Column: " + cursor.getColumnName(i) + " , value: " + cursor.getString(i)); - } finally { - if (cursor != null) - cursor.close(); - } - } - - /* - To append a rule that dropped all UDP traffic to the end of the OUTPUT chain would look like this: - */ - - public void append () - { - Uri uri = Uri.withAppendedPath(Netfilter.Filter.CONTENT_URI, - Netfilter.Filter.Chains.OUTPUT); - ContentValues values = new ContentValues(); - values.put(Netfilter.Filter.TARGET, Netfilter.Targets.DROP); - values.put(Netfilter.Filter.PROTOCOL, Netfilter.Protocols.UDP); - - context.getContentResolver().insert(uri, values); - } - - /* - iptables rule indexes start at 1. To insert the same rule in the first position of the OUTPUT chain, rather than appending it to the end of the chain, would look like this: - */ - public void insert () - { - Uri uri = Uri.withAppendedPath(Netfilter.Filter.CONTENT_URI, - Netfilter.Filter.Chains.OUTPUT); - ContentValues values = new ContentValues(); - values.put(Netfilter.Filter.TARGET, Netfilter.Targets.DROP); - values.put(Netfilter.Filter.PROTOCOL, Netfilter.Protocols.UDP); - values.put(Netfilter.Filter.ROW_ID, 1); - - context.getContentResolver().insert(uri, values); - } -} -

1 0

[orbot/master] new pref constants
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit bab5183818a9559760d59c91c3ef36adec15776b Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:05:30 2012 -0500 new pref constants --- src/org/torproject/android/TorConstants.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/android/TorConstants.java b/src/org/torproject/android/TorConstants.java index 755a209..ae84e61 100644 --- a/src/org/torproject/android/TorConstants.java +++ b/src/org/torproject/android/TorConstants.java @@ -45,4 +45,6 @@ public interface TorConstants { public final static String PREF_USE_SYSTEM_IPTABLES = "pref_use_sys_iptables"; + public final static String PREF_PERSIST_NOTIFICATIONS = "pref_persistent_notifications"; + }

1 0

[orbot/master] updated version
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit b225703988a1381dac22f8613fc29cb6ab55cb80 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Jan 16 23:41:50 2012 -0500 updated version --- AndroidManifest.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6c935ad..d072a76 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="0.2.3.10-orbot-1.0.7-RC5" - android:versionCode="28" + android:versionName="0.2.3.10-orbot-1.0.7-RC6" + android:versionCode="29" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" />

1 0

[orbot/master] support zip file raw assets
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 5dae04030317962d19905141ef35351ef6814924 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:07:15 2012 -0500 support zip file raw assets --- .../android/service/TorBinaryInstaller.java | 31 +++++++++++++++++-- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java b/src/org/torproject/android/service/TorBinaryInstaller.java index 68ce745..0d79780 100644 --- a/src/org/torproject/android/service/TorBinaryInstaller.java +++ b/src/org/torproject/android/service/TorBinaryInstaller.java @@ -74,6 +74,19 @@ public class TorBinaryInstaller implements TorServiceConstants { outFile = new File(installFolder, PRIVOXYCONFIG_ASSET_KEY); streamToFile(is,outFile, false, false); + + return true; + } + + /* + * Extract the Tor binary from the APK file using ZIP + */ + public boolean installGeoIP () throws IOException, FileNotFoundException + { + + InputStream is; + File outFile; + is = context.getResources().openRawResource(R.raw.geoip); outFile = new File(installFolder, GEOIP_ASSET_KEY); streamToFile(is, outFile, false, true); @@ -200,12 +213,20 @@ public class TorBinaryInstaller implements TorServiceConstants { * @throws IOException on error * @throws InterruptedException when interrupted */ - private static void copyRawFile(Context ctx, int resid, File file, String mode) throws IOException, InterruptedException + private 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); - final InputStream is = ctx.getResources().openRawResource(resid); + 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) { @@ -229,14 +250,16 @@ public class TorBinaryInstaller implements TorServiceConstants { File file = new File(ctx.getDir("bin",0), "iptables"); if ((!file.exists()) && isARMv6()) { - copyRawFile(ctx, R.raw.iptables_g1, file, CHMOD_EXEC); + copyRawFile(ctx, R.raw.iptables_g1, file, CHMOD_EXEC, false); + + changed = true; } // Check iptables_n1 file = new File(ctx.getDir("bin",0), "iptables"); if ((!file.exists()) && (!isARMv6())) { - copyRawFile(ctx, R.raw.iptables_n1, file, CHMOD_EXEC); + copyRawFile(ctx, R.raw.iptables_n1, file, CHMOD_EXEC, false); changed = true; }

1 0

[orbot/master] cleaned up override settings
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 857c30224764ab2a443e8b7b6af8f1b4a37723f6 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:06:25 2012 -0500 cleaned up override settings --- .../android/wizard/ConfigureTransProxy.java | 6 ------ src/org/torproject/android/wizard/LotsaText.java | 3 --- src/org/torproject/android/wizard/Permissions.java | 6 ------ .../torproject/android/wizard/TipsAndTricks.java | 6 ------ .../torproject/android/wizard/WizardHelper.java | 12 ------------ 5 files changed, 0 insertions(+), 33 deletions(-) diff --git a/src/org/torproject/android/wizard/ConfigureTransProxy.java b/src/org/torproject/android/wizard/ConfigureTransProxy.java index 54336d4..79cb477 100644 --- a/src/org/torproject/android/wizard/ConfigureTransProxy.java +++ b/src/org/torproject/android/wizard/ConfigureTransProxy.java @@ -117,7 +117,6 @@ public class ConfigureTransProxy extends Activity implements TorConstants { back.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); @@ -126,8 +125,6 @@ public class ConfigureTransProxy extends Activity implements TorConstants { next.setOnClickListener(new View.OnClickListener() { - //Dirty flag variable - improve logic - @Override public void onClick(View v) { showWizardFinal(); @@ -142,7 +139,6 @@ public class ConfigureTransProxy extends Activity implements TorConstants { rb1.setOnClickListener(new OnClickListener() { - @Override public void onClick(View v) { context.startActivity(new Intent(context, AppManager.class)); @@ -157,7 +153,6 @@ public class ConfigureTransProxy extends Activity implements TorConstants { mRadioGroup.setOnCheckedChangeListener(new RadioGroup.OnCheckedChangeListener (){ - @Override public void onCheckedChanged(RadioGroup group, int checkedId){ Button next = ((Button)findViewById(R.id.btnWizard2)); next.setEnabled(true); @@ -212,7 +207,6 @@ public class ConfigureTransProxy extends Activity implements TorConstants { DialogInterface.OnClickListener ocListener = new DialogInterface.OnClickListener() { - @Override public void onClick(DialogInterface dialog, int which) { startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1); diff --git a/src/org/torproject/android/wizard/LotsaText.java b/src/org/torproject/android/wizard/LotsaText.java index 5af1e39..3393157 100644 --- a/src/org/torproject/android/wizard/LotsaText.java +++ b/src/org/torproject/android/wizard/LotsaText.java @@ -95,7 +95,6 @@ public class LotsaText extends Activity implements TorConstants{ btn2.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { stepTwo(); } @@ -130,7 +129,6 @@ public class LotsaText extends Activity implements TorConstants{ btn1.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { stepOne(); @@ -139,7 +137,6 @@ public class LotsaText extends Activity implements TorConstants{ btn2.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); } diff --git a/src/org/torproject/android/wizard/Permissions.java b/src/org/torproject/android/wizard/Permissions.java index 5e17b67..760d71f 100644 --- a/src/org/torproject/android/wizard/Permissions.java +++ b/src/org/torproject/android/wizard/Permissions.java @@ -111,7 +111,6 @@ public class Permissions extends Activity implements TorConstants { consent.setOnCheckedChangeListener(new OnCheckedChangeListener (){ - @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { @@ -142,7 +141,6 @@ public class Permissions extends Activity implements TorConstants { grantPermissions.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { //Check and Install iptables - TorTransProxy.testOwnerModule(this) @@ -190,7 +188,6 @@ public class Permissions extends Activity implements TorConstants { back.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); @@ -201,7 +198,6 @@ public class Permissions extends Activity implements TorConstants { next.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); } @@ -239,7 +235,6 @@ public class Permissions extends Activity implements TorConstants { btn1.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), LotsaText.class), 1); @@ -248,7 +243,6 @@ public class Permissions extends Activity implements TorConstants { btn2.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), TipsAndTricks.class), 1); } diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index ca8e416..4aff609 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -74,7 +74,6 @@ public class TipsAndTricks extends Activity implements TorConstants { btn1.setOnClickListener(new OnClickListener() { - @Override public void onClick(View view) { String url = getString(R.string.gibberbot_apk_url); @@ -87,7 +86,6 @@ public class TipsAndTricks extends Activity implements TorConstants { btn2.setOnClickListener(new OnClickListener() { - @Override public void onClick(View view) { String url = getString(R.string.orweb_apk_url); @@ -102,7 +100,6 @@ public class TipsAndTricks extends Activity implements TorConstants { back.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); @@ -111,7 +108,6 @@ public class TipsAndTricks extends Activity implements TorConstants { next.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { showWizardFinal(); } @@ -141,7 +137,6 @@ public class TipsAndTricks extends Activity implements TorConstants { btn1.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), Permissions.class), 1); @@ -150,7 +145,6 @@ public class TipsAndTricks extends Activity implements TorConstants { btn2.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { startActivityForResult(new Intent(getBaseContext(), Orbot.class), 1); diff --git a/src/org/torproject/android/wizard/WizardHelper.java b/src/org/torproject/android/wizard/WizardHelper.java index 881d38d..8180094 100644 --- a/src/org/torproject/android/wizard/WizardHelper.java +++ b/src/org/torproject/android/wizard/WizardHelper.java @@ -58,7 +58,6 @@ public class WizardHelper implements TorConstants { showCustomDialog(title, view,context.getString(R.string.btn_next),null,new DialogInterface.OnClickListener() { - @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -90,7 +89,6 @@ public class WizardHelper implements TorConstants { btn1.setOnClickListener(new OnClickListener() { - @Override public void onClick(View view) { boolean iCanHazRoot = TorServiceUtils.isRootPossible(); @@ -132,7 +130,6 @@ public class WizardHelper implements TorConstants { cb1.setOnCheckedChangeListener(new OnCheckedChangeListener (){ - @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { @@ -151,7 +148,6 @@ public class WizardHelper implements TorConstants { showCustomDialog(title, view,context.getString(R.string.btn_next),context.getString(R.string.btn_back),new DialogInterface.OnClickListener() { - @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -183,11 +179,8 @@ public class WizardHelper implements TorConstants { title = context.getString(R.string.wizard_permissions_root); msg = context.getString(R.string.wizard_premissions_msg_root); - - showDialog(title, msg,context.getString(R.string.btn_next),context.getString(R.string.btn_back),new DialogInterface.OnClickListener() { - @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss(); @@ -218,7 +211,6 @@ public class WizardHelper implements TorConstants { btn1.setOnClickListener(new OnClickListener() { - @Override public void onClick(View view) { String url = context.getString(R.string.otrchat_apk_url); @@ -231,7 +223,6 @@ public class WizardHelper implements TorConstants { btn2.setOnClickListener(new OnClickListener() { - @Override public void onClick(View view) { String url = context.getString(R.string.orweb_apk_url); @@ -255,9 +246,6 @@ public class WizardHelper implements TorConstants { */ showCustomDialog(title, view,context.getString(R.string.btn_next),context.getString(R.string.btn_back),new DialogInterface.OnClickListener() { - - - @Override public void onClick(DialogInterface dialog, int which) { dialog.dismiss();

1 0

[orbot/master] added pref for persist notifications
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 1a7afea671ae98467551ec145e2cb937660960b9 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:09:44 2012 -0500 added pref for persist notifications --- res/xml/preferences.xml | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 743cf27..40955db 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -14,6 +14,15 @@ 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" +android:summary="@string/pref_use_persistent_notifications" +android:enabled="true" +android:title="@string/pref_use_persistent_notifications_title"/> + <!-- <CheckBoxPreference android:defaultValue="false"

1 0

[orbot/master] cleaned up override syntax
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit f1d6934ee325ed58058572e6f48abe913ac6c861 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:06:44 2012 -0500 cleaned up override syntax --- .../torproject/android/settings/AppManager.java | 3 --- .../android/settings/SettingsPreferences.java | 1 - 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/settings/AppManager.java b/src/org/torproject/android/settings/AppManager.java index 3ced335..16a6e7f 100644 --- a/src/org/torproject/android/settings/AppManager.java +++ b/src/org/torproject/android/settings/AppManager.java @@ -69,7 +69,6 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC btnSave.setOnClickListener(new OnClickListener() { - @Override public void onClick(View v) { finish(); } @@ -268,8 +267,6 @@ public class AppManager extends Activity implements OnCheckedChangeListener, OnC } - - @Override public void onClick(View v) { CheckBox cbox = (CheckBox)v.getTag(); diff --git a/src/org/torproject/android/settings/SettingsPreferences.java b/src/org/torproject/android/settings/SettingsPreferences.java index 55134ab..1545df6 100644 --- a/src/org/torproject/android/settings/SettingsPreferences.java +++ b/src/org/torproject/android/settings/SettingsPreferences.java @@ -109,7 +109,6 @@ public class SettingsPreferences //Log.d(getClass().getName(),"Exiting Preferences"); } - @Override public boolean onPreferenceClick(Preference preference) { setResult(1010);

1 0

[orbot/master] cleaned up binding and logging
by n8fr8＠torproject.org 26 Jan '12

26 Jan '12

commit 493d6e22cdcd7f4836589c696b5c1f2aeb534847 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Jan 25 20:09:33 2012 -0500 cleaned up binding and logging --- src/org/torproject/android/Orbot.java | 29 ++++++++++++----------------- 1 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 94807e4..b54c05e 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -284,7 +284,6 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() { - @Override public void onClick(DialogInterface dialog, int which) { switch (which){ case DialogInterface.BUTTON_POSITIVE: @@ -340,9 +339,9 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants protected void onResume() { super.onResume(); - bindService(); + if (!mIsBound) + bindService(); - if (getIntent() == null) return; @@ -355,7 +354,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants { DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() { - @Override + public void onClick(DialogInterface dialog, int which) { switch (which){ case DialogInterface.BUTTON_POSITIVE: @@ -401,11 +400,7 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants } else { - - //setTitle(getString(R.string.app_name) + ' ' + getString(R.string.app_version)); - - NotificationManager mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - mNotificationManager.cancelAll(); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); @@ -722,14 +717,14 @@ public class Orbot extends Activity implements OnLongClickListener, TorConstants mHandler.sendMessage(msg); } - @Override //this was when we displayed the log in the main Activity; can prob take this out now - public void logMessage(String value) throws RemoteException { - - Message msg = mHandler.obtainMessage(TorServiceConstants.LOG_MSG); - msg.getData().putString(HANDLER_TOR_MSG, value); - mHandler.sendMessage(msg); - - } + + public void logMessage(String value) throws RemoteException { + + Message msg = mHandler.obtainMessage(TorServiceConstants.LOG_MSG); + msg.getData().putString(HANDLER_TOR_MSG, value); + mHandler.sendMessage(msg); + + } };

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
86
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2012