allow mozilla sunup as push server. it needs to be allowed in the settings

Author: zoff99

android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/HelperRelay.java

@@ -37,16 +37,19 @@
 import static com.zoffcc.applications.trifa.HelperGroup.is_group_we_left;
 import static com.zoffcc.applications.trifa.HelperGroup.tox_group_by_groupid__wrapper;
 import static com.zoffcc.applications.trifa.MainActivity.PREF__allow_push_server_ntfy;
+import static com.zoffcc.applications.trifa.MainActivity.PREF__allow_push_server_sunup;
 import static com.zoffcc.applications.trifa.MainActivity.tox_conference_invite;
 import static com.zoffcc.applications.trifa.MainActivity.tox_friend_send_lossless_packet;
 import static com.zoffcc.applications.trifa.MainActivity.tox_group_invite_friend;
 import static com.zoffcc.applications.trifa.TRIFAGlobals.CONTROL_PROXY_MESSAGE_TYPE.CONTROL_PROXY_MESSAGE_TYPE_FRIEND_PUBKEY_FOR_PROXY;
 import static com.zoffcc.applications.trifa.TRIFAGlobals.CONTROL_PROXY_MESSAGE_TYPE.CONTROL_PROXY_MESSAGE_TYPE_GROUP_ID_FOR_PROXY;
 import static com.zoffcc.applications.trifa.TRIFAGlobals.CONTROL_PROXY_MESSAGE_TYPE.CONTROL_PROXY_MESSAGE_TYPE_NOTIFICATION_TOKEN;
 import static com.zoffcc.applications.trifa.TRIFAGlobals.CONTROL_PROXY_MESSAGE_TYPE.CONTROL_PROXY_MESSAGE_TYPE_PROXY_PUBKEY_FOR_FRIEND;
+import static com.zoffcc.applications.trifa.TRIFAGlobals.MAX_PUSH_URL_LENGTH;
 import static com.zoffcc.applications.trifa.TRIFAGlobals.NOTIFICATION_FCM_PUSH_URL_PREFIX;
 import static com.zoffcc.applications.trifa.TRIFAGlobals.NOTIFICATION_FCM_PUSH_URL_PREFIX_OLD;
 import static com.zoffcc.applications.trifa.TRIFAGlobals.NOTIFICATION_NTFY_PUSH_URL_PREFIX;
+import static com.zoffcc.applications.trifa.TRIFAGlobals.NOTIFICATION_SUNUP_PUSH_URL_PREFIX;
 import static com.zoffcc.applications.trifa.TRIFAGlobals.NOTIFICATION_TOKEN_DB_KEY;
 import static com.zoffcc.applications.trifa.TRIFAGlobals.NOTIFICATION_UP_PUSH_URL_PREFIX;
 import static com.zoffcc.applications.trifa.ToxVars.TOX_GROUP_CHAT_ID_SIZE;
@@ -371,7 +374,7 @@ static String push_token_to_push_url(final String push_token)
                 notification_push_url = NOTIFICATION_FCM_PUSH_URL_PREFIX + push_token;
             }
 
-            if (notification_push_url.length() < 1000)
+            if (notification_push_url.length() < MAX_PUSH_URL_LENGTH)
             {
                 return notification_push_url;
             }
@@ -543,6 +546,18 @@ static boolean is_valid_pushurl_for_friend_with_whitelist(String push_url)
             }
         }
 
+        // whitelist mozilla sunup server
+        if (PREF__allow_push_server_sunup)
+        {
+            if (push_url.length() > NOTIFICATION_SUNUP_PUSH_URL_PREFIX.length())
+            {
+                if (push_url.startsWith(NOTIFICATION_SUNUP_PUSH_URL_PREFIX))
+                {
+                    return true;
+                }
+            }
+        }
+
         // anything else is not allowed at this time!
         return false;
     }

android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/MainActivity.java

@@ -539,6 +539,7 @@ public class MainActivity extends AppCompatActivity
     static boolean PREF__show_friendnumber_on_friendlist = false;
     static int PREF__dark_mode_pref = 0;
     static boolean PREF__allow_push_server_ntfy = false;
+    static boolean PREF__allow_push_server_sunup = false;
     static boolean PREF__messageview_paging = true;
     static int PREF__message_paging_num_msgs_per_page = 50;
     static int PREF__ngc_video_bitrate = LOWER_NGC_VIDEO_BITRATE; // ~600 kbits/s -> ~60 kbytes/s
@@ -1295,6 +1296,16 @@ public void onNotYetInstalled()
             PREF__allow_push_server_ntfy = false;
         }
 
+        try
+        {
+            PREF__allow_push_server_sunup = settings.getBoolean("allow_push_server_sunup", false);
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+            PREF__allow_push_server_sunup = false;
+        }
+
         try
         {
             PREF__use_push_service = settings.getBoolean("use_push_service", true);
@@ -3930,6 +3941,16 @@ else if (PREF__higher_audio_quality == 1)
             PREF__allow_push_server_ntfy = false;
         }
 
+        try
+        {
+            PREF__allow_push_server_sunup = settings.getBoolean("allow_push_server_sunup", false);
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+            PREF__allow_push_server_sunup = false;
+        }
+
         try
         {
             PREF__use_push_service = settings.getBoolean("use_push_service", true);

android-refimpl-app/app/src/main/java/com/zoffcc/applications/trifa/TRIFAGlobals.java

@@ -46,12 +46,14 @@ public class TRIFAGlobals
     static int global_tox_self_status = ToxVars.TOX_USER_STATUS.TOX_USER_STATUS_NONE.value;
 
     static String global_notification_token = null;
+    final static int MAX_PUSH_URL_LENGTH = 3000;
     final static String NOTIFICATION_TOKEN_DB_KEY = "NotificationToken";
     final static String NOTIFICATION_TOKEN_DB_KEY_NEED_ACK = "NotificationTokenNeedACK";
     final static String NOTIFICATION_FCM_PUSH_URL_PREFIX = "https://tox.zoff.xyz/toxfcm/fcm.php?id=";
     final static String NOTIFICATION_FCM_PUSH_URL_PREFIX_OLD = "https://toxcon2020.zoff.cc/toxfcm/fcm.php?id=";
     final static String NOTIFICATION_UP_PUSH_URL_PREFIX = "https://gotify1.unifiedpush.org/UP?token=";
     final static String NOTIFICATION_NTFY_PUSH_URL_PREFIX = "https://ntfy.sh/";
+    final static String NOTIFICATION_SUNUP_PUSH_URL_PREFIX = "https://updates.push.services.mozilla.com/wpush/";
 
     final static String TOX_PUSH_MSG_APP_WEBDOWNLOAD = "https://github.com/zoff99/tox_push_msg_app/releases/latest/download/play.pushmsg.apk";
     final static String TOX_PUSH_MSG_APP_PLAYSTORE = "https://play.google.com/store/apps/details?id=com.zoffcc.applications.pushmsg";

android-refimpl-app/app/src/main/res/values/strings.xml

@@ -195,6 +195,9 @@
     <string name="pref_title_allow_push_server_ntfy">Allow ntfy.sh Server</string>
     <string name="pref_description_allow_push_server_ntfy">WARNING: Allow ntfy.sh server for push notifications, this may leak your metadata of timestamps when you receive push notifications, if a friend subscribes with your push token. ntfy.sh has NO passwords and NO authentication. you have been warned.</string>
 
+    <string name="pref_title_allow_push_server_sunup">Allow Moziall sunup Server</string>
+    <string name="pref_description_allow_push_server_sunup">WARNING: Allow Mozilla sunup server for push notifications, this may leak your metadata of timestamps when you receive push notifications, if a friend subscribes with your push token. Mozilla sunup has NO passwords and NO authentication. you have been warned.</string>
+
     <string name="pref_title_download_push_msg_app">Download Push Message App</string>
 
     <string name="pref_title_custom_bootstrap_nodes">Use Custom Bootstrap nodes</string>

android-refimpl-app/app/src/main/res/xml/pref_general.xml

@@ -32,6 +32,12 @@
             android:summary="@string/pref_description_allow_push_server_ntfy"
             android:title="@string/pref_title_allow_push_server_ntfy" />
 
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="allow_push_server_sunup"
+            android:summary="@string/pref_description_allow_push_server_sunup"
+            android:title="@string/pref_title_allow_push_server_sunup" />
+
         <SwitchPreference
             android:defaultValue="false"
             android:key="compact_friendlist"