updates

src/main/java/com/zoffcc/applications/sorm/FriendList.java

@@ -35,7 +35,7 @@ public class FriendList
 
     // pubkey is always saved as UPPER CASE hex string!! -----------------
     @PrimaryKey
-    String tox_public_key_string = "";
+    public String tox_public_key_string = "";
     // pubkey is always saved as UPPER CASE hex string!! -----------------
 
     @Column
@@ -54,7 +54,7 @@ public class FriendList
     int TOX_CONNECTION; // 0 --> NONE (offline), 1 --> TCP (online), 2 --> UDP (online)
 
     @Column(indexed = true, defaultExpr = "0", helpers = Column.Helpers.ALL)
-    int TOX_CONNECTION_real; // 0 --> NONE (offline), 1 --> TCP (online), 2 --> UDP (online)
+    public int TOX_CONNECTION_real; // 0 --> NONE (offline), 1 --> TCP (online), 2 --> UDP (online)
 
     @Column(indexed = true, defaultExpr = "0", helpers = Column.Helpers.ALL)
     int TOX_CONNECTION_on_off; // 0 --> offline, 1 --> online
@@ -102,10 +102,10 @@ public class FriendList
 
     @Column(indexed = true, defaultExpr = "", helpers = Column.Helpers.ALL)
     @Nullable
-    String push_url;
+    public String push_url;
 
     @Column(indexed = true, defaultExpr = "0", helpers = Column.Helpers.ALL)
-    long capabilities = 0;
+    public long capabilities = 0;
 
     @Column(indexed = true, defaultExpr = "0", helpers = Column.Helpers.ALL)
     long msgv3_capability = 0;

src/main/java/com/zoffcc/applications/sorm/Message.java

@@ -900,7 +900,7 @@ public Message msg_idv3_hash(String msg_idv3_hash)
 
     public Message resend_countLt(int resend_count)
     {
-        this.sql_where = this.sql_where + " and  resend_count<'" + s(filetransfer_id) + "' ";
+        this.sql_where = this.sql_where + " and  resend_count<'" + s(resend_count) + "' ";
         return this;
     }
 

src/main/java/com/zoffcc/applications/sorm/OrmaDatabase.java

@@ -1,7 +1,6 @@
 package com.zoffcc.applications.sorm;
 
 import com.zoffcc.applications.trifa.Log;
-import com.zoffcc.applications.trifa.OperatingSystem;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.*;
@@ -29,6 +28,11 @@ public OrmaDatabase()
     {
     }
 
+    public static Connection getSqldb()
+    {
+        return sqldb;
+    }
+
     public static String bytesToString(byte[] bytes)
     {
         return Base64.getEncoder().encodeToString(bytes);

src/main/java/com/zoffcc/applications/trifa/HelperFriend.java

@@ -1,9 +1,24 @@
 package com.zoffcc.applications.trifa;
 
+import com.zoffcc.applications.sorm.FriendList;
 import com.zoffcc.applications.sorm.TRIFADatabaseGlobalsNew;
 import org.sqlite.SQLiteException;
 
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import java.nio.ByteBuffer;
+import java.time.Duration;
+import java.util.List;
+
+import static com.zoffcc.applications.trifa.HelperMessage.get_message_in_db_sent_push_is_read;
+import static com.zoffcc.applications.trifa.HelperMessage.update_message_in_db_sent_push_set;
+import static com.zoffcc.applications.trifa.HelperRelay.get_pushurl_for_friend;
+import static com.zoffcc.applications.trifa.HelperRelay.is_valid_pushurl_for_friend_with_whitelist;
+import static com.zoffcc.applications.trifa.MainActivity.tox_friend_get_public_key;
+import static com.zoffcc.applications.trifa.TRIFAGlobals.*;
+import static java.time.temporal.ChronoUnit.SECONDS;
 
 public class HelperFriend {
 
@@ -18,8 +33,7 @@ static void send_friend_msg_receipt_v2_wrapper(final long friend_number, final i
             // send message receipt v2
             MainActivity.tox_util_friend_send_msg_receipt_v2(friend_number, t_sec_receipt, msg_id_buffer);
         } else if (msg_type == 2) {
-            MainActivity.tox_util_friend_send_msg_receipt_v2(friend_number, t_sec_receipt,
-                    msg_id_buffer);
+            MainActivity.tox_util_friend_send_msg_receipt_v2(friend_number, t_sec_receipt, msg_id_buffer);
         } else if (msg_type == 3) {
             // send message receipt v2
             MainActivity.tox_util_friend_send_msg_receipt_v2(friend_number, t_sec_receipt, msg_id_buffer);
@@ -29,102 +43,192 @@ static void send_friend_msg_receipt_v2_wrapper(final long friend_number, final i
         }
     }
 
-    static void delete_friend_all_filetransfers(final String friendpubkey)
-    {
-        try
-        {
-            Log.i(TAG, "delete_ft:ALL for friend=" + friendpubkey);
-            TrifaToxService.Companion.getOrma().deleteFromFiletransfer().
-                    tox_public_key_stringEq(friendpubkey).execute();
+    static FriendList main_get_friend(long friendnum) {
+        FriendList f = null;
+
+        try {
+            String pubkey_temp = tox_friend_get_public_key(friendnum);
+            // Log.i(TAG, "main_get_friend:pubkey=" + pubkey_temp + " fnum=" + friendnum);
+            List<FriendList> fl = TrifaToxService.Companion.getOrma().selectFromFriendList().tox_public_key_stringEq(tox_friend_get_public_key(friendnum)).toList();
+
+            // Log.i(TAG, "main_get_friend:fl=" + fl + " size=" + fl.size());
+
+            if (fl.size() > 0) {
+                f = fl.get(0);
+                // Log.i(TAG, "main_get_friend:f=" + f);
+            } else {
+                f = null;
+            }
+        } catch (Exception e) {
+            f = null;
         }
-        catch (Exception e)
-        {
+
+        return f;
+    }
+
+    static FriendList main_get_friend(String friend_pubkey) {
+        FriendList f = null;
+
+        try {
+            List<FriendList> fl = TrifaToxService.Companion.getOrma().selectFromFriendList().tox_public_key_stringEq(friend_pubkey).toList();
+
+            if (fl.size() > 0) {
+                f = fl.get(0);
+            } else {
+                f = null;
+            }
+        } catch (Exception e) {
+            f = null;
+        }
+
+        return f;
+    }
+
+    static void delete_friend_all_filetransfers(final String friendpubkey) {
+        try {
+            Log.i(TAG, "delete_ft:ALL for friend=" + friendpubkey);
+            TrifaToxService.Companion.getOrma().deleteFromFiletransfer().tox_public_key_stringEq(friendpubkey).execute();
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
-    static void delete_friend_all_messages(final String friendpubkey)
-    {
-        TrifaToxService.Companion.getOrma().
-                deleteFromMessage().tox_friendpubkeyEq(friendpubkey).execute();
+    static void delete_friend_all_messages(final String friendpubkey) {
+        TrifaToxService.Companion.getOrma().deleteFromMessage().tox_friendpubkeyEq(friendpubkey).execute();
     }
 
-    static void delete_friend(final String friend_pubkey)
-    {
-        TrifaToxService.Companion.getOrma().deleteFromFriendList().
-                tox_public_key_stringEq(friend_pubkey).
-                execute();
+    static void delete_friend(final String friend_pubkey) {
+        TrifaToxService.Companion.getOrma().deleteFromFriendList().tox_public_key_stringEq(friend_pubkey).execute();
     }
 
-    public static String get_g_opts(String key)
-    {
-        try
-        {
-            if (TrifaToxService.Companion.getOrma().selectFromTRIFADatabaseGlobalsNew().keyEq(key).count() == 1)
-            {
+    public static String get_g_opts(String key) {
+        try {
+            if (TrifaToxService.Companion.getOrma().selectFromTRIFADatabaseGlobalsNew().keyEq(key).count() == 1) {
                 TRIFADatabaseGlobalsNew g_opts = TrifaToxService.Companion.getOrma().selectFromTRIFADatabaseGlobalsNew().keyEq(key).get(0);
                 // Log.i(TAG, "get_g_opts:(SELECT):key=" + key);
                 return g_opts.value;
-            }
-            else
-            {
+            } else {
                 return null;
             }
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             e.printStackTrace();
             Log.i(TAG, "get_g_opts:EE1:" + e.getMessage());
             return null;
         }
     }
 
-    public static void set_g_opts(String key, String value)
-    {
-        try
-        {
+    public static void set_g_opts(String key, String value) {
+        try {
             TRIFADatabaseGlobalsNew g_opts = new TRIFADatabaseGlobalsNew();
             g_opts.key = key;
             g_opts.value = value;
 
-            try
-            {
+            try {
                 TrifaToxService.Companion.getOrma().insertIntoTRIFADatabaseGlobalsNew(g_opts);
                 Log.i(TAG, "set_g_opts:(INSERT):key=" + key + " value=" + "xxxxxxxxxxxxx");
-            }
-            catch (Exception e)
-            {
+            } catch (Exception e) {
                 // e.printStackTrace();
-                try
-                {
+                try {
                     TrifaToxService.Companion.getOrma().updateTRIFADatabaseGlobalsNew().keyEq(key).value(value).execute();
                     Log.i(TAG, "set_g_opts:(UPDATE):key=" + key + " value=" + "xxxxxxxxxxxxxxx");
-                }
-                catch (Exception e2)
-                {
+                } catch (Exception e2) {
                     e2.printStackTrace();
                     Log.i(TAG, "set_g_opts:EE1:" + e2.getMessage());
                 }
             }
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             e.printStackTrace();
             Log.i(TAG, "set_g_opts:EE2:" + e.getMessage());
         }
     }
 
-    public static void del_g_opts(String key)
-    {
-        try
-        {
+    public static void del_g_opts(String key) {
+        try {
             TrifaToxService.Companion.getOrma().deleteFromTRIFADatabaseGlobalsNew().keyEq(key).execute();
             Log.i(TAG, "del_g_opts:(DELETE):key=" + key);
-        }
-        catch (Exception e)
-        {
+        } catch (Exception e) {
             e.printStackTrace();
             Log.i(TAG, "del_g_opts:EE2:" + e.getMessage());
         }
     }
+
+    static void friend_call_push_url(final String friend_pubkey, final long message_timestamp_circa) {
+        try {
+            final String pushurl_for_friend = get_pushurl_for_friend(friend_pubkey);
+
+            if (pushurl_for_friend != null) {
+                if (pushurl_for_friend.length() > "https://".length()) {
+                    if (is_valid_pushurl_for_friend_with_whitelist(pushurl_for_friend)) {
+
+                        Thread t = new Thread() {
+                            @Override
+                            public void run() {
+                                try {
+                                    friend_do_actual_weburl_call(friend_pubkey, pushurl_for_friend, message_timestamp_circa, true);
+                                    // HINT: trigger push again after PUSH_URL_TRIGGER_AGAIN_SECONDS seconds to
+                                    //       make sure iphones actually get online and receive the message
+                                    boolean res = false;
+                                    for (int j = 0; j < PUSH_URL_TRIGGER_AGAIN_MAX_COUNT; j++) {
+                                        Thread.sleep(PUSH_URL_TRIGGER_AGAIN_SECONDS * 1000);
+                                        res = friend_do_actual_weburl_call(friend_pubkey, pushurl_for_friend, message_timestamp_circa, false);
+                                        if (res) {
+                                            Log.i(TAG, "friend_call_push_url:BREAK");
+                                            break;
+                                        }
+                                    }
+                                } catch (Exception e) {
+                                    Log.i(TAG, "friend_call_push_url:EE2:" + e.getMessage());
+                                }
+                            }
+                        };
+                        t.start();
+                    }
+                }
+            }
+        } catch (Exception ignored) {
+        }
+    }
+
+    /*
+     * return true if we should stop triggering push notifications
+     *        false otherwise
+     */
+    static boolean friend_do_actual_weburl_call(final String friend_pubkey, final String pushurl_for_friend, final long message_timestamp_circa, final boolean update_message_flag) {
+        try {
+            if (!update_message_flag) {
+                if (get_message_in_db_sent_push_is_read(friend_pubkey, message_timestamp_circa)) {
+                    // message is "read" (received) so stop triggering push notifications
+                    return true;
+                }
+            }
+
+            try {
+                HttpClient client = null;
+
+                client = HttpClient.newBuilder().connectTimeout(Duration.of(8, SECONDS)).build();
+
+                //                                   cacheControl(new CacheControl.Builder().noCache().build()).
+
+                HttpRequest request = HttpRequest.newBuilder().uri(URI.create(pushurl_for_friend)).header("User-Agent", GENERIC_TOR_USERAGENT).timeout(Duration.of(5, SECONDS)).POST(HttpRequest.BodyPublishers.ofString("ping=1")).build();
+
+                try {
+                    HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
+                    Log.i(TAG, "friend_call_push_url:url=" + pushurl_for_friend + " RES=" + response.statusCode());
+
+                    if ((response.statusCode() < 300) && (response.statusCode() > 199)) {
+                        if (update_message_flag) {
+                            update_message_in_db_sent_push_set(friend_pubkey, message_timestamp_circa);
+                        }
+                    }
+                } catch (Exception ignored) {
+                }
+            } catch (Exception e) {
+                Log.i(TAG, "friend_call_push_url:001:EE:" + e.getMessage());
+            }
+
+        } catch (Exception ignored) {
+        }
+
+        return false;
+    }
 }