dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update to support specific permissions for Service 

this is an attempted fix for Samsung S3/Note3 issues
This commit is contained in:
Nathan Freitas 2014-04-08 01:12:35 -04:00
parent 7990644ecd
commit e78486a41f
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
AndroidManifest.xml
View File

@ -1,16 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.torproject.android" package="org.torproject.android"
android:versionName="13.0.6-BETA-3" android:versionName="13.0.6-BETA-3a"
android:versionCode="73" android:versionCode="74"
android:installLocation="auto" android:installLocation="auto"
> <uses-permission android:name="android.permission.INTERNET" /> >
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="19"/>
<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" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_SUPERUSER"/> <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
<uses-permission android:name="org.torproject.android.MANAGE_TOR"/>
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="19"/>
<application android:name=".OrbotApp" android:icon="@drawable/ic_launcher" <application android:name=".OrbotApp" android:icon="@drawable/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:configChanges="locale|orientation|screenSize" android:configChanges="locale|orientation|screenSize"
@ -78,6 +82,7 @@
android:name=".service.TorService" android:name=".service.TorService"
android:exported="false" android:exported="false"
android:process=":remote" android:process=":remote"
android:permission="org.torproject.android.MANAGE_TOR"
> >
<intent-filter> <intent-filter>
<action android:name="org.torproject.android.service.ITorService" /> <action android:name="org.torproject.android.service.ITorService" />

3
res/values/strings.xml
View File

@ -244,5 +244,8 @@
<string name="menu_verify_browser">Check Browser</string> <string name="menu_verify_browser">Check Browser</string>
<string name="menu_use_chatsecure">Use ChatSecure</string> <string name="menu_use_chatsecure">Use ChatSecure</string>
<string name="permission_manage_tor_label">Manage Tor</string>
<string name="permission_manage_tor_description">Enable this app to control the Tor service</string>
</resources> </resources>

2
src/org/torproject/android/Orbot.java
View File

@ -1137,7 +1137,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
{ {
Intent iTorService = new Intent(this, TorService.class); Intent iTorService = new Intent(this, TorService.class);
getApplication().getApplicationContext().startService(iTorService); getApplication().getApplicationContext().startService(iTorService);
//since its auto create, we prob don't ever need to call startService //since its auto create, we prob don't ever need to call startService