diff options
| author | Christian S <christian@pix-art.de> | 2016-05-05 23:43:19 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-05-05 23:43:19 +0200 |
| commit | dc0036d9264bf1d71faa10ae8112066c8d389dc7 (patch) | |
| tree | 7afa5f691c69314f0f9d6d19af262c4fcc96b04d /src/main/AndroidManifest.xml | |
| parent | 8f0f7e94a9626ef51f149f83f04dcb030f1b3234 (diff) | |
add share location
Diffstat (limited to '')
| -rw-r--r-- | src/main/AndroidManifest.xml | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 9b85f1a4d..38789976c 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -15,6 +15,9 @@ <uses-permission android:name="android.permission.NFC"/> <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/> <uses-permission android:name="android.permission.RECORD_AUDIO"/> + <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" /> + <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> + <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.READ_PHONE_STATE" @@ -25,6 +28,7 @@ android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:theme="@style/ConversationsTheme" + android:name="android.support.multidex.MultiDexApplication"> tools:replace="android:label"> <service android:name=".services.XmppConnectionService"/> @@ -172,6 +176,30 @@ <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </activity> + <meta-data + android:name="com.google.android.gms.version" + android:value="@integer/google_play_services_version" /> + <meta-data + android:name="com.google.android.maps.v2.API_KEY" + android:value="@string/google_maps_api_key" /> + + <activity + android:name=".ShareLocationActivity" + android:label="@string/share_location" > + <intent-filter> + <action android:name="eu.siacs.conversations.location.request" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> + + <activity + android:name=".ShowLocationActivity" + android:label="@string/show_location" > + <intent-filter> + <action android:name="eu.siacs.conversations.location.show" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + </activity> <activity android:name=".ui.TrustKeysActivity" android:label="@string/trust_omemo_fingerprints" |