diff options
| author | Vincent <valodim@mugenguild.com> | 2016-03-24 14:26:03 +0100 |
|---|---|---|
| committer | Vincent <valodim@mugenguild.com> | 2016-03-24 14:26:03 +0100 |
| commit | f005bbad96e257c2e9a68a274504bcfbea2a178d (patch) | |
| tree | 92a20588ecfbf27435d7eafd1f1fff558e6130b6 /OpenKeychain/src/main/AndroidManifest.xml | |
| parent | c4de57d4f6f58c946409d2982a5bbb5627d09244 (diff) | |
| parent | cab3fa7874f90f9aa8f5d3b9244e78ac4dd96638 (diff) | |
| download | open-keychain-f005bbad96e257c2e9a68a274504bcfbea2a178d.tar.gz open-keychain-f005bbad96e257c2e9a68a274504bcfbea2a178d.tar.bz2 open-keychain-f005bbad96e257c2e9a68a274504bcfbea2a178d.zip | |
Merge pull request #1785 from advaita13/wifi-only-fix
Sync only when unmetered internet is available #1670
Diffstat (limited to 'OpenKeychain/src/main/AndroidManifest.xml')
| -rw-r--r-- | OpenKeychain/src/main/AndroidManifest.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index 50ab9aaae..74bf936b4 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -76,6 +76,7 @@ <!-- other group (for free) --> <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.NFC" /> <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" /> <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" /> @@ -89,6 +90,15 @@ android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:theme="@style/Theme.Keychain.Light"> + <!-- broadcast receiver for Wi-Fi Connection --> + <receiver + android:name=".receiver.NetworkReceiver" + android:enabled="false" + android:exported="true" > + <intent-filter> + <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/> + </intent-filter> + </receiver> <!-- singleTop for NFC dispatch, see SecurityTokenOperationActivity --> <activity android:name=".ui.MainActivity" |