[tor-commits] [orbot/master] Cleanup dependency implementations and list

[n8fr8]

commit c5dca23de66a93a8ca7809174191e1778b2efe38
Author: syphyr 
Date:   Tue Nov 2 00:43:15 2021 +0100

Cleanup dependency implementations and list

Fixes: "Implements #509: Use Gradle Version Catalog"

Use same library implentations as before Gradle Version Catalog
was introduced. Some extra implentations were added when Gradle
Version Catalog was introduced and are not needed to build the
project.  Also fix spacing in dependency list.
---
 app-mini/build.gradle |  5 ++---
 app-tv/build.gradle   |  5 ++---
 app/build.gradle  |  9 +++-
 dependencies.gradle   | 58 +--
 4 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/app-mini/build.gradle b/app-mini/build.gradle
index 8b961574..89227cee 100644
--- a/app-mini/build.gradle
+++ b/app-mini/build.gradle
@@ -35,12 +35,11 @@ android {
 project(path: ':intentintegrator'),
 project(':orbotservice'),
 libs.android_material,
+libs.androidx_constraint,
 libs.androidx_coordinator,
-libs.androidx_localbroadcast,
 libs.androidx_palette,
 libs.androidx_recyclerview,
-libs.apl_appintro,
-libs.guardian_jtorctl
+libs.apl_appintro
 )
 androidTestImplementation libs.fastlane_screengrab
 }
diff --git a/app-tv/build.gradle b/app-tv/build.gradle
index f4978231..e5f33882 100644
--- a/app-tv/build.gradle
+++ b/app-tv/build.gradle
@@ -42,16 +42,15 @@ dependencies {
 project(':orbotservice'),
 libs.android_material,
 libs.android_snowfall,
+libs.androidx_constraint,
 libs.androidx_coordinator,
 libs.androidx_leanback_core,
 libs.androidx_leanback_paging,
 libs.androidx_leanback_preferences,
 libs.androidx_leanback_tab,
-libs.androidx_localbroadcast,
 libs.androidx_palette,
 libs.androidx_recyclerview,
-libs.apl_appintro,
-libs.guardian_jtorctl
+libs.apl_appintro
 )
 androidTestImplementation libs.fastlane_screengrab
 }
diff --git a/app/build.gradle b/app/build.gradle
index 93304560..0f5a8b21 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -58,18 +58,15 @@ android {
 project(':appcore'),
 project(':intentintegrator'),
 project(':orbotservice'),
-libs.apl_appintro,
+libs.android_material,
 libs.android_snowfall,
 libs.android_volley,
-libs.androidx_core,
 libs.androidx_localbroadcast,
-libs.androidx_palette,
-libs.android_material,
+libs.apl_appintro,
 libs.bclogic_pulsator,
-libs.guardian_jtorctl,
 libs.ipt_proxy
 
 )
 androidTestImplementation libs.fastlane_screengrab
 }
-}
\ No newline at end of file
+}
diff --git a/dependencies.gradle b/dependencies.gradle
index 74e5364d..555c4977 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -5,12 +5,12 @@ ext {
 android_snowfall : "1.2.1",
 android_volley   : "1.2.0",
 androidx_appcompat   : "1.3.1",
-androidx_constraint : "2.1.0",
-androidx_coordinator: "1.1.0",
+androidx_constraint  : "2.1.0",
+androidx_coordinator : "1.1.0",
 androidx_core: "1.6.0",
 androidx_leanback: "1.2.0-alpha01",
-androidx_leanback_paging   : "1.1.0-alpha08",
-androidx_leanback_tab  : "1.1.0-beta01",
+androidx_leanback_paging : "1.1.0-alpha08",
+androidx_leanback_tab: "1.1.0-beta01",
 androidx_localbroadcast  : "1.0.0",
 androidx_palette : "1.0.0",
 androidx_recyclerview: "1.2.1",
@@ -26,29 +26,29 @@ ext {
 ]
 
 libs = [
-android_material   :  
"com.google.android.material:material:$versions.android_material",
-android_shell  : 
"com.jaredrummler:android-shell:$versions.android_shell" ,
-android_snowfall   :  
"com.github.jetradarmobile:android-snowfall:$versions.android_snowfall" ,
-android_volley : 
"com.android.volley:volley:$versions.android_volley" ,
-androidx_appcompat :  
"androidx.appcompat:appcompat:$versions.androidx_appcompat" ,
-androidx_constraint   :  
"androidx.constraintlayout:constraintlayout:$versions.androidx_constraint" ,
-androidx_coordinator  :  
"androidx.coordinatorlayout:coordinatorlayout:$versions.androidx_coordinator" ,
- 

[tor-commits] [orbot/master] cleanup of VPN DNS startup

[n8fr8]

commit 718fca6b8d46c696d2c89d1bd1935072d6a5da54
Author: n8fr8 
Date:   Thu Jun 17 17:15:29 2021 -0400

cleanup of VPN DNS startup
---
 .../torproject/android/service/vpn/OrbotVpnManager.java  | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
 
b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
index 66538b04..7e991ace 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java
@@ -45,9 +45,11 @@ import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileReader;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintStream;
+import java.io.PrintWriter;
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.concurrent.TimeoutException;
@@ -55,6 +57,8 @@ import java.util.concurrent.TimeoutException;
 import static org.torproject.android.service.TorServiceConstants.ACTION_START;
 import static 
org.torproject.android.service.TorServiceConstants.ACTION_START_VPN;
 import static 
org.torproject.android.service.TorServiceConstants.ACTION_STOP_VPN;
+import static 
org.torproject.android.service.TorServiceConstants.TOR_DNS_PORT_DEFAULT;
+import static 
org.torproject.android.service.TorServiceConstants.TOR_TRANSPROXY_PORT_DEFAULT;
 
 public class OrbotVpnManager implements Handler.Callback {
 private static final String TAG = "OrbotVpnService";
@@ -83,7 +87,8 @@ public class OrbotVpnManager implements Handler.Callback {
 }
 
 public static File makePdnsdConf(Context context, File fileDir, String 
torDnsHost, int torDnsPort, String pdnsdHost, int pdnsdPort) throws IOException 
{
-String conf = String.format(context.getString(R.string.pdnsd_conf), 
torDnsHost, torDnsPort, fileDir.getCanonicalPath(), pdnsdHost, pdnsdPort);
+String conf = String.format(context.getString(R.string.pdnsd_conf),
+torDnsHost, torDnsPort, fileDir.getAbsolutePath(), pdnsdHost, 
pdnsdPort);
 
 Log.d(TAG, "pdsnd conf:" + conf);
 
@@ -93,9 +98,8 @@ public class OrbotVpnManager implements Handler.Callback {
 fPid.delete();
 }
 
-FileOutputStream fos = new FileOutputStream(fPid, false);
-PrintStream ps = new PrintStream(fos);
-ps.print(conf);
+PrintWriter ps = new PrintWriter(new FileWriter(fPid, false));
+ps.write(conf);
 ps.close();
 
 File cache = new File(fileDir, "pdnsd.cache");
@@ -140,8 +144,8 @@ public class OrbotVpnManager implements Handler.Callback {
 } else if 
(action.equals(TorServiceConstants.LOCAL_ACTION_PORTS)) {
 Log.d(TAG, "setting VPN ports");
 
-int torSocks = 
intent.getIntExtra(OrbotService.EXTRA_SOCKS_PROXY_PORT, -1);
-int torDns = 
intent.getIntExtra(OrbotService.EXTRA_DNS_PORT, -1);
+int torSocks = 
intent.getIntExtra(OrbotService.EXTRA_SOCKS_PROXY_PORT, 
TOR_TRANSPROXY_PORT_DEFAULT);
+int torDns = 
intent.getIntExtra(OrbotService.EXTRA_DNS_PORT, TOR_DNS_PORT_DEFAULT);
 
 //if running, we need to restart
 if ((torSocks != mTorSocks || torDns != mTorDns)) {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] cleanup and binary loading fixes

[n8fr8]

commit d4befad117f3485f0aa67b2ce44d3f1b13de2720
Author: n8fr8 
Date:   Wed Jan 2 14:18:39 2019 -0500

cleanup and binary loading fixes
---
 .../src/main/java/org/torproject/android/service/TorService.java | 9 +
 .../torproject/android/service/util/OtherResourceInstaller.java  | 4 
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/TorService.java 
b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
index 64845b77..2ce7b706 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -25,9 +25,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
-import android.content.res.Configuration;
 import android.database.Cursor;
-import android.graphics.Color;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
@@ -40,8 +38,6 @@ import android.support.v4.app.NotificationCompat;
 import android.support.v4.content.LocalBroadcastManager;
 import android.text.TextUtils;
 import android.util.Log;
-import android.widget.RemoteViews;
-import android.widget.Toast;
 
 import com.jrummyapps.android.shell.CommandResult;
 import com.jrummyapps.android.shell.Shell;
@@ -49,9 +45,8 @@ import com.jrummyapps.android.shell.Shell;
 import org.torproject.android.binary.TorResourceInstaller;
 import org.torproject.android.control.ConfigEntry;
 import org.torproject.android.control.TorControlConnection;
-import org.torproject.android.service.util.OtherResourceInstaller;
-import org.torproject.android.service.vpn.TorifiedApp;
 import org.torproject.android.service.util.DummyActivity;
+import org.torproject.android.service.util.OtherResourceInstaller;
 import org.torproject.android.service.util.Prefs;
 import org.torproject.android.service.util.TorServiceUtils;
 import org.torproject.android.service.util.Utils;
@@ -77,9 +72,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Properties;
 import java.util.Random;
-import java.util.Set;
 import java.util.StringTokenizer;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java
 
b/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java
index 7903fb41..309f7e58 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/util/OtherResourceInstaller.java
@@ -70,15 +70,11 @@ public class OtherResourceInstaller implements 
TorServiceConstants {
 if (!installFolder.exists())
 installFolder.mkdirs();
 
-//File libBinary = new 
File(getNativeLibraryDir(context),OBFSCLIENT_ASSET_KEY + ".so");
 outFile = new File(installFolder, OBFSCLIENT_ASSET_KEY);
 NativeLoader.initNativeLibs(context,OBFSCLIENT_ASSET_KEY,outFile);
- //   setExecutable(outFile);
 
-  //  libBinary = new File(getNativeLibraryDir(context),PDNSD_ASSET_KEY + 
".so");
 outFile = new File(installFolder, PDNSD_ASSET_KEY);
 NativeLoader.initNativeLibs(context,PDNSD_ASSET_KEY,outFile);
-   // setExecutable(outFile);
 
 return true;
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] cleanup

[n8fr8]

commit f117dac336f0d6943a5fb87bd55c4113942938c6
Author: lexi 
Date:   Wed Mar 28 15:21:18 2018 -0400

cleanup
---
 .../android/settings/SettingsPreferences.java  | 24 ++
 app/src/main/res/xml/preferences.xml   |  1 -
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git 
a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java 
b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
index d79055b4..fb01cde1 100644
--- a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
+++ b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java
@@ -5,34 +5,26 @@ package org.torproject.android.settings;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
-import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
 
-import org.torproject.android.OrbotApp;
 import org.torproject.android.R;
 import org.torproject.android.service.util.Prefs;
-import org.torproject.android.service.util.TorServiceUtils;
 
-import java.util.Locale;
-
-
-public class SettingsPreferences 
-   extends PreferenceActivity  {
+public class SettingsPreferences
+extends PreferenceActivity {
 private static final String TAG = "SettingsPreferences";
 
-   private ListPreference prefLocale = null;
-   
+private ListPreference prefLocale = null;
+
 protected void onCreate(Bundle savedInstanceState) {
 super.onCreate(savedInstanceState);
 
 addPreferencesFromResource(R.xml.preferences);
 
getPreferenceManager().setSharedPreferencesMode(Context.MODE_MULTI_PROCESS);
-SharedPreferences prefs = 
TorServiceUtils.getSharedPrefs(getApplicationContext());
 
 prefLocale = (ListPreference) findPreference("pref_default_locale");
 Languages languages = Languages.get(this);
@@ -46,21 +38,17 @@ public class SettingsPreferences
 Prefs.setDefaultLocale(language);
 LocaleHelper.setLocale(getApplicationContext(), language);
 Intent intentResult = new Intent();
-intentResult.putExtra("locale",language);
-setResult(RESULT_OK,intentResult);
+intentResult.putExtra("locale", language);
+setResult(RESULT_OK, intentResult);
 finish();
 return false;
 }
 });
-
 }
 
-
 @Override
 protected void attachBaseContext(Context base) {
 super.attachBaseContext(LocaleHelper.onAttach(base));
 }
 
-
-
 }
diff --git a/app/src/main/res/xml/preferences.xml 
b/app/src/main/res/xml/preferences.xml
index 3fd74394..322db8f3 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -118,7 +118,6 @@
 android:title="@string/use_bridges" />
 
 https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] cleanup resources and unused drawables

[n8fr8]

commit dacf2ef9f503ffb672b31c849265c098a1cdfb68
Author: Nathan Freitas 
Date:   Sat Oct 29 11:42:27 2016 -0400

cleanup resources and unused drawables
---
 orbotservice/src/main/res/drawable/button.xml  |  37 -
 orbotservice/src/main/res/drawable/button_off.xml  |  37 -
 orbotservice/src/main/res/drawable/button_on.xml   |  35 ---
 .../src/main/res/drawable/classyfabric.png | Bin 8856 -> 0 bytes
 orbotservice/src/main/res/drawable/error.png   | Bin 2922 -> 0 bytes
 .../src/main/res/drawable/ic_chatsecure.png| Bin 4013 -> 0 bytes
 .../src/main/res/drawable/ic_duckduckgo.png| Bin 5042 -> 0 bytes
 orbotservice/src/main/res/drawable/ic_launcher.png | Bin 6055 -> 0 bytes
 .../src/main/res/drawable/ic_menu_about.png| Bin 1771 -> 0 bytes
 .../src/main/res/drawable/ic_menu_exit.png | Bin 2693 -> 0 bytes
 .../src/main/res/drawable/ic_menu_goto.png | Bin 1636 -> 0 bytes
 orbotservice/src/main/res/drawable/ic_play.png | Bin 3560 -> 0 bytes
 .../src/main/res/drawable/ic_stat_tor_off.png  | Bin 744 -> 0 bytes
 .../src/main/res/drawable/ic_stat_tor_xfer.png | Bin 600 -> 0 bytes
 orbotservice/src/main/res/drawable/ic_twitter.png  | Bin 2797 -> 0 bytes
 orbotservice/src/main/res/drawable/icon_martus.png | Bin 6763 -> 0 bytes
 orbotservice/src/main/res/drawable/icon_orfox.png  | Bin 7617 -> 0 bytes
 .../src/main/res/drawable/icon_story_maker.png | Bin 4290 -> 0 bytes
 orbotservice/src/main/res/drawable/inverse.png | Bin 1027 -> 0 bytes
 orbotservice/src/main/res/drawable/n8fr8.jpg   | Bin 18062 -> 0 bytes
 orbotservice/src/main/res/drawable/oldtoroff.png   | Bin 63700 -> 0 bytes
 orbotservice/src/main/res/drawable/oldtoron.png| Bin 121036 -> 0 bytes
 .../src/main/res/drawable/oldtorstarting.png   | Bin 111753 -> 0 bytes
 orbotservice/src/main/res/drawable/onion32.png | Bin 1599 -> 0 bytes
 orbotservice/src/main/res/drawable/tilebg.xml  |   4 ---
 orbotservice/src/main/res/drawable/toggle.xml  |   8 -
 orbotservice/src/main/res/drawable/tor.png | Bin 4766 -> 0 bytes
 orbotservice/src/main/res/drawable/tor25.png   | Bin 2227 -> 0 bytes
 orbotservice/src/main/res/drawable/toroff.png  | Bin 39556 -> 0 bytes
 orbotservice/src/main/res/drawable/toron.png   | Bin 47022 -> 0 bytes
 orbotservice/src/main/res/drawable/torstarting.png | Bin 41700 -> 0 bytes
 orbotservice/src/main/res/values/styles.xml|   5 +++
 32 files changed, 5 insertions(+), 121 deletions(-)

diff --git a/orbotservice/src/main/res/drawable/button.xml 
b/orbotservice/src/main/res/drawable/button.xml
deleted file mode 100644
index 9f44d24..000
--- a/orbotservice/src/main/res/drawable/button.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-http://schemas.android.com/apk/res/android;>
-  
-
-  
-  
-  
-  
-
-  
-  
-
-  
-  
-  
-  
-
-  
-
\ No newline at end of file
diff --git a/orbotservice/src/main/res/drawable/button_off.xml 
b/orbotservice/src/main/res/drawable/button_off.xml
deleted file mode 100644
index 1304d1b..000
--- a/orbotservice/src/main/res/drawable/button_off.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-
-http://schemas.android.com/apk/res/android;>
-  
-
-  
-  
-  
-  
-
-  
-  
-
-  
-  
-  
-  
-
-  
-
\ No newline at end of file
diff --git a/orbotservice/src/main/res/drawable/button_on.xml 
b/orbotservice/src/main/res/drawable/button_on.xml
deleted file mode 100644
index 27dc092..000
--- a/orbotservice/src/main/res/drawable/button_on.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-http://schemas.android.com/apk/res/android;>
-  
-
-  
-  
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-
-  
-
\ No newline at end of file
diff --git a/orbotservice/src/main/res/drawable/classyfabric.png 
b/orbotservice/src/main/res/drawable/classyfabric.png
deleted file mode 100644
index ca3d267..000
Binary files a/orbotservice/src/main/res/drawable/classyfabric.png and 
/dev/null differ
diff --git a/orbotservice/src/main/res/drawable/error.png 
b/orbotservice/src/main/res/drawable/error.png
deleted file mode 100644
index 42dc6d6..000
Binary files a/orbotservice/src/main/res/drawable/error.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/ic_chatsecure.png 
b/orbotservice/src/main/res/drawable/ic_chatsecure.png
deleted file mode 100644
index aaddd88..000
Binary files a/orbotservice/src/main/res/drawable/ic_chatsecure.png and 
/dev/null differ
diff --git a/orbotservice/src/main/res/drawable/ic_duckduckgo.png 
b/orbotservice/src/main/res/drawable/ic_duckduckgo.png
deleted file mode 100644
index 696dcd6..000
Binary files a/orbotservice/src/main/res/drawable/ic_duckduckgo.png and 
/dev/null differ
diff --git a/orbotservice/src/main/res/drawable/ic_launcher.png 

[tor-commits] [orbot/master] cleanup landscape layout

[n8fr8]

commit 91f4fa0e163fde5a2c63f0136c17b57541b0b04f
Author: Nathan Freitas nat...@freitas.net
Date:   Sat Nov 29 00:43:18 2014 -0500

cleanup landscape layout
---
 res/layout-land/layout_main.xml |   11 +++
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/res/layout-land/layout_main.xml b/res/layout-land/layout_main.xml
index 4b73db3..b90faf1 100644
--- a/res/layout-land/layout_main.xml
+++ b/res/layout-land/layout_main.xml
@@ -1,5 +1,5 @@
 ?xml version=1.0 encoding=utf-8?
-FrameLayout xmlns:android=http://schemas.android.com/apk/res/android;
+RelativeLayout xmlns:android=http://schemas.android.com/apk/res/android;
 android:layout_width=match_parent
 android:layout_height=match_parent
 android:id=@+id/viewMain
@@ -11,9 +11,6 @@
 org.torproject.android.RandomColorCircleView  
android:layout_width=fill_parent
  
android:layout_height=fill_parent/org.torproject.android.RandomColorCircleView
 --
-RelativeLayout
-   android:layout_width=match_parent
-   android:layout_height=match_parent

 
 !-- 
@@ -79,7 +76,7 @@
android:id=@+id/log
android:layout_width=fill_parent
android:layout_height=fill_parent
-   android:layout_marginTop=30dp
+   android:layout_margin=6dp
android:layout_gravity=center_vertical|right
android:layout_toRightOf=@+id/boxStatus

@@ -168,7 +165,5 @@
 
 /
 /RelativeLayout  
-/RelativeLayout  

-/FrameLayout
-
+/RelativeLayout



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] cleanup of notification and process kill code

[n8fr8]

commit ba90f7382811cee31d535e8cd5c9d339fa32c917
Author: Nathan Freitas nat...@freitas.net
Date:   Mon May 5 00:00:50 2014 -0400

cleanup of notification and process kill code
---
 src/org/torproject/android/service/TorService.java |  116 +---
 1 file changed, 51 insertions(+), 65 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java 
b/src/org/torproject/android/service/TorService.java
index a54c3e2..ef8d47e 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -208,7 +208,7 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst

}

-   private void showToolbarNotification (String notifyMsg, int notifyId, 
int icon, int flags, boolean isOngoing)
+   private void showToolbarNotification (String notifyMsg, int notifyId, 
int icon, boolean isOngoing)
{

if (mNotifyBuilder == null)
@@ -239,20 +239,21 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
{
mNotifyBuilder.setTicker(notifyMsg);
mNotifyBuilder.setOngoing(false);
-   mNotifyBuilder.setLights(Color.GREEN, 1000, 1000);
+   mNotifyBuilder.setLights(Color.RED, 1000, 1000);
+   
mNotifyBuilder.setSmallIcon(R.drawable.ic_stat_notifyerr);
}

if (isOngoing)
{
startForeground(notifyId,
-   mNotifyBuilder.getNotification());
+   mNotifyBuilder.build());

}
else
{
mNotificationManager.notify(
notifyId,
-   mNotifyBuilder.getNotification());
+   mNotifyBuilder.build());
}   

}
@@ -328,6 +329,10 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
 {
super.onDestroy();

+   if (currentStatus == STATUS_ON)
+   {
+   this.showToolbarNotification(Tor service stopped 
unexpectedly, ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, false);
+   }
//Log.d(TAG,onDestroy called);

  // Unregister all callbacks.
@@ -382,7 +387,7 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
{
try {
String onionHostname = 
Utils.readString(new FileInputStream(file)).trim();
-   
showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + 
onionHostname, HS_NOTIFY_ID, R.drawable.ic_stat_tor, 
Notification.FLAG_ONGOING_EVENT, true);
+   
showToolbarNotification(getString(R.string.hidden_service_on) + ' ' + 
onionHostname, HS_NOTIFY_ID, R.drawable.ic_stat_tor, true);
Editor pEdit = prefs.edit();

pEdit.putString(pref_hs_hostname,onionHostname);
pEdit.commit();
@@ -391,13 +396,13 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst

} catch (FileNotFoundException e) {
logException(unable to read onion 
hostname file,e);
-   
showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), 
ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1, false);
+   
showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), 
ERROR_NOTIFY_ID, R.drawable.ic_stat_notifyerr, false);
return null;
}
}
else
{
-   
showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), 
HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr, -1, false);
+   
showToolbarNotification(getString(R.string.unable_to_read_hidden_service_name), 
HS_NOTIFY_ID, R.drawable.ic_stat_notifyerr, false);


}
@@ -409,7 +414,6 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst

 private void killTorProcess () throws Exception
 {
-   int procId = -1;

if (conn != null)
{
@@ -428,39 +432,18 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst

[tor-commits] [orbot/master] cleanup imports

[n8fr8]

commit 635e307182ae70219d119e89fc7b4ae36bf78cd6
Author: Nathan Freitas nat...@freitas.net
Date:   Sun Jan 12 22:15:21 2014 -0500

cleanup imports
---
 src/org/torproject/android/settings/SettingsPreferences.java |3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/org/torproject/android/settings/SettingsPreferences.java 
b/src/org/torproject/android/settings/SettingsPreferences.java
index e6adcf9..80a9f60 100644
--- a/src/org/torproject/android/settings/SettingsPreferences.java
+++ b/src/org/torproject/android/settings/SettingsPreferences.java
@@ -6,9 +6,7 @@ package org.torproject.android.settings;
 import java.util.Locale;
 
 import org.torproject.android.R;
-import org.torproject.android.TorConstants;
 import org.torproject.android.service.TorServiceUtils;
-import org.torproject.android.service.TorTransProxy;
 
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -19,7 +17,6 @@ import android.preference.Preference;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceCategory;
 import android.preference.PreferenceManager;
-import android.util.Log;
 import android.widget.Toast;
 
 import com.actionbarsherlock.app.SherlockPreferenceActivity;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] cleanup of imports and unclosed streams

[n8fr8]

commit 7df2acd59c6aabfdabd68bc5320a5749c98695e9
Author: n8fr8 nat...@freitas.net
Date:   Tue Feb 12 14:26:12 2013 +0700

cleanup of imports and unclosed streams
---
 src/org/torproject/android/service/TorBinaryInstaller.java |   12 ++--
 src/org/torproject/android/settings/AppManager.java|6 --
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/org/torproject/android/service/TorBinaryInstaller.java 
b/src/org/torproject/android/service/TorBinaryInstaller.java
index 51ff907..ffaeab3 100644
--- a/src/org/torproject/android/service/TorBinaryInstaller.java
+++ b/src/org/torproject/android/service/TorBinaryInstaller.java
@@ -13,19 +13,14 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.zip.GZIPInputStream;
-import java.util.zip.GZIPOutputStream;
 import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
-import java.util.zip.ZipOutputStream;
 
 import org.torproject.android.R;
 import org.torproject.android.TorConstants;
 
 import android.content.Context;
 import android.util.Log;
-import android.widget.Toast;
 
 public class TorBinaryInstaller implements TorServiceConstants {
 
@@ -125,10 +120,11 @@ public class TorBinaryInstaller implements 
TorServiceConstants {
 
 
OutputStream stmOut = new FileOutputStream(outFile, append);
+   ZipInputStream zis = null;

if (zip)
{
-   ZipInputStream zis = new ZipInputStream(stm);   
+   zis = new ZipInputStream(stm);  
ZipEntry ze = zis.getNextEntry();
stm = zis;

@@ -144,6 +140,10 @@ public class TorBinaryInstaller implements 
TorServiceConstants {
 stmOut.close();
 stm.close();
 
+if (zis != null)
+   zis.close();
+
+
 return true;
 
 }
diff --git a/src/org/torproject/android/settings/AppManager.java 
b/src/org/torproject/android/settings/AppManager.java
index 46b33f1..ae03924 100644
--- a/src/org/torproject/android/settings/AppManager.java
+++ b/src/org/torproject/android/settings/AppManager.java
@@ -6,15 +6,12 @@ package org.torproject.android.settings;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
 
 import org.torproject.android.R;
 import org.torproject.android.TorConstants;
-import org.torproject.android.R.id;
-import org.torproject.android.R.layout;
 
 import android.app.Activity;
 import android.content.Context;
@@ -23,9 +20,6 @@ import android.content.SharedPreferences.Editor;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.PermissionInfo;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.view.LayoutInflater;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] cleanup notifications; fixes for binary checking

[n8fr8]

commit 512f3d6dbd92efa750ac44774d6a2e54205f9b84
Author: Nathan Freitas nat...@freitas.net
Date:   Mon Jan 16 22:56:50 2012 -0500

cleanup notifications; fixes for binary checking
---
 src/org/torproject/android/service/TorService.java |  230 ++--
 1 files changed, 115 insertions(+), 115 deletions(-)

diff --git a/src/org/torproject/android/service/TorService.java 
b/src/org/torproject/android/service/TorService.java
index a61bb30..099024f 100644
--- a/src/org/torproject/android/service/TorService.java
+++ b/src/org/torproject/android/service/TorService.java
@@ -55,6 +55,10 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
private static TorService _torInstance;

private static final int NOTIFY_ID = 1;
+   private static final int TRANSPROXY_NOTIFY_ID = 2;
+   private static final int ERROR_NOTIFY_ID = 3;
+   private static final int HS_NOTIFY_ID = 3;
+   

private static final int MAX_START_TRIES = 3;
 
@@ -66,14 +70,12 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
 private File appBinHome;
 private File appDataHome;
 
-private String torBinaryPath;
-private String privoxyPath;
+private File fileTor;
+private File filePrivoxy;
 
 /** Called when the activity is first created. */
 public void onCreate() {
super.onCreate();
-   
-   logMessage(serviced created);
   
 }
 
@@ -92,7 +94,7 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
 
 private boolean findExistingProc ()
 {
-int procId = TorServiceUtils.findProcessId(torBinaryPath);
+int procId = TorServiceUtils.findProcessId(fileTor.getAbsolutePath());
 
if (procId != -1)
{
@@ -200,7 +202,27 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
public void onRebind(Intent intent) {
super.onRebind(intent);

+   initTorPaths();
+   
+   if (!fileTor.exists())
+   {
+   new Thread ()
+   {
+   
+   public void run ()
+   {
+   try {
+   checkTorBinaries (false);
+   } catch (Exception e) {

+   logNotice(unable to find tor 
binaries:  + e.getMessage());
+   
showToolbarNotification(getString(R.string.error_installing_binares), 
ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1);
+   
+   Log.e(TAG, error checking tor 
binaries, e);
+   }
+   }
+   }.start();
+   }
}
 
 
@@ -212,24 +234,26 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
 
_torInstance = this;

-   Thread thread = new Thread ()
-   {
-   
-   public void run ()
-   {
+   initTorPaths();
+   
+   new Thread ()
+   {
+   
+   public void run ()
+   {
try {
checkTorBinaries (false);
} catch (Exception e) {
-   
+   
logNotice(unable to find tor binaries: 
 + e.getMessage());
-   
showToolbarNotification(getString(R.string.error_installing_binares), 
NOTIFY_ID, R.drawable.tornotificationerr, -1);
-   
+   
showToolbarNotification(getString(R.string.error_installing_binares), 
ERROR_NOTIFY_ID, R.drawable.tornotificationerr, -1);
+   
Log.e(TAG, error checking tor 
binaries, e);
}
-   }
-   };
-   
-   thread.start();
+   }
+   }.start();
+   
+   
 
if (intent.getAction()!=null  
intent.getAction().equals(onboot))
{
@@ -260,7 +284,7 @@ public class TorService extends Service implements 
TorServiceConstants, TorConst
 catch (Exception e)
 {
 currentStatus = STATUS_OFF;
-
this.showToolbarNotification(getString(R.string.status_disabled), NOTIFY_ID, 
R.drawable.tornotificationerr, -1);
+
this.showToolbarNotification(getString(R.string.status_disabled), 
ERROR_NOTIFY_ID,