update sorma2

Author: zoff99

android-refimpl-app/app/src/main/java/com/zoffcc/applications/sorm/OrmaDatabase.java

@@ -13,6 +13,77 @@ this was solved by: https://github.com/xerial/sqlite-jdbc/pull/1178
 see: https://github.com/xerial/sqlite-jdbc/issues/1094<br>
 <br>
 
+[![build](https://github.com/zoff99/iocipher_pack/actions/workflows/ci.yml/badge.svg)](https://github.com/zoff99/iocipher_pack/actions/workflows/ci.yml)
+
+
+# Usage
+
+create one file for each database table that you need.
+<br>
+create file for db table `Person` as `./gen/_sorm_Person.java`
+<br>(don't worry it is not really Java, we just use the syntax here)
+```Java
+@Table
+public class Person
+{
+    @PrimaryKey(autoincrement = true)
+    public long id;
+    @Column
+    public String name;
+    @Column
+    public String address;
+    @Column
+    public int social_number;
+}
+```
+
+now create the Java sources with the Java SORMA2 Generator. <b>you need at least java 17</b>.<br>
+```bash
+java -classpath ".:sqlite-jdbc-3.49.1.0.jar:sorma2.jar" \
+  com/zoffcc/applications/sorm/Generator "gen"
+```
+
+your project is now ready to start.<br>
+enter the generator directory:
+```bash
+cd ./gen/
+ls -al
+```
+
+now move or copy all *.java files from the generator directory into your Android or Java project source tree
+```bash
+cd gen/
+# remove class files
+find . -name '*.class'|xargs rm -v
+cp -av ./com /home/user/your/project/source/tree/
+```
+
+in your Java project you will need the `sqlite jdbc jar` and in your
+Android project you will need `com.github.zoff99:pkgs_zoffccAndroidJDBC` from [jitpack.io](https://jitpack.io/#zoff99/pkgs_zoffccAndroidJDBC)
+
+
+
+Android Example App:
+------------------------
+
+see: https://github.com/zoff99/sorma2/tree/master/example_android
+
+<img src="https://github.com/zoff99/sorma2/releases/download/nightly/android_screen01_21.png" height="300"></a><img src="https://github.com/zoff99/sorma2/releases/download/nightly/android_screen01_29.png" height="300"></a><img src="https://github.com/zoff99/sorma2/releases/download/nightly/android_screen01_33.png" height="300"></a><img src="https://github.com/zoff99/sorma2/releases/download/nightly/android_screen01_35.png" height="300"></a>
+<br>
+
+
+Linux Java Example App:
+------------------------
+
+see: https://github.com/zoff99/sorma2/tree/master/test
+
+<img src="https://github.com/zoff99/sorma2/releases/download/nightly/console_screen.png" width="70%">
+
+Use the `sorma_generated.jar` (that is generated in the `gen` directory) and `sqlite-jdbc-3.49.1.0.jar` for the Java project.<br>
+Check `TestSorma.java` for an Example usage.
+<br>
+
+
 <br>
 Any use of this project's code by GitHub Copilot, past or present, is done
 without our permission.  We do not consent to GitHub's use of this project's

sorma2/README.md

@@ -10,6 +10,7 @@
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.stream.Stream;
 
@@ -88,7 +89,11 @@ public static void main(String[] args) {
             final String workdir = args[0];
             begin_orma(workdir, orma_global_out);
 
-            for (final File fileEntry : new File(workdir).listFiles()) {
+            // HINT: sort order does not seem to be exactly identical everywhere. this is the aweful "fix" with sorting
+            File[] files = new File(workdir).listFiles();
+            Arrays.sort(files, (a, b) -> a.getName().compareTo(b.getName()));
+
+            for (final File fileEntry : files) {
                 if (!fileEntry.isDirectory()) {
                     if (fileEntry.getName().startsWith(prefix))
                     {
@@ -166,7 +171,7 @@ static void begin_orma(final String workdir, final String outfilename)
     static void begin_table(final String workdir, final String tablename)
     {
         System.out.println("starting: " + workdir + File.separator + out_classdir + tablename + tbl_f_ext);
-        tbl_deepcopy = "    static "+tablename+" deep_copy("+tablename+" in)" + "\n";
+        tbl_deepcopy = "    public static "+tablename+" deep_copy("+tablename+" in)" + "\n";
         tbl_deepcopy += "    {" + "\n";
         tbl_deepcopy += "        "+tablename+" out = new "+tablename+"();" + "\n";
 

sorma2/com/zoffcc/applications/sorm/Generator.java

@@ -37,7 +37,7 @@ public class BootstrapNodeEntryDB
     @Column(indexed = true, helpers = Column.Helpers.ALL)
     public String key_hex;
 
-    static BootstrapNodeEntryDB deep_copy(BootstrapNodeEntryDB in)
+    public static BootstrapNodeEntryDB deep_copy(BootstrapNodeEntryDB in)
     {
         BootstrapNodeEntryDB out = new BootstrapNodeEntryDB();
         out.id = in.id;

sorma2/gen/com/zoffcc/applications/sorm/BootstrapNodeEntryDB.java

@@ -46,7 +46,7 @@ public class ConferenceDB
     @Column(indexed = true, helpers = Column.Helpers.ALL)
     public boolean notification_silent;
 
-    static ConferenceDB deep_copy(ConferenceDB in)
+    public static ConferenceDB deep_copy(ConferenceDB in)
     {
         ConferenceDB out = new ConferenceDB();
         out.conference_identifier = in.conference_identifier;

sorma2/gen/com/zoffcc/applications/sorm/ConferenceDB.java

@@ -61,7 +61,7 @@ public class ConferenceMessage
     @Column(indexed = true, helpers = Column.Helpers.ALL)
     public boolean was_synced;
 
-    static ConferenceMessage deep_copy(ConferenceMessage in)
+    public static ConferenceMessage deep_copy(ConferenceMessage in)
     {
         ConferenceMessage out = new ConferenceMessage();
         out.id = in.id;

sorma2/gen/com/zoffcc/applications/sorm/ConferenceMessage.java

@@ -34,7 +34,7 @@ public class ConferencePeerCacheDB
     @Column(indexed = true, helpers = Column.Helpers.ALL)
     public long last_update_timestamp;
 
-    static ConferencePeerCacheDB deep_copy(ConferencePeerCacheDB in)
+    public static ConferencePeerCacheDB deep_copy(ConferencePeerCacheDB in)
     {
         ConferencePeerCacheDB out = new ConferencePeerCacheDB();
         out.id = in.id;

sorma2/gen/com/zoffcc/applications/sorm/ConferencePeerCacheDB.java

@@ -43,7 +43,7 @@ public class FileDB
     @Column(indexed = true, helpers = Column.Helpers.ALL)
     public boolean is_in_VFS;
 
-    static FileDB deep_copy(FileDB in)
+    public static FileDB deep_copy(FileDB in)
     {
         FileDB out = new FileDB();
         out.id = in.id;

sorma2/gen/com/zoffcc/applications/sorm/FileDB.java

@@ -67,7 +67,7 @@ public class Filetransfer
     @Column(indexed = true, helpers = Column.Helpers.ALL)
     public String tox_file_id_hex;
 
-    static Filetransfer deep_copy(Filetransfer in)
+    public static Filetransfer deep_copy(Filetransfer in)
     {
         Filetransfer out = new Filetransfer();
         out.id = in.id;

sorma2/gen/com/zoffcc/applications/sorm/Filetransfer.java

@@ -91,7 +91,7 @@ public class FriendList
     @Column(indexed = true, helpers = Column.Helpers.ALL)
     public long msgv3_capability;
 
-    static FriendList deep_copy(FriendList in)
+    public static FriendList deep_copy(FriendList in)
     {
         FriendList out = new FriendList();
         out.tox_public_key_string = in.tox_public_key_string;