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.

Sign up for GitHub

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

Fix/macro redefine error #407

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix/macro redefine error #407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e6fbc61
updated SDWebImage version
mohit5189 Oct 16, 2019
44272e6
Merge pull request #1 from mohit5189/PodspecUpdate
mohit5189 Oct 16, 2019
187f808
Update ChatSDK.podspec
mohit5189 Oct 16, 2019
086abec
Call didReceiveRemoteNotification in case when app is in forground
Nov 13, 2019
c713504
fix bto macro redefinition issue
Nov 13, 2019
b419134
Merge branch 'master' into fix/macro-redefine-error
mohit5189 Jan 2, 2020
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
2 changes: 1 addition & 1 deletion ChatSDK.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,4 +142,4 @@ Pod::Spec.new do |s|
#
# end

end
end
3 changes: 1 addition & 2 deletions ChatSDKCore/Classes/Defines/BKeys.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,10 @@
#define bDate @"date"
#define bUserFirebaseID @"user-firebase-id"
#define bFrom @"from"
#define bTo @"to"
//#define bTo @"to"

#define bMute @"mute"
#define bUnmute @"unmute"

// Deprecated in favour of bCreator
#define bCreatorEntityID @"creator-entity-id"
#define bCreator @"creator"
Expand Down
2 changes: 2 additions & 0 deletions ChatSDKCore/Classes/Push/BLocalNotificationDelegate.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ - (void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNot

if (showLocalNotification) {
completionHandler(UNNotificationPresentationOptionBadge | UNNotificationPresentationOptionSound | UNNotificationPresentationOptionAlert);
} else {
[BChatSDK application:[UIApplication sharedApplication] didReceiveRemoteNotification:userInfo];
}
}

Expand Down