Changeset 2685645

Timestamp:

02/27/2022 07:27:39 PM (4 years ago)

Author:

singhalavi

Message:

changes to fix auto push notification

Location:

androapp/trunk

Files:

• androapp.php (modified) (1 diff)
• androapp_functions.php (modified) (3 diffs)
• androapp_tools.php (modified) (6 diffs)
• pw_mobile_settings.php (modified) (2 diffs)
• readme.txt (modified) (3 diffs)

androapp/trunk/androapp.php

@@ -5 +5 @@
             Description: Native mobile app for android platform, create a beautiful mobile app for your wordpress blog with Push Notifications / Deep Linking / Monetization Option / Infinite Scroll / Fast Image Rendering / Inbuilt Whatsapp/facebook and other sharing channels / Customize Design  /Live preview / Test on your phone features. Get Started with your app in minutes at no cost for the first month and $60/year (reduced from $150/year) from next year onwards. We do not touch your existing mobile/desktop themes. 
             Author: Genius Fools
-            Version: 23.02
+            Version: 24.00
             Author URI: http://www.geniusfools.com/
             Text Domain: androapp

androapp/trunk/androapp_functions.php

@@ -34 +34 @@
         add_filter( 'wp_footer',  array($this,'add_css_bottom') );
         add_action( 'wp_json_server_before_serve', array($this,'myplugin_api_init'));
-        add_action( 'send_push_notification_after_publish', array($this,'send_push_notification_after_publish'), 10, 10 );
+        add_action( 'send_push_notification_after_publish', array($this,'send_push_notification_after_publish'), 12, 12 );
         add_filter( 'the_content', array($this,'androapp_after_post_filter')  ); 
         add_filter( 'the_content', array($this,'androapp_before_post_filter')  ); 
@@ -231 +231 @@
     
     function send_push_notification_after_publish($post_id, $post_title, 
-                 $excerpt, $postimage, $link, $cache, $postType,
+                 $excerpt, $postimage, $postlink, $cache, $postType,
                 $google_api_key, $notification_type, $isBulkSend, $firebaseApiVersion,
                 $firebaseServiceAccountFilePath)
@@ -794 +794 @@
         global $post;
         $ogdesc = "";
-        if (class_exists('WPSEO_Meta')){
+        if (class_exists('WPSEO_Meta') && class_exists('WPSEO_Frontend')){
             $ogdesc  = WPSEO_Meta::get_value( 'opengraph-description', $post_id );
 

androapp/trunk/androapp_tools.php

@@ -11 +11 @@
                     
         $postid = intval($_POST['selfpushoptions']);
+                $pushnotificationtext = $_POST['pushnotificationtext'];
+                echo "Push notification text ". $pushnotificationtext;
         $disableBulkSend = $accountOptions[pw_mobile_app_settings::$disableBulkSend];   
                 $disableNotificationCache = $accountOptions[pw_mobile_app_settings::$disableNotificationCache];
@@ -37 +39 @@
                     $excerpt = $wppost['excerpt']['rendered'];
                 }   
-
+                if(!empty($pushnotificationtext)){
+                    $excerpt = $pushnotificationtext;
+                }
                 $postimage = $wppost['featuredimage'];
                 if(empty($postimage)){
@@ -76 +80 @@
                                     $excerpt, $postimage, $postlink, $cache, $postType,
                                     $accountOptions[ANDROAPP_GCM_API_KEY],
-                                    !($disableBulkSend == 1),
+                                    !($disableBulkSend == '1'),
                                     $accountOptions[ANDROAPP_FIREBASE_API_VERSION],
                                     $accountOptions[ANDROAPP_FIREBASE_SERVICE_ACCOUNT_FILE_PATH]
@@ -97 +101 @@
 <b><?php _e('Enter Post Id','androapp');?>: </b><input type="text" name="selfpushoptions" value="" placeholder="Enter Post Id"/>
 (<?php _e('please enter correct post id','androapp');?>)</br></br>
+<!--
+<b><?php _e('Push Notification Text','androapp');?>: </b><br/>
+<textarea id="pushnotificationtext" name="pushnotificationtext" value="" placeholder="Message" rows="3" cols="40"></textarea><br/>
+(<?php _e('please enter the text, this will be used instead of post excerpt','androapp');?>)</br></br>
+-->
 <b><?php _e('Send Immediate','androapp');?>: </b><input type="checkbox" name="immediate" value="1"/> </br>
 <?php _e('By default notification is scheduled to go after 10 minutes, check this box to send push notification immediately, this might take some time depending on number of users and will show logs on this screen, your server might kill this request in middle depending on your server configuration, so we recommend not to select this option in general.',
@@ -115 +124 @@
     echo '<table border="1px;" style="max-width:800px">';
     echo "<tr><th>Post Id</th><th>Title</th><th>Excerpt</th><th>Image Link</th>"
-    . "<th>Post Link</th><th>Cached on Device</th><th>Bulk Send</th> </tr>";
+    . "<th>Post Link</th><th>Cached on Device</th><th>Bulk Send</th> <th>Firebase API Version</th></tr>";
     $pushPostCount = 0;
     foreach($crons as $key => $value){
@@ -128 +137 @@
                     foreach ($v as $kk => $vv){
                         foreach ($vv['args'] as $ka => $va){
-                            if($ka > 5 && $ka < 9){
+                            if($ka == 6 || $ka == 7 || $ka == 8 || $ka == 11){
                                 continue;
                             }

androapp/trunk/pw_mobile_settings.php

@@ -1017 +1017 @@
 
     function schedule_push_notification($id, $title, $excerpt, $postimage, $link, $cache, $postType, $key, $isBulkSent, $firebaseApiVersion, $firebaseServiceAccountFilePath){
+            //this calls send_push_notification_after_publish in androapp_functions.php
             wp_schedule_single_event( time()+ 10*15 , 'send_push_notification_after_publish', 
                     array ($id, $title, $excerpt, $postimage, $link, $cache, $postType, $key , "stack", $isBulkSent, $firebaseApiVersion, $firebaseServiceAccountFilePath)); 
-    }
-    
-    function send_push_notification_after_publish($post_id, $post_title, 
-                $excerpt, $postimage, $postlink, $cache, $postType,
-                $google_api_key, $notification_type, $isBulkSend, $firebaseApiVersion, $firebaseServiceAccountFilePath)
-    {
-        require_once PW_MOBILE_PATH.'gcm/send_message.php';
-        sendPushNotification(array("post_id" => $post_id, "title" => $post_title,
-                     "excerpt" =>$excerpt, "postImage" => $postimage, "link" => $postlink, "cache" => $cache,
-                    "postType" => $postType,
-                    "notification_type" => $notification_type), $google_api_key, $isBulkSend, 
-                    $firebaseApiVersion, $firebaseServiceAccountFilePath);
     }
     
@@ -1237 +1226 @@
                 <p style="color:red"><?php _e('Note: You need to publish new build everytime you change it','androapp');?></p>
                 For Android App:<input type="text" name="<?php echo $this->account_tab_key."[".ANDROAPP_ANALYTICS_TRACKING_ID_KEY."]"?>" value="<?php echo $options[ANDROAPP_ANALYTICS_TRACKING_ID_KEY];?>"  />
-                                </br>
-                                For IOS App:<input type="text" name="<?php echo $this->account_tab_key."[".ANDROAPP_IOS_ANALYTICS_TRACKING_ID_KEY."]"?>" value="<?php echo $options[ANDROAPP_IOS_ANALYTICS_TRACKING_ID_KEY];?>"  />
-                
+                                </br>               
                                 </td>
             </tr>

androapp/trunk/readme.txt

@@ -4 +4 @@
 Tags: Android app, Mobile App, Native Mobile App, app for WordPress, mobile app plugin, native app plugin, push notifications, website to mobile app, WordPress app builder, WordPress app maker, WordPress blog app, androapp, deep linking
 Requires at least: 3.3
-Tested up to: 5.8
-Stable tag: 23.02
+Tested up to: 5.9.1
+Stable tag: 24.00
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -140 +140 @@
 
 == Changelog ==
+= 24.00 =
+1. Auto Push Notification fix, fixed issue in push notification on a new post.
 = 23.02 =
 Minor fix, no need to publish new apk.
@@ -448 +450 @@
 
 == Upgrade Notice ==
+= 24.00 =
+Auto Push Notification fix, fixed issue in push notification on a new post.
 = 23.02 =
 Minor fix, no need to publish new apk.