Commit 606d8ea0 authored by Vincenzo's avatar Vincenzo Committed by GitHub

Merge branch 'develop' into fix_247_change-hostname

parents 5f7280f6 0afa0820
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="chat.rocket.android"> package="chat.rocket.android">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WAKE_LOCK" /> <uses-permission android:name="android.permission.WAKE_LOCK"/>
<permission <permission
android:name="chat.rocket.android.permission.C2D_MESSAGE" android:name="chat.rocket.android.permission.C2D_MESSAGE"
android:protectionLevel="signature" /> android:protectionLevel="signature"/>
<uses-permission android:name="chat.rocket.android.permission.C2D_MESSAGE" />
<uses-permission android:name="chat.rocket.android.permission.C2D_MESSAGE"/>
<application <application
android:name=".RocketChatApplication" android:name=".RocketChatApplication"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<activity <activity
android:name=".activity.MainActivity" android:name=".activity.MainActivity"
android:windowSoftInputMode="adjustResize"> android:configChanges="orientation|screenSize"
android:windowSoftInputMode="adjustResize">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER"/>
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".activity.AddServerActivity" android:name=".activity.AddServerActivity"
android:windowSoftInputMode="adjustResize" /> android:configChanges="orientation|screenSize"
android:windowSoftInputMode="adjustResize"/>
<activity <activity
android:name=".activity.LoginActivity" android:name=".activity.LoginActivity"
android:windowSoftInputMode="adjustResize" android:configChanges="orientation|screenSize"
android:configChanges="orientation|screenSize" /> android:windowSoftInputMode="adjustResize"/>
<service android:name=".service.RocketChatService" /> <service android:name=".service.RocketChatService"/>
<receiver <receiver
android:name="com.google.android.gms.gcm.GcmReceiver" android:name="com.google.android.gms.gcm.GcmReceiver"
android:exported="true" android:exported="true"
android:permission="com.google.android.c2dm.permission.SEND"> android:permission="com.google.android.c2dm.permission.SEND">
<intent-filter> <intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE" /> <action android:name="com.google.android.c2dm.intent.RECEIVE"/>
<category android:name="com.example.gcm" /> <category android:name="com.example.gcm"/>
</intent-filter> </intent-filter>
</receiver> </receiver>
<service <service
android:name=".push.gcm.GCMIntentService" android:name=".push.gcm.GCMIntentService"
android:exported="false"> android:exported="false">
<intent-filter> <intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE" /> <action android:name="com.google.android.c2dm.intent.RECEIVE"/>
</intent-filter> </intent-filter>
</service> </service>
<service <service
android:name=".push.gcm.GcmInstanceIDListenerService" android:name=".push.gcm.GcmInstanceIDListenerService"
android:exported="false"> android:exported="false">
<intent-filter> <intent-filter>
<action android:name="com.google.android.gms.iid.InstanceID" /> <action android:name="com.google.android.gms.iid.InstanceID"/>
</intent-filter> </intent-filter>
</service> </service>
</application> </application>
</manifest>
</manifest> \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment