Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Leave call adjustement #65

Open
wants to merge 123 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
123 commits
Select commit Hold shift + click to select a range
319827f
Realized basic refactoring for vnc talk variant of firebase plugin - …
yuriy-kaplunov Jan 14, 2019
a0f439d
Refactored actions, removed unnecessary code, added utils for logs an…
yuriy-kaplunov Jan 23, 2019
bb98d84
Removed unnecessary class
yuriy-kaplunov Jan 25, 2019
efc49cc
Removed unnecessary code from httppost and child classes, refactored …
yuriy-kaplunov Jan 25, 2019
a60d8e5
Remove unnecessary param in reply action classes
yuriy-kaplunov Jan 25, 2019
df70503
Added solution for preventing push notifications to display twice wit…
yuriy-kaplunov Mar 1, 2019
88af444
Refactored string utils
yuriy-kaplunov Mar 1, 2019
e988183
Fixed problem with messag dissapearing. Executing `displayNotificatio…
yuriy-kaplunov Mar 1, 2019
2586208
Fixed context params
yuriy-kaplunov Mar 1, 2019
b212e45
Corrected plugin.xml for refactored files
yuriy-kaplunov Mar 15, 2019
eab8ba6
Added folders to target of java files in plugin.xml
yuriy-kaplunov Mar 20, 2019
c65d5ad
downgraded firebase-common to 16.0.4 because of java8 support
soulfly Mar 27, 2019
ba49add
more logs
Mar 27, 2019
27aef5b
proper parsing of task pushes;
Mar 28, 2019
498cdaf
added 'Task updated' push title
Mar 29, 2019
0f37877
proper parse of task id fix
Mar 29, 2019
01aa755
reafactored; added Snooze action
Mar 29, 2019
eee342f
Snooze fixes
Mar 29, 2019
70ca5af
added task updated on
Apr 3, 2019
3d89128
introduced PayloadProcessor
Apr 10, 2019
37d1edc
updated to mention parser
Apr 15, 2019
92315b6
fixed a crash with PayloadProcessor
Apr 15, 2019
33bafc5
some renamings
Apr 15, 2019
27c8a84
logs
May 7, 2019
69d6803
fixed compile issue
May 7, 2019
aa2edee
Update build.gradle
soulfly May 13, 2019
3990386
VNCtask sound settings (#14)
ccvlad May 22, 2019
149cd6b
downgraded firebase and play-services depdendencies to prio androidx
Jun 18, 2019
4289381
mergewd
Jun 18, 2019
a9e67dc
The action 'Snooze for 1h' was fixed (#15)
ccvlad Jul 5, 2019
c6923f8
Add notification received callback for task.
Sep 11, 2019
626791e
Fix: vnctask fcm notification ignore in case of clear app storage
Sep 12, 2019
65d61f5
Add Open_in_browser parameters for task.
Sep 19, 2019
6488d05
Mail basic structure; delete/mark-as-read actions added
soulfly Sep 20, 2019
73485f7
fixed plugin.xml
soulfly Sep 21, 2019
7980561
add local notification support
macanhhuy Oct 3, 2019
a744c0a
update mail notification
macanhhuy Oct 4, 2019
8ac0c73
fix display mail
macanhhuy Oct 5, 2019
d9b30ef
replaced mail delete with trash op
soulfly Oct 6, 2019
c807509
to not show mail diplicated messages
soulfly Oct 6, 2019
164eb18
fix function
macanhhuy Oct 8, 2019
980dd4b
Added language parameter
Oct 9, 2019
2cf62d9
fix: compatible with cordova-android 8
stefansaenger Oct 14, 2019
98f98b7
changed notification title for task delete and assignment remove
Oct 15, 2019
88c548b
Inline reply action for mail (#20)
soulfly Oct 22, 2019
f47437d
mail: mark as read when inline reply
soulfly Oct 24, 2019
dcee982
add Chrashlitis build phase script to only one target
soulfly Oct 30, 2019
53dd5fe
added api to clear mails (#21)
soulfly Oct 30, 2019
53ece0c
add widget notification after some actions with messages
TatankaConCube Oct 30, 2019
4228eed
removed validation
soulfly Oct 30, 2019
69ae413
Merge branch 'feature/update_widget' into vnc-mail-refactored-plugin
soulfly Nov 3, 2019
c22c0d8
add widget notification after some actions with messages (#22)
TatankaConCube Nov 3, 2019
54debb0
Merge branch 'vnc-mail-refactored-plugin' of github.com:vnc-biz/cordo…
soulfly Nov 3, 2019
d7dbeec
add notify widget after success Reply action (#23)
TatankaConCube Nov 11, 2019
73fb91a
add grouping of mail notifications
TatankaConCube Nov 14, 2019
22db9cf
Update plugin.xml
TatankaConCube Nov 14, 2019
8e645d8
enable log
macanhhuy Nov 15, 2019
ea44d31
- improve notifications displaying;
ValVNC Nov 15, 2019
b1553e1
return on error
macanhhuy Nov 15, 2019
474ed67
send log to sentry
macanhhuy Nov 17, 2019
fd05b72
update plugin
macanhhuy Nov 18, 2019
ce3d68e
fix sentry log
macanhhuy Nov 18, 2019
c21b916
revert change
macanhhuy Nov 18, 2019
1a74576
- fixet hide root notification if make any action for last notification;
ValVNC Nov 18, 2019
8bd5521
add sentry log again
macanhhuy Nov 18, 2019
667f691
Revert "add Chrashlitis build phase script to only one target"
macanhhuy Nov 19, 2019
a9de9e0
Merge remote-tracking branch 'origin/vnc-task-refactored-plugin' into…
ValVNC Nov 19, 2019
3de02eb
Merge remote-tracking branch 'origin/vnc-mail-refactored-plugin' into…
ValVNC Nov 19, 2019
3d0db74
Merge remote-tracking branch 'origin/feature/group-mail-notifications…
ValVNC Nov 19, 2019
37b1bb0
fixes after merge
ValVNC Nov 19, 2019
de8a2de
up notifications security level to PRIVATE
ValVNC Nov 20, 2019
9aaf634
feature/vnctalk call notifications (#28)
ValVNC Dec 6, 2019
5d332e5
Update plugin.xml
ValVNC Dec 6, 2019
fd071a8
remove all colours
ValVNC Dec 6, 2019
8873206
disabled sentry
soulfly Dec 6, 2019
85b5d03
add lockscreen visibility toggle-method (#30)
ValVNC Dec 10, 2019
87390cb
[iOS] implementation of call actions (#29)
soulfly Dec 11, 2019
131b156
Android support libraries fixes (#31)
TatankaConCube Dec 26, 2019
5ec2d53
Fix call initiator (#32)
ValVNC Jan 15, 2020
1ae0513
Update BaseActionTask.java (#33)
ValVNC Jan 16, 2020
8b20ded
Fix few tasks after accept call (#34)
ValVNC Jan 16, 2020
a3e0755
- fixed saving error;
ValVNC Feb 6, 2020
3055086
iOS Rejet action: do not pass an event to JS
IgorVNC Mar 9, 2020
364f5a5
iOS to store processed calls; Make HTTP calls in BG task (#38)
IgorVNC Mar 12, 2020
8ab1c50
iOS call accept action: use markCallRequestAsProccessed
IgorVNC Mar 20, 2020
b8f2670
iOS uiwebview cleanup (#41)
IgorVNC Mar 23, 2020
2ed8980
Feature/call multi devices (#42)
IgorVNC Mar 29, 2020
8a04c1a
Add API to logging of reseiving FCM notifications; (#36)
ValVNC Mar 30, 2020
b74c58c
fix: upgrade Firebase libraries (#44)
stefansaenger Apr 11, 2020
e22a6d8
FirebasePlugin.clearTalkNotificationsExceptTargets (#45)
IgorVNC Apr 17, 2020
c05a1d7
fixed ConcurrentModificationException
IgorVNC Apr 22, 2020
4db4b47
safe initialization of previousNotifications SET
IgorVNC Apr 22, 2020
a6095f5
fixed compilation issues
IgorVNC Apr 24, 2020
be0f157
API to display missed call notification (#46)
TatankaConCube May 5, 2020
903efb6
fix: add due today title for task notification.
May 29, 2020
d940179
fix: add due today title for task notification. (#47)
vijaygodhasara May 29, 2020
157316d
Feature add own call background for diff apps (#48)
TatankaConCube Jun 12, 2020
d613737
fix: add task watcher title for notification
Jul 15, 2020
5c87560
Merge branch 'master-universal' into master-universal-task-fix
vijaygodhasara Jul 15, 2020
8224a54
Merge pull request #49 from vnc-biz/master-universal-task-fix
vijaygodhasara Jul 15, 2020
e5277ca
Add new params jitsiRoom and jitsiURL to 'Accept call' event; (#50)
TatankaConCube Jul 24, 2020
9c63d67
Add calendar notifications (#51)
TatankaConCube Aug 5, 2020
a9e07b0
Calendar improvements (#52)
ValVNC Aug 14, 2020
1d52916
Feature 'Use appointmentId as identificator for calendar' (#53)
ValVNC Aug 20, 2020
daf5060
-upgrade all goggle/firebase dependencies to latest versions;
ValVNC Oct 1, 2020
c36d305
add google repo;
ValVNC Oct 1, 2020
2516e79
remove fabric from plugin;
ValVNC Oct 1, 2020
531b628
fixed connecting of 'google-services' plugin;
ValVNC Oct 1, 2020
8a27333
Merge pull request #54 from vnc-biz/fix_build
TatankaConCube Oct 1, 2020
dcd208e
- add toast if try perform action without internet for Mail app;
ValVNC Oct 6, 2020
5307f40
- added update notification after reply without internet (to hide pro…
ValVNC Oct 6, 2020
4a209c8
Merge pull request #55 from vnc-biz/feature/mail_offline
macanhhuy Oct 7, 2020
f1883d2
removed iOS Firebase Analiticxs (#56)
IgorVNC Nov 13, 2020
5c80606
removved nanopb
Nov 18, 2020
6500b2a
removed-ios-performance-framework (#57)
IgorVNC Nov 18, 2020
18e79f8
feat: add update widget after receiving new fcm or after update appoi…
ValVNC Nov 27, 2020
f6a9c4e
Merge pull request #58 from vnc-biz/feature/update_calendar_widget
TatankaConCube Dec 4, 2020
15d9946
Add changing ringtone depending on app settings (#61)
TatankaConCube Dec 15, 2020
a5804c3
Feature change ringtone (#62)
ValVNC Dec 21, 2020
d518805
Implement feature hightlite mentions (#59)
TatankaConCube Dec 23, 2020
05d247f
Feature mute ringtone (#63)
TatankaConCube Jan 20, 2021
564bb39
fix: parsing of unset fields; (#64)
ValVNC Jan 26, 2021
ec72b74
logs
Mar 5, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
package-lock.json
node_modules
cordova-plugin-firebase.code-workspace
/src/android/.gradle
/src/android/.settings
.project
116 changes: 89 additions & 27 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ xmlns:android="http://schemas.android.com/apk/res/android">
</feature>
</config-file>
<config-file target="AndroidManifest.xml" parent="/*">
<permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" android:protectionLevel="signature"/>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
</config-file>
<config-file target="AndroidManifest.xml" parent="/manifest/application">
<service android:enabled="true" android:exported="false" android:name="com.google.android.gms.measurement.AppMeasurementService" />
Expand All @@ -33,13 +35,9 @@ xmlns:android="http://schemas.android.com/apk/res/android">
<meta-data android:name="firebase_performance_collection_enabled" android:value="false" />
</config-file>
<config-file target="AndroidManifest.xml" parent="/manifest/application">
<service android:name="org.apache.cordova.firebase.FirebasePluginMessagingService">
<service android:enabled="true" android:exported="true" android:name="org.apache.cordova.firebase.FirebasePluginMessagingService">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT"/>
</intent-filter>
</service>
<service android:name="org.apache.cordova.firebase.FirebasePluginInstanceIDService">
<intent-filter>
<action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
</intent-filter>
</service>
Expand All @@ -48,27 +46,89 @@ xmlns:android="http://schemas.android.com/apk/res/android">
<activity android:name="org.apache.cordova.firebase.ReplyActivity"
android:launchMode="singleInstance"
android:theme="@android:style/Theme.Holo.Light.Dialog"></activity>
<activity android:name="org.apache.cordova.firebase.IncomingCallActivity"
android:excludeFromRecents="true"
android:noHistory="true"
android:screenOrientation="sensorPortrait"
android:taskAffinity="org.apache.cordova.firebase.INCOMING_CALL_AFFINITY"
android:theme="@android:style/Theme.Holo.NoActionBar" />
</config-file>
<resource-file src="src/android/google-services.json" target="."/>
<resource-file src="src/android/cordova-plugin-firebase-strings.xml" target="res/values/cordova-plugin-firebase-strings.xml" />
<source-file src="src/android/FirebasePlugin.java" target-dir="src/org/apache/cordova/firebase" />
<resource-file src="src/android/cordova-plugin-firebase-strings-de.xml" target="res/values-de/cordova-plugin-firebase-strings.xml" />
<resource-file src="src/android/cordova-plugin-firebase-strings-fr.xml" target="res/values-fr/cordova-plugin-firebase-strings.xml" />
<resource-file src="src/android/res/raw/european_phone_connecting.mp3" target="res/raw/european_phone_connecting.mp3" />
<resource-file src="src/android/res/raw/incoming_call.mp3" target="res/raw/incoming_call.mp3" />
<resource-file src="src/android/res/raw/on_hold_ringtone.mp3" target="res/raw/on_hold_ringtone.mp3" />
<resource-file src="src/android/res/raw/retro_movie_ringtone.mp3" target="res/raw/retro_movie_ringtone.mp3" />
<resource-file src="src/android/res/raw/ringtone_loop_3.mp3" target="res/raw/ringtone_loop_3.mp3" />
<resource-file src="src/android/res/raw/technology_ringtone_0.mp3" target="res/raw/technology_ringtone_0.mp3" />
<resource-file src="src/android/res/raw/technology_ringtone_4.mp3" target="res/raw/technology_ringtone_4.mp3" />
<resource-file src="src/android/res/raw/technology_ringtone_5.mp3" target="res/raw/technology_ringtone_5.mp3" />
<resource-file src="src/android/res/drawable/ic_call_end.xml" target="res/drawable/ic_call_end.xml" />
<resource-file src="src/android/res/drawable/ic_call_start.xml" target="res/drawable/ic_call_start.xml" />
<resource-file src="src/android/res/drawable/selector_call_end.xml" target="res/drawable/selector_call_end.xml" />
<resource-file src="src/android/res/drawable/selector_call_start.xml" target="res/drawable/selector_call_start.xml" />
<resource-file src="src/android/res/drawable/shape_oval_green.xml" target="res/drawable/shape_oval_green.xml" />
<resource-file src="src/android/res/drawable/shape_oval_red.xml" target="res/drawable/shape_oval_red.xml" />
<resource-file src="src/android/res/drawable/shape_oval_white_red.xml" target="res/drawable/shape_oval_white_red.xml" />
<resource-file src="src/android/res/drawable/shape_oval_white_green.xml" target="res/drawable/shape_oval_white_green.xml" />
<resource-file src="src/android/res/drawable-nodpi/call_background.png" target="res/drawable-nodpi/call_background.png" />
<resource-file src="src/android/res/drawable-nodpi/call_background_hin.jpg" target="res/drawable-nodpi/call_background_hin.jpg" />
<resource-file src="src/android/res/drawable-nodpi/call_background_ekbo.jpg" target="res/drawable-nodpi/call_background_ekbo.jpg" />
<resource-file src="src/android/res/drawable-nodpi/vnc_icon_circle.png" target="res/drawable-nodpi/vnc_icon_circle.png" />
<resource-file src="src/android/res/drawable-nodpi/hin_icon_round.png" target="res/drawable-nodpi/hin_icon_round.png" />
<source-file src="src/android/reply_activity.xml" target-dir="res/layout" />
<source-file src="src/android/ReplyActivity.java" target-dir="src/org/apache/cordova/firebase" />
<source-file src="src/android/res/layout/activity_incoming_call.xml" target-dir="res/layout" />
<source-file src="src/android/IncomingCallActivity.java" target-dir="src/org/apache/cordova/firebase" />
<source-file src="src/android/OnNotificationOpenReceiver.java" target-dir="src/org/apache/cordova/firebase" />
<source-file src="src/android/FirebasePluginInstanceIDService.java" target-dir="src/org/apache/cordova/firebase" />
<source-file src="src/android/FirebasePluginMessagingService.java" target-dir="src/org/apache/cordova/firebase" />
<source-file src="src/android/NotificationReceiver.java" target-dir="src/org/apache/cordova/firebase" />
<source-file src="src/android/HttpPost.java" target-dir="src/org/apache/cordova/firebase" />
<source-file src="src/android/ReplyActivity.java" target-dir="src/org/apache/cordova/firebase" />
<source-file src="src/android/reply_activity.xml" target-dir="res/layout" />
<source-file src="src/android/FirebasePluginMessagingService.java" target-dir="src/org/apache/cordova/firebase" />
<source-file src="src/android/FirebasePluginMessageReceiverManager.java" target-dir="src/org/apache/cordova/firebase" />
<source-file src="src/android/FirebasePluginMessageReceiver.java" target-dir="src/org/apache/cordova/firebase" />
<source-file src="src/android/colors.xml" target-dir="res/values" />
<source-file src="src/android/FirebasePlugin.java" target-dir="src/org/apache/cordova/firebase" />
<source-file src="src/android/PayloadProcessor.java" target-dir="src/org/apache/cordova/firebase" />

<source-file src="src/android/utils/FileUtils.java" target-dir="src/org/apache/cordova/firebase/utils" />
<source-file src="src/android/utils/Logger.java" target-dir="src/org/apache/cordova/firebase/utils" />
<source-file src="src/android/utils/NotificationUtils.java" target-dir="src/org/apache/cordova/firebase/utils" />
<source-file src="src/android/utils/SharedPrefsUtils.java" target-dir="src/org/apache/cordova/firebase/utils" />
<source-file src="src/android/utils/StringUtils.java" target-dir="src/org/apache/cordova/firebase/utils" />
<source-file src="src/android/utils/WidgetNotifier.java" target-dir="src/org/apache/cordova/firebase/utils" />
<source-file src="src/android/utils/ImagesUtils.java" target-dir="src/org/apache/cordova/firebase/utils" />
<source-file src="src/android/utils/FcmLoggerUtils.java" target-dir="src/org/apache/cordova/firebase/utils" />
<source-file src="src/android/utils/DateUtils.java" target-dir="src/org/apache/cordova/firebase/utils" />

<source-file src="src/android/notification/NotificationCreator.java" target-dir="src/org/apache/cordova/firebase/notification" />
<source-file src="src/android/notification/NotificationManager.java" target-dir="src/org/apache/cordova/firebase/notification" />

<source-file src="src/android/models/PayloadCalendar.java" target-dir="src/org/apache/cordova/firebase/models" />
<source-file src="src/android/models/PayloadTalk.java" target-dir="src/org/apache/cordova/firebase/models" />
<source-file src="src/android/models/PayloadTask.java" target-dir="src/org/apache/cordova/firebase/models" />
<source-file src="src/android/models/PayloadMail.java" target-dir="src/org/apache/cordova/firebase/models" />
<source-file src="src/android/models/MailInfoItem.java" target-dir="src/org/apache/cordova/firebase/models" />

<source-file src="src/android/actions/BaseAction.java" target-dir="src/org/apache/cordova/firebase/actions" />
<source-file src="src/android/actions/BaseActionMail.java" target-dir="src/org/apache/cordova/firebase/actions" />
<source-file src="src/android/actions/BaseActionTalk.java" target-dir="src/org/apache/cordova/firebase/actions" />
<source-file src="src/android/actions/BaseActionTask.java" target-dir="src/org/apache/cordova/firebase/actions" />
<source-file src="src/android/actions/BaseActionCalendar.java" target-dir="src/org/apache/cordova/firebase/actions" />
<source-file src="src/android/actions/InlineReplyAction.java" target-dir="src/org/apache/cordova/firebase/actions" />
<source-file src="src/android/actions/MarkAsReadAction.java" target-dir="src/org/apache/cordova/firebase/actions" />
<source-file src="src/android/actions/SnoozeAction.java" target-dir="src/org/apache/cordova/firebase/actions" />
<source-file src="src/android/actions/MailOptionsAction.java" target-dir="src/org/apache/cordova/firebase/actions" />
<source-file src="src/android/actions/MailReplyAction.java" target-dir="src/org/apache/cordova/firebase/actions" />
<source-file src="src/android/actions/RejectCallAction.java" target-dir="src/org/apache/cordova/firebase/actions" />
<source-file src="src/android/actions/LogFCMPluginAction.java" target-dir="src/org/apache/cordova/firebase/actions" />
<source-file src="src/android/actions/CalendarOptionsAction.java" target-dir="src/org/apache/cordova/firebase/actions" />

<framework src="src/android/build.gradle" custom="true" type="gradleReference" />
<framework src="com.google.android.gms:play-services-tagmanager:+" />
<framework src="com.google.firebase:firebase-core:+" />
<framework src="com.google.firebase:firebase-messaging:+" />
<framework src="com.google.firebase:firebase-config:+" />
<framework src="com.google.firebase:firebase-perf:+" />
<framework src="com.google.android.gms:play-services-tagmanager:17.0.0" />
<framework src="com.google.firebase:firebase-core:17.5.0" />
<framework src="com.google.firebase:firebase-messaging:20.3.0" />
<framework src="com.google.firebase:firebase-config:19.2.0" />
<framework src="com.google.firebase:firebase-perf:19.0.9" />

</platform>

Expand Down Expand Up @@ -104,24 +164,26 @@ xmlns:android="http://schemas.android.com/apk/res/android">
<source-file src="src/ios/AppDelegate+FirebasePlugin.m" />
<header-file src="src/ios/FirebasePlugin.h" />
<source-file src="src/ios/FirebasePlugin.m" />
<header-file src="src/ios/FirebaseActionsManager.h" />
<source-file src="src/ios/FirebaseActionsManager.m" />

<header-file src="src/ios/Firebase/Firebase.h" />

<framework custom="true" src="src/ios/Crashlytics/Crashlytics.framework" />
<framework custom="true" src="src/ios/Crashlytics/Fabric.framework" />
<framework custom="true" src="src/ios/Firebase/Analytics/GoogleAppMeasurement.framework" />
<framework custom="true" src="src/ios/Firebase/Analytics/MeasurementNanoPB.framework" />
<!-- <framework custom="true" src="src/ios/Crashlytics/Crashlytics.framework" /> -->
<!-- <framework custom="true" src="src/ios/Crashlytics/Fabric.framework" /> -->
<!-- <framework custom="true" src="src/ios/Firebase/Analytics/GoogleAppMeasurement.framework" /> -->
<!-- <framework custom="true" src="src/ios/Firebase/Analytics/MeasurementNanoPB.framework" /> -->
<framework custom="true" src="src/ios/Firebase/Analytics/FirebaseCore.framework" />
<framework custom="true" src="src/ios/Firebase/Analytics/FirebaseAnalytics.framework" />
<!-- <framework custom="true" src="src/ios/Firebase/Analytics/FirebaseAnalytics.framework" /> -->
<framework custom="true" src="src/ios/Firebase/Analytics/GoogleUtilities.framework" />
<framework custom="true" src="src/ios/Firebase/Analytics/nanopb.framework" />
<!-- <framework custom="true" src="src/ios/Firebase/Analytics/nanopb.framework" /> -->
<framework custom="true" src="src/ios/Firebase/Analytics/FirebaseInstanceID.framework" />
<framework custom="true" src="src/ios/Firebase/Analytics/FirebaseCoreDiagnostics.framework" />
<!-- <framework custom="true" src="src/ios/Firebase/Analytics/FirebaseCoreDiagnostics.framework" /> -->
<framework custom="true" src="src/ios/Firebase/Auth/GTMSessionFetcher.framework" />
<framework custom="true" src="src/ios/Firebase/Auth/FirebaseAuth.framework" />
<!-- <framework custom="true" src="src/ios/Firebase/Auth/FirebaseAuth.framework" /> -->
<framework custom="true" src="src/ios/Firebase/Messaging/FirebaseMessaging.framework" />
<framework custom="true" src="src/ios/Firebase/Performance/GoogleToolboxForMac.framework" />
<framework custom="true" src="src/ios/Firebase/Performance/FirebasePerformance.framework" />
<!-- <framework custom="true" src="src/ios/Firebase/Performance/GoogleToolboxForMac.framework" /> -->
<!-- <framework custom="true" src="src/ios/Firebase/Performance/FirebasePerformance.framework" /> -->
<framework custom="true" src="src/ios/Firebase/RemoteConfig/Protobuf.framework" />
<framework custom="true" src="src/ios/Firebase/RemoteConfig/FirebaseRemoteConfig.framework" />
<framework custom="true" src="src/ios/Firebase/RemoteConfig/FirebaseABTesting.framework" />
Expand Down
10 changes: 5 additions & 5 deletions scripts/after_plugin_add.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ module.exports = function(context) {
// Modify the Gradle build file to add a task that will upload the debug symbols
// at build time.
if (platforms.indexOf("android") !== -1) {
androidHelper.removeFabricBuildToolsFromGradle();
androidHelper.addFabricBuildToolsGradle();
// androidHelper.removeFabricBuildToolsFromGradle();
// androidHelper.addFabricBuildToolsGradle();
}

// Add a build phase which runs a shell script that executes the Crashlytics
// run command line tool which uploads the debug symbols at build time.
if (platforms.indexOf("ios") !== -1) {
var xcodeProjectPath = utilities.getXcodeProjectPath(context);
iosHelper.removeShellScriptBuildPhase(context, xcodeProjectPath);
iosHelper.addShellScriptBuildPhase(context, xcodeProjectPath);
// var xcodeProjectPath = utilities.getXcodeProjectPath(context);
// iosHelper.removeShellScriptBuildPhase(context, xcodeProjectPath);
// iosHelper.addShellScriptBuildPhase(context, xcodeProjectPath);
}
};
4 changes: 4 additions & 0 deletions scripts/lib/ios-helper.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ module.exports = {
value: id,
comment: comment
});

// need to add only to one target, otherwise will get an error:
// error: Multiple commands produce '<execute-shell-script-6ac45bf72a22b24ae179e3f6769283c32133e27ec7d6eb75101dcc67f278029c>':
break; //
}

// Finally, write the .pbxproj back out to disk.
Expand Down
Loading