Skip to content

Commit e5f00f8

Browse files
JulesssssJulesssss
authored
Merge pull request Expensify#19613 from Expensify/jules-notificationPayload
Improve Android notification threading, categorisation, and profile images
2 parents 5f5dd02 + 87f71e7 commit e5f00f8

File tree

3 files changed

+121
-94
lines changed

3 files changed

+121
-94
lines changed

‎android/app/src/main/AndroidManifest.xml

Lines changed: 76 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,92 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:tools="http://schemas.android.com/tools"
3-
package="com.expensify.chat">
2+
xmlns:tools="http://schemas.android.com/tools"
3+
package="com.expensify.chat">
44

55
<uses-permission android:name="android.permission.INTERNET" />
6-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
6+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
77
<uses-permission android:name="android.permission.CAMERA" />
8-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
9-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
8+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
9+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
1010

1111
<!-- android:hardwareAccelerated is essential for Android performance: https://developer.android.com/topic/performance/hardware-accel -->
1212
<application
13-
android:supportsRtl="false"
14-
android:hardwareAccelerated="true"
15-
android:name=".MainApplication"
16-
android:label="@string/app_name"
17-
android:icon="@mipmap/ic_launcher"
18-
android:roundIcon="@mipmap/ic_launcher_round"
19-
android:allowBackup="false"
20-
android:resizeableActivity="false"
21-
android:theme="@style/AppTheme"
22-
tools:replace="android:supportsRtl">
23-
24-
<activity
25-
android:name=".MainActivity"
13+
android:name=".MainApplication"
14+
android:allowBackup="false"
15+
android:hardwareAccelerated="true"
16+
android:icon="@mipmap/ic_launcher"
2617
android:label="@string/app_name"
27-
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
28-
android:launchMode="singleTask"
29-
android:exported="true"
30-
android:windowSoftInputMode="adjustResize"
31-
android:theme="@style/BootTheme">
18+
android:resizeableActivity="false"
19+
android:roundIcon="@mipmap/ic_launcher_round"
20+
android:supportsRtl="false"
21+
android:theme="@style/AppTheme"
22+
tools:replace="android:supportsRtl">
23+
24+
<activity
25+
android:name=".MainActivity"
26+
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
27+
android:exported="true"
28+
android:label="@string/app_name"
29+
android:launchMode="singleTask"
30+
android:theme="@style/BootTheme"
31+
android:windowSoftInputMode="adjustResize">
32+
33+
<intent-filter android:autoVerify="true">
34+
<action android:name="android.intent.action.MAIN" />
35+
<category android:name="android.intent.category.LAUNCHER" />
36+
</intent-filter>
37+
38+
<!-- Custom URI handlers. Used to intercept Urban Airship deep links. -->
39+
<intent-filter android:autoVerify="true">
40+
<action android:name="android.intent.action.VIEW" />
41+
42+
<category android:name="android.intent.category.DEFAULT" />
43+
<category android:name="android.intent.category.BROWSABLE" />
44+
45+
<data android:scheme="new-expensify" />
46+
</intent-filter>
47+
48+
<!-- Web URL handlers. Used to intercept web links. -->
49+
<intent-filter android:autoVerify="true">
50+
<action android:name="android.intent.action.VIEW" />
51+
52+
<category android:name="android.intent.category.DEFAULT" />
53+
<category android:name="android.intent.category.BROWSABLE" />
3254

33-
<intent-filter android:autoVerify="true">
34-
<action android:name="android.intent.action.MAIN" />
35-
<category android:name="android.intent.category.LAUNCHER" />
36-
</intent-filter>
55+
<!-- Production URLs -->
56+
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/r"/>
57+
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/settings"/>
58+
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/details"/>
59+
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/v"/>
60+
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/bank-account"/>
61+
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/iou"/>
62+
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/enable-payments"/>
63+
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/statements"/>
64+
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/concierge"/>
3765

38-
<!-- Custom URI handlers. Used to intercept Urban Airship deep links. -->
39-
<intent-filter android:autoVerify="true">
40-
<action android:name="android.intent.action.VIEW"/>
41-
<category android:name="android.intent.category.DEFAULT"/>
42-
<category android:name="android.intent.category.BROWSABLE"/>
43-
<data android:scheme="new-expensify"/>
44-
</intent-filter>
66+
<!-- Staging URLs -->
67+
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/r"/>
68+
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/settings"/>
69+
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/details"/>
70+
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/v"/>
71+
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/bank-account"/>
72+
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/iou"/>
73+
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/enable-payments"/>
74+
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/statements"/>
75+
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/concierge"/>
76+
</intent-filter>
77+
</activity>
4578

46-
<!-- Web URL handlers. Used to intercept web links. -->
47-
<intent-filter android:autoVerify="true">
48-
<action android:name="android.intent.action.VIEW"/>
49-
<category android:name="android.intent.category.DEFAULT"/>
50-
<category android:name="android.intent.category.BROWSABLE"/>
79+
<meta-data
80+
android:name="com.urbanairship.reactnative.AIRSHIP_EXTENDER"
81+
android:value="com.expensify.chat.customairshipextender.CustomAirshipExtender" />
5182

52-
<!-- Production URLs -->
53-
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/r"/>
54-
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/settings"/>
55-
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/details"/>
56-
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/v"/>
57-
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/bank-account"/>
58-
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/iou"/>
59-
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/enable-payments"/>
60-
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/statements"/>
61-
<data android:scheme="https" android:host="new.expensify.com" android:pathPrefix="/concierge"/>
83+
<meta-data
84+
android:name="com.google.firebase.messaging.default_notification_icon"
85+
android:resource="@drawable/ic_launcher" />
6286

63-
<!-- Staging URLs -->
64-
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/r"/>
65-
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/settings"/>
66-
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/details"/>
67-
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/v"/>
68-
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/bank-account"/>
69-
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/iou"/>
70-
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/enable-payments"/>
71-
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/statements"/>
72-
<data android:scheme="https" android:host="staging.new.expensify.com" android:pathPrefix="/concierge"/>
73-
</intent-filter>
74-
</activity>
87+
<meta-data
88+
android:name="com.google.firebase.messaging.default_notification_color"
89+
android:resource="@color/bootsplash_background" />
7590

76-
<meta-data android:name="com.urbanairship.reactnative.AIRSHIP_EXTENDER"
77-
android:value="com.expensify.chat.customairshipextender.CustomAirshipExtender" />
7891
</application>
7992
</manifest>

0 commit comments

Comments
 (0)