commit 356e79a163bee025aecefdf34decaff7a6cc5761 Author: Hans-Christoph Steiner hans@eds.org Date: Mon Jun 8 14:28:13 2015 -0400

remove unused IntentFilter from TorService --- AndroidManifest.xml | 16 ++++++---------- src/org/torproject/android/OrbotConstants.java | 2 -- 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3024979..f95ec15 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -88,16 +88,12 @@ <activity android:name=".settings.SettingsPreferences" android:label="@string/app_name"/> <activity android:name=".settings.AppManager" android:label="@string/app_name"/>

- <service android:enabled="true" - android:name=".service.TorService" - android:permission="org.torproject.android.MANAGE_TOR" - android:stopWithTask="false" - > - <intent-filter> - <action android:name="org.torproject.android.service.ITorService" /> - <action android:name="org.torproject.android.service.TOR_SERVICE" /> - </intent-filter> - </service> + <service + android:name=".service.TorService" + android:enabled="true" + android:permission="org.torproject.android.MANAGE_TOR" + android:stopWithTask="false" > + </service> <receiver android:name="org.torproject.android.service.OnBootReceiver" android:enabled="true" android:exported="true" diff --git a/src/org/torproject/android/OrbotConstants.java b/src/org/torproject/android/OrbotConstants.java index fa67d92..f1521e8 100644 --- a/src/org/torproject/android/OrbotConstants.java +++ b/src/org/torproject/android/OrbotConstants.java @@ -19,8 +19,6 @@ public interface OrbotConstants { public final static String URL_TOR_BRIDGES = "https://bridges.torproject.org/bridges?transport=";

public final static String NEWLINE = "\n"; - - // public final static String INTENT_TOR_SERVICE = "org.torproject.android.service.TOR_SERVICE"; public final static String HANDLER_TOR_MSG = "torServiceMsg";