Merge branch 'master' into EncodeReportName

Author: tomas-sexenian

.github/workflows/Build.yml

@@ -80,16 +80,14 @@ jobs:
           master)
             echo "## Is MASTER branch"
 
-            versionChangelist="-stable.$timestamp-SNAPSHOT"
+            versionChangelist="-preview.$timestamp-SNAPSHOT"
             SHOULD_DEPLOY='true'
             ;;
 
           beta)
-            echo "## Is BETA branch, add +100 to major number"
+            echo "## Is BETA branch"
 
-            pomMajorNumber=$(expr $pomMajorNumber + 100)
-            
-            versionChangelist="-trunk.$timestamp-SNAPSHOT"
+            versionChangelist="-beta.$timestamp-SNAPSHOT"
             SHOULD_DEPLOY='true'
             ;;
 
@@ -178,33 +176,16 @@ jobs:
         MAVEN_USERNAME: ${{ secrets.MAVEN_OSSRH_USERNAME }}
         MAVEN_PASSWORD: ${{ secrets.MAVEN_OSSRH_TOKEN }}
         MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_BUILDER_PASSPHRASE }}
-
-  dispatch-build:
-    name: Dispatch build result
-    needs: build
-    if: github.repository_owner == 'GeneXusLabs' && needs.build.outputs.SHOULD_DEPLOY == 'true'
-    
-    runs-on: ubuntu-latest
-
+ 
+  update-genexus-dependency:
     concurrency: 
       group: build-${{ github.ref }}
       cancel-in-progress: true
-
-    steps:
-      - name: Checkout action
-        uses: actions/checkout@v2
-        with:
-            repository: genexuslabs/dispatch-build-result
-            ref: releases/v2
-            token: ${{ secrets.SECURE_TOKEN }}
-            path: ./tmp/.github/actions/dispatch-build-result
-
-      - name: Dispatch build result
-        uses: ./tmp/.github/actions/dispatch-build-result
-        with:
-          component-name: ${{ github.event.inputs.repository }}
-          branch-ref: ${{ env.GIT_REF }}
-          new-version: ${{ needs.build.outputs.MAVEN_VERSION }}
-          committer: ${{ needs.build.outputs.LAST_COMMITTER }}
-          commit-message: ${{ needs.build.outputs.COMMIT_MESSAGE }}
-          token: ${{ secrets.SECURE_TOKEN }}
+    uses: genexuslabs/build-genexus-reusable-workflow/.github/workflows/update-genexus-dep-version.yml@main
+    needs: build
+    if: github.repository_owner == 'genexuslabs' && needs.build.outputs.SHOULD_DEPLOY == 'true'
+    with: 
+      VERSION: ${{ needs.build.outputs.MAVEN_VERSION }}
+      PACKAGE_NAMES: ${{ needs.build.outputs.PACKAGES_NAME }}
+      COMMITTER: ${{ needs.build.outputs.LAST_COMMITTER }}
+    secrets: inherit

.github/workflows/call-beta-bot.yml

@@ -0,0 +1,18 @@
+name: Call Beta Bot
+
+on:
+  # Triggers the workflow on push to beta branch or changes in a pull request to main branch
+  push:
+    branches: [ "beta" ]
+  pull_request:
+    types: [ opened, synchronize, reopened, ready_for_review, closed, labeled, unlabeled ]
+    branches: [ "master" ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  call-workflow:
+    if: github.repository_owner == 'genexuslabs'
+    uses: genexuslabs/build-genexus-reusable-workflow/.github/workflows/run-beta-bot.yml@main
+    secrets: inherit

android/src/main/java/com/artech/base/synchronization/bc/PendingEventHelper.java

@@ -9,7 +9,7 @@
 import com.genexus.GxSilentTrnSdt;
 import com.genexus.IGxSilentTrn;
 
-import json.org.json.JSONArray;
+import org.json.JSONArray;
 
 public class PendingEventHelper {
 

android/src/main/java/com/artech/synchronization/ISynchronizationHelper.java

@@ -2,7 +2,7 @@
 
 import java.util.TreeMap;
 
-import json.org.json.JSONArray;
+import org.json.JSONArray;
 
 public interface ISynchronizationHelper {
 

android/src/main/java/com/genexus/Application.java

@@ -250,6 +250,9 @@ public static boolean hasClientPreferences()
 	*/
 	public static ClientPreferences getClientPreferences()
 	{
+		if (!hasClientPreferences())
+			return null;
+
 		return (ClientPreferences) ((ModelContext)ClientContext.getModelContext()).getPreferences();
 	}
 

android/src/main/java/com/genexus/GXutil.java

@@ -21,7 +21,7 @@
 import com.genexus.util.GXThreadLocal;
 import com.genexus.util.IThreadLocal;
 
-import json.org.json.JSONObject;
+import org.json.JSONObject;
 
 public final class GXutil
 {

android/src/main/java/com/genexus/db/driver/ExternalProviderMetadata.java

@@ -1,7 +1,7 @@
 package com.genexus.db.driver;
 
-import json.org.json.JSONException;
-import json.org.json.JSONObject;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public class ExternalProviderMetadata
 {

android/src/main/java/com/genexus/internet/HttpAjaxContext.java

@@ -3,10 +3,9 @@
 import java.util.ArrayList;
 import java.util.Stack;
 
-import json.org.json.IJsonFormattable;
-import json.org.json.JSONArray;
-import json.org.json.JSONException;
-import json.org.json.JSONObject;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public abstract class HttpAjaxContext
 {
@@ -497,7 +496,7 @@ public Object GetJSONObject()
 			return wrapper;
 		}
 
-		public void FromJSONObject(IJsonFormattable obj)
+		public void FromJSONObject(Object obj)
 		{
 		}
 

android/src/main/java/com/genexus/internet/HttpContext.java

@@ -13,10 +13,9 @@
 import com.genexus.util.Codecs;
 import com.genexus.util.Encryption;
 
-import json.org.json.IJsonFormattable;
-import json.org.json.JSONArray;
-import json.org.json.JSONException;
-import json.org.json.JSONObject;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 public abstract class HttpContext extends HttpAjaxContext implements IHttpContext
 {
@@ -613,7 +612,7 @@ public void ajax_req_read_hidden_sdt(String jsonStr, Object SdtObj)
         {
             try
             {
-                IJsonFormattable jsonObj;
+                Object jsonObj;
                 if (jsonStr.startsWith("["))
                     jsonObj = new JSONArray(jsonStr);
                 else

android/src/main/java/com/genexus/specific/android/AndroidJSONSerialization.java

@@ -0,0 +1,21 @@
+package com.genexus.specific.android;
+
+import com.genexus.common.interfaces.IExtensionJSONSerialization;
+import com.genexus.json.JSONObjectWrapper;
+
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class AndroidJSONSerialization implements IExtensionJSONSerialization {
+	@Override
+	public Iterator<Map.Entry<String, Object>> getJSONObjectIterator(JSONObjectWrapper obj) {
+		Map<String, Object> map = new LinkedHashMap<>();
+		for (Iterator<String> it = obj.keys(); it.hasNext(); ) {
+			String k = it.next();
+			map.put(k, null); // value is not used for now, so we just set it as null
+		}
+
+		return map.entrySet().iterator();
+	}
+}