#Version 23.6 en testBeta

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Nov 25 09:23:07 CET 2019
+#Thu Feb 23 08:13:25 CET 2023
-gradle.version=5.4.1
+gradle.version=5.6.4

app/build.gradle

@@ -7,13 +7,10 @@ android {
         applicationId "verdnatura.es.repartoverdnatura"
         minSdkVersion 19
         //targetSdkVersion 28
-        versionCode 33
+        versionCode 36
-        versionName "23.2Beta"
+        versionName "23.6"
         //versionName "23.2Beta" Madrid 33
-        //versionName "9.6.1Beta" //versionCode 27
+
-        //versionName "9.6"
-        //versionName "9.5" versionCode 26
-        //versionName "9.6Beta" versionCode 26
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
@@ -29,12 +26,12 @@ android {
         getByName("debug") {
             applicationIdSuffix = ".sfusion"
         }*/
-        getByName("release") {
+      /*  getByName("release") {
-            applicationIdSuffix = ".sfusionMadrid"
+            applicationIdSuffix = ".sfusion"
         }
         getByName("debug") {
-            applicationIdSuffix = ".sfusionMadrid"
+            applicationIdSuffix = ".sfusion"
-        }
+        }*/
 
     }
 

app/google-services.json

@@ -10,7 +10,51 @@
       "client_info": {
         "mobilesdk_app_id": "1:622584359076:android:49dda1d8a6dc59f9",
         "android_client_info": {
-          "package_name": "verdnatura.es.repartoverdnatura.sfusionMadrid"
+          "package_name": "verdnatura.es.repartoverdnatura.sfusion"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "622584359076-0ph8u7jfg7ifgs6qe4ueb6oqj9c8mv36.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "verdnatura.es.repartoverdnatura.sfusionMadrid",
+            "certificate_hash": "1495f9252766a51f3c48f2e9c8789c85cee831d0"
+          }
+        },
+        {
+          "client_id": "622584359076-of5rjenfhtc8uogo3e3uv0b321verrbm.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAm1cBB77FS72JdOClD-qXZtvZ0_JTgvPI"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 2,
+          "other_platform_oauth_client": [
+            {
+              "client_id": "622584359076-of5rjenfhtc8uogo3e3uv0b321verrbm.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:622584359076:android:49dda1d8a6dc59f9",
+        "android_client_info": {
+          "package_name": "verdnatura.es.repartoverdnatura"
         }
       },
       "oauth_client": [

app/src/main/java/verdnatura/es/repartoverdnatura/InfoActivity.java

@@ -1,14 +1,12 @@
 package verdnatura.es.repartoverdnatura;
 
-import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
+import android.os.Bundle;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -19,12 +17,10 @@ import java.util.List;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
-import verdnatura.es.repartoverdnatura.ADAPTERS.WorkerAdapter;
 import verdnatura.es.repartoverdnatura.INTERFACES.RestClient;
 import verdnatura.es.repartoverdnatura.MODELS.DeliveryInfo;
 import verdnatura.es.repartoverdnatura.MODELS.Ruta;
 import verdnatura.es.repartoverdnatura.MODELS.SectorItem;
-import verdnatura.es.repartoverdnatura.MODELS.Worker;
 import verdnatura.es.repartoverdnatura.UTILS.ApiUtils;
 import verdnatura.es.repartoverdnatura.UTILS.LocalStorage;
 import verdnatura.es.repartoverdnatura.UTILS.Utils;
@@ -223,6 +219,7 @@ public class InfoActivity extends AppCompatActivity {
 
 
     }
+
     private void freelance_getInfo(String id) {
         //  Utils.progressBar.show(this,getResources().getString(R.string.please_wait));
         Object[] args = new Object[1];

app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtils.java

@@ -7,9 +7,9 @@ public class ApiUtils {
 
     //public static final String BASE_URL = "http://10.1.4.42:9000/";
      //public static final String BASE_URL = "http://192.168.1.128:9000/";
-    public static final String BASE_URL = "https://test-app.verdnatura.es/";
+    //public static final String BASE_URL = "https://test-app.verdnatura.es/";
 
-     //public static final String BASE_URL = "https://app.verdnatura.es/";
+     public static final String BASE_URL = "https://app.verdnatura.es/";
 
     public static RestClient getAPIService() {
         return RetrofitClient.getClient(BASE_URL).create(RestClient.class);

app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/ApiUtilsSalix.java

@@ -6,8 +6,8 @@ public class ApiUtilsSalix {
     private ApiUtilsSalix() {}
 
 
-   //public static final String BASE_URL_SALIX = "https://salix.verdnatura.es/";
+   public static final String BASE_URL_SALIX = "https://salix.verdnatura.es/";
-    public static final String BASE_URL_SALIX = "https://test-salix.verdnatura.es/";
+   // public static final String BASE_URL_SALIX = "https://test-salix.verdnatura.es/";
   // public static final String BASE_URL_SALIX = "http://localhost:3000/";
     public static RestClientSalix getAPIService() {
         return RetrofitClientSalix.getClient(BASE_URL_SALIX).create(RestClientSalix.class);