Merge pull request #52 from Beldex-Coin/dev

Beldex-Coin · Jun 3, 2024 · dcccd93 · dcccd93
2 parents 1230b01 + 7c2bea6
commit dcccd93
Show file tree

Hide file tree

Showing 11 changed files with 170 additions and 430 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ apply from: 'buildGradle/dependencies.gradle'
 configurations.all {
     exclude module: "commons-logging"
 }
-def canonicalVersionCode = 44
-def canonicalVersionName = "2.5.0"
+def canonicalVersionCode = 46
+def canonicalVersionName = "2.5.1"
 
 //First Release Date 17-06-2022
 //Version Code 15 Version Name 1.0.0
@@ -104,6 +104,12 @@ def canonicalVersionName = "2.5.0"
 //30th  Release Data 22-03-2024
 //Version code 44 Version Name 2.5.0
 
+//31th Internal Test Release Data 22-03-2024
+//Version code 45 Version Name 2.5.0
+
+//32 Internal Test Release Data 27-05-2024
+//Version code 46 Version Name 2.5.1
+
 def postFixSize = 10
 def abiPostFix = ['armeabi-v7a' : 1,
                   'arm64-v8a'   : 2,

diff --git a/app/playMainNet/release/output-metadata.json b/app/playMainNet/release/output-metadata.json
@@ -11,9 +11,9 @@
       "type": "UNIVERSAL",
       "filters": [],
       "attributes": [],
-      "versionCode": 43,
-      "versionName": "2.5.0",
-      "outputFile": "Bchat-2.5.0-universal.apk"
+      "versionCode": 46,
+      "versionName": "2.5.1",
+      "outputFile": "Bchat-2.5.1-universal.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -24,9 +24,9 @@
         }
       ],
       "attributes": [],
-      "versionCode": 43,
-      "versionName": "2.5.0",
-      "outputFile": "Bchat-2.5.0-armeabi-v7a.apk"
+      "versionCode": 46,
+      "versionName": "2.5.1",
+      "outputFile": "Bchat-2.5.1-armeabi-v7a.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -37,9 +37,9 @@
         }
       ],
       "attributes": [],
-      "versionCode": 43,
-      "versionName": "2.5.0",
-      "outputFile": "Bchat-2.5.0-x86_64.apk"
+      "versionCode": 46,
+      "versionName": "2.5.1",
+      "outputFile": "Bchat-2.5.1-x86_64.apk"
     },
     {
       "type": "ONE_OF_MANY",
@@ -50,9 +50,9 @@
         }
       ],
       "attributes": [],
-      "versionCode": 43,
-      "versionName": "2.5.0",
-      "outputFile": "Bchat-2.5.0-arm64-v8a.apk"
+      "versionCode": 46,
+      "versionName": "2.5.1",
+      "outputFile": "Bchat-2.5.1-arm64-v8a.apk"
     }
   ],
   "elementType": "File"

diff --git a/app/src/main/assets/changeLog.json b/app/src/main/assets/changeLog.json
@@ -363,6 +363,14 @@
           "description":"- Minor Bug fixes"
         }
       ]
+    },
+    {
+      "title": "2.5.1",
+      "descriptions": [
+        {
+          "description":"- Updated call functionalities to adhere with google play's developer guidelines"
+        }
+      ]
     }
   ]
 }
diff --git a/app/src/main/java/com/thoughtcrimes/securesms/contactshare/ContactModelMapper.java b/app/src/main/java/com/thoughtcrimes/securesms/contactshare/ContactModelMapper.java