Skip to content

Commit

Permalink
android notif: Remove wix library from the (Android) build.
Browse files Browse the repository at this point in the history
Fixes zulip#2877.

Take the library out of our Android build config; and remove all the
bits of cruft in our manifest that are there to override what it wants
to put there.
  • Loading branch information
gnprice committed Feb 7, 2019
1 parent 0e9e935 commit 01b33ad
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 10 deletions.
1 change: 0 additions & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,6 @@ repositories {

dependencies {
implementation project(':react-native-text-input-reset')
implementation project(':react-native-notifications')
implementation project(':react-native-image-picker')
implementation project(':react-native-orientation')
implementation project(':react-native-sentry')
Expand Down
8 changes: 1 addition & 7 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
<uses-permission android:name="${applicationId}.permission.C2D_MESSAGE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.VIBRATE"
tools:node="replace"/>
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"
tools:remove="${excludeSystemAlertWindowPermission}"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"
Expand Down Expand Up @@ -59,13 +58,11 @@
<activity android:name=".debug.MainActivity" android:exported="true"/>

<service android:name=".notifications.NotificationIntentService" />
<service android:name="com.wix.reactnativenotifications.core.ProxyService" tools:node="remove" />

<receiver
android:name="com.google.android.gms.gcm.GcmReceiver"
android:exported="true"
android:permission="com.google.android.c2dm.permission.SEND"
tools:node="replace"
>
<intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
Expand All @@ -79,7 +76,6 @@
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
</intent-filter>
</service>
<service android:name="com.wix.reactnativenotifications.gcm.GcmMessageHandlerService" tools:node="remove" />

<service
android:name=".notifications.InstanceIDListenerService"
Expand All @@ -88,12 +84,10 @@
<action android:name="com.google.android.gms.iid.InstanceID" />
</intent-filter>
</service>
<service android:name="com.wix.reactnativenotifications.gcm.GcmInstanceIdListenerService" tools:node="remove" />
<service
android:name=".notifications.RegistrationIntentService"
android:exported="false">
</service>
<service android:name="com.wix.reactnativenotifications.gcm.GcmInstanceIdRefreshHandlerService" tools:node="remove" />

<activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
</application>
Expand Down
2 changes: 0 additions & 2 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
rootProject.name = 'ZulipMobile'
include ':react-native-text-input-reset'
project(':react-native-text-input-reset').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-text-input-reset/android')
include ':react-native-notifications'
project(':react-native-notifications').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-notifications/android')
include ':react-native-image-picker'
project(':react-native-image-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-picker/android')
include ':react-native-orientation'
Expand Down

0 comments on commit 01b33ad

Please sign in to comment.