update to support specific permissions for Service
this is an attempted fix for Samsung S3/Note3 issues
This commit is contained in:
parent
7990644ecd
commit
e78486a41f
|
@ -1,16 +1,20 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="org.torproject.android"
|
||||
android:versionName="13.0.6-BETA-3"
|
||||
android:versionCode="73"
|
||||
android:versionName="13.0.6-BETA-3a"
|
||||
android:versionCode="74"
|
||||
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.ACCESS_NETWORK_STATE" />
|
||||
<uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
|
||||
|
||||
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="19"/>
|
||||
|
||||
<uses-permission android:name="org.torproject.android.MANAGE_TOR"/>
|
||||
|
||||
<application android:name=".OrbotApp" android:icon="@drawable/ic_launcher"
|
||||
android:label="@string/app_name"
|
||||
android:configChanges="locale|orientation|screenSize"
|
||||
|
@ -78,6 +82,7 @@
|
|||
android:name=".service.TorService"
|
||||
android:exported="false"
|
||||
android:process=":remote"
|
||||
android:permission="org.torproject.android.MANAGE_TOR"
|
||||
>
|
||||
<intent-filter>
|
||||
<action android:name="org.torproject.android.service.ITorService" />
|
||||
|
|
|
@ -244,5 +244,8 @@
|
|||
|
||||
<string name="menu_verify_browser">Check Browser</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>
|
||||
|
|
|
@ -1137,7 +1137,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
|
|||
{
|
||||
|
||||
Intent iTorService = new Intent(this, TorService.class);
|
||||
|
||||
|
||||
getApplication().getApplicationContext().startService(iTorService);
|
||||
|
||||
//since its auto create, we prob don't ever need to call startService
|
||||
|
|
Loading…
Reference in New Issue