ionic-team#2738 fix for ios build

dibyendusaha · Apr 9, 2020 · f012078 · f012078
1 parent 8bbdb90
commit f012078
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Capacitor.podspec b/Capacitor.podspec
@@ -9,8 +9,8 @@ Pod::Spec.new do |s|
   s.authors = { 'Ionic Team' => '[email protected]' }
   s.source = { :git => 'https://github.com/ionic-team/capacitor.git', :tag => s.version.to_s }
   s.source_files = 'ios/Capacitor/Capacitor/*.{swift,h,m}', 'ios/Capacitor/Capacitor/Plugins/*.{swift,h,m}', 'ios/Capacitor/Capacitor/Plugins/**/*.{swift,h,m}'
-  s.static_framework = true
   s.dependency 'CapacitorCordova', '2.0.0'
   s.dependency 'FirebaseMessaging'
   s.swift_version = '5.0'
+  s.static_framework = true
 end
diff --git a/ios/Capacitor/Capacitor/Plugins/PushNotifications.swift b/ios/Capacitor/Capacitor/Plugins/PushNotifications.swift
@@ -100,7 +100,7 @@ public class CAPPushNotificationsPlugin : CAPPlugin {
    * Subscribe to a specific Push Notification Topic
    */
   @objc func subscribeToTopic(_ call: CAPPluginCall) {
-    let topic = call.getString("name")
+    let topic = call.getString("name") ?? ""
     Messaging.messaging().subscribe(toTopic: topic) {error in
       guard error == nil else {
         call.error(error!.localizedDescription)
@@ -114,7 +114,7 @@ public class CAPPushNotificationsPlugin : CAPPlugin {
    * Unsubscribe from a specific Push Notification Topic
    */
   @objc func unsubscribeFromTopic(_ call: CAPPluginCall) {
-    let topic = call.getString("name")
+    let topic = call.getString("name") ?? ""
     Messaging.messaging().unsubscribe(fromTopic: topic) {error in
       guard error == nil else {
         call.error(error!.localizedDescription)