From 3b1aa3af9b39f1e317b6ba84b0d4093ff31bdd26 Mon Sep 17 00:00:00 2001
From: Jose Alberto Guerra Ugalde <cheveguerra@gmail.com>
Date: Fri, 16 Feb 2024 15:14:42 -0600
Subject: [PATCH] =?UTF-8?q?Se=20agreg=C3=B3=20la=20variable=20logger=20en?=
 =?UTF-8?q?=20starter=20y=20condiciones=20para=20que=20solo=20mande=20logs?=
 =?UTF-8?q?=20cuando=20esta=20abierta=20la=20aplicacion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DBRequestManager.bas  |  2 +-
 FirebaseMessaging.bas |  4 ++--
 Pusher.b4a            | 12 +++++++-----
 Starter.bas           |  7 ++++++-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/DBRequestManager.bas b/DBRequestManager.bas
index 06d44f7..1cb484c 100644
--- a/DBRequestManager.bas
+++ b/DBRequestManager.bas
@@ -200,7 +200,7 @@ Public Sub HandleJob(Job As HttpJob) As DBResult
 	table.Columns.Initialize
 	table.rows.Initialize
 	table.Tag = Job.Tag
-	If jobTagAnterior <> Job.Tag Then LogColor("HandleJob: '"&Job.Tag&"'", Colors.Blue)  'Mod por CHV - 211023
+	If starter.logger and jobTagAnterior <> Job.Tag Then LogColor("HandleJob: '"&Job.Tag&"'", Colors.Blue)  'Mod por CHV - 211023
 	jobTagAnterior = Job.Tag  'Mod por CHV - 211023
 	If method = "query" Then
 		Dim numberOfColumns As Int = ReadInt(In)
diff --git a/FirebaseMessaging.bas b/FirebaseMessaging.bas
index 8b40095..a76a622 100644
--- a/FirebaseMessaging.bas
+++ b/FirebaseMessaging.bas
@@ -32,7 +32,7 @@ Sub Service_Start (StartingIntent As Intent)
 End Sub
 
 Sub fm_MessageArrived (Message As RemoteMessage)
-	Log($"Pusher - Mensaje recibido: ${Message.GetData}"$)
+	If Starter.logger Then Log($"Pusher - Mensaje recibido: ${Message.GetData}"$)
 '	Log($"Message data: ${Message.GetData}"$)
 
 	'Si recibimos Pong, lo agregamos a la lista de dispositivos activos
@@ -50,7 +50,7 @@ Sub fm_MessageArrived (Message As RemoteMessage)
 
 	'Si el mensaje es de ubicacion recibida
 	If Message.GetData.ContainsKey("t") And (Message.GetData.Get("t") = "u" Or Message.GetData.Get("t") = "au") Then
-		Log("Pusher - Recibimos ubicacion")
+		If Starter.logger Then Log("Pusher - Recibimos ubicacion")
 		Private ubi As Location
 '		Log("Llamamos UbicacionRecibida")
 		If Message.GetData.Get("t") = "au" Or Message.GetData.Get("t") = "u" Then
diff --git a/Pusher.b4a b/Pusher.b4a
index a9f3114..2a4d014 100644
--- a/Pusher.b4a
+++ b/Pusher.b4a
@@ -71,12 +71,12 @@ Module6=Subs
 NumberOfFiles=19
 NumberOfLibraries=23
 NumberOfModules=6
-Version=12.5
+Version=12.8
 @EndOfDesignText@
 #Region  Project Attributes 
 	#ApplicationLabel: Pusher 2.0
 	#VersionCode: 1
-	#VersionName: 3.11.07
+	#VersionName: 4.02.16
 	'Ver. 3.09.18 - Se agregó la posibilidad de mostrar puntos internedios en la ruta y muestra icono diferente si esta en movimiento o parado. 
 	'SupportedOrientations possible values: unspecified, landscape or portrait.
 	#SupportedOrientations: portrait
@@ -272,6 +272,7 @@ End Sub
 Sub Activity_Pause (UserClosed As Boolean)
 	'Starter.StopFLP
 '	CallSub(Tracker, "StopFLP")
+	Starter.logger = False
 End Sub
 
 Sub Button1_Click
@@ -307,7 +308,7 @@ Sub JobDone(Job As HttpJob)
 		ToastMessageShow("Error: " & Job.ErrorMessage, True)
 	Else
 		If Job.JobName = "DBRequest" Then
-			LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.Green)  'Mod por CHV - 211027
+			If Starter.logger = True Then LogColor("JobDone: '" & reqManager.HandleJob(Job).tag & "' - Registros: " & reqManager.HandleJob(Job).Rows.Size, Colors.Green)  'Mod por CHV - 211027
 			Dim result As DBResult = reqManager.HandleJob(Job)
 			If result.Tag = "seleccionaRutaGPS2" Then 'query tag
 				rutaGPS = ""
@@ -428,7 +429,7 @@ public Sub ubicacionRecibida(message As Map)
 	montoTotal =message.Get("mt")
 	batt=message.Get("b")
 	Dim v As String = message.Get("v")
-	Log("Ubicacion recibida : "&message.Get("d")&","&message.Get("t")&","&message.Get("body"))
+	If Starter.logger Then Log("Ubicacion recibida : "&message.Get("d")&","&message.Get("t")&","&message.Get("body"))
 	If message.Get("t") = "au" Then 'Si es actualizacion
 '		For i=0 To message.Size-1
 '			Log(message.GetKeyAt(i)&"="&message.GetValueAt(i))
@@ -448,7 +449,7 @@ public Sub ubicacionRecibida(message As Map)
 '	Log("dispositvos="&dispositivos)
 '	Log(DateTime.Time(timemarker))
 	MapFragment1_Ready
-	Log("Dispositivos : "&dispositivos.Size)
+	If Starter.logger Then Log("Dispositivos : "&dispositivos.Size)
 End Sub
 
 Sub agregaAListview
@@ -758,6 +759,7 @@ Sub s_tracker_ItemClick (Position As Int, Value As Object)
 End Sub
 
 Sub b_buscar_longClick
+	Starter.logger = True
 	mapaDestino = 2
 	Subs.panelVisible(p_ruta, 0, 0)
 	p_mapa2.Width = Activity.Width
diff --git a/Starter.bas b/Starter.bas
index a7b7f2e..8c6bb22 100644
--- a/Starter.bas
+++ b/Starter.bas
@@ -13,6 +13,7 @@ Sub Process_Globals
 	Public rp As RuntimePermissions
 	Public FLP As FusedLocationProvider
 	Dim dentroDeGeocerca As Map
+	Dim logger As Boolean = False
 End Sub
 
 Sub Service_Create
@@ -21,7 +22,11 @@ Sub Service_Create
 End Sub
 
 Sub Service_Start (StartingIntent As Intent)
-
+	#if DEBUG
+		logger = True
+	#else
+		Logger = False
+	#End If
 End Sub
 
 Sub Application_Error (Error As Exception, StackTrace As String) As Boolean