- Se agregó nuevamente la opción de importar la base de datos directamente desde Whatsapp, hay que ingresar al engrane con el usuario KMTS1.

- Se cambio el nombre del archivo que se envia por WhatsApp cuando se envia la base de datos, ahora es kmt_mariana.db

B4A/B4XMainPage.bas

@@ -92,6 +92,8 @@ Sub Class_Globals
 	Dim MES1 As ManageExternalStorage
 	Dim device As Phone
 	Private b_importarBD As Button
+	Private p_importarBDWA As Panel
+	Dim cb_importarBDWA As CheckBox
 End Sub
 
 Public Sub Initialize
@@ -181,6 +183,10 @@ Private Sub B4XPage_Created (Root1 As B4XView)
 	Starter.skmt.ExecNonQuery("CREATE TABLE IF NOT EXISTS CAT_PROMOS_RUTA (CPR_IDALMACEN TEXT, CPR_RUTA TEXT, CPR_PROMO TEXT, CPR_CANT INT)")
 	
 	Subs.agregaColumna("PEDIDO", "PE_ENVIO_OK", "TEXT")
+	
+	'Revisamos si se disparo el intent de cargar la base de datos desde WhatApp.
+	If s.traeUsarIntentBDWA Then s.importaBDDesdeWhatsApp
+	
 	Try 'Intentamos usar "pragma_table_info" para revisar si existe la columna "CAT_CL_DIASEMANA" en la tabla
 		c=Starter.skmt.ExecQuery("SELECT COUNT(*) AS fCol FROM pragma_table_info('kmt_info') WHERE name='CAT_CL_DIASEMANA'")
 		c.Position = 0
@@ -710,6 +716,14 @@ Sub i_engrane_Click
 	If user.Text = "KMTS1" Then lv_server.AddSingleLine("http://10.0.0.205:1781")
 '	l_server.Text = Starter.DBReqServer
 	et_server.Text = Starter.DBReqServer
+	Log(222)
+	cb_importarBDWA.Checked = s.traeUsarIntentBDWA
+	Log(333)
+	If user.Text.Trim = "KMTS1" Then
+		p_importarBDWA.Visible = True
+	Else
+		p_importarBDWA.Visible = False
+	End If
 	If user.Text = "KMTS1" Then b_importarBD.Visible = True Else b_importarBD.Visible = False
 	Subs.panelVisible(p_appUpdate,0,0)
 End Sub
@@ -755,11 +769,11 @@ Private Sub b_envioBD_Click
 	'copy the shared file to the shared folder
 	Log("xxxxxx:"&Provider.SharedFolder)
 	Sleep(1000)
-	File.Copy(File.DirInternal, FileName, Provider.SharedFolder, FileName)
+	File.Copy(File.DirInternal, FileName, Provider.SharedFolder, "kmt.mariana.db")
 	Dim email As Email
 	email.To.Add("cheveguerra@gmail.com")
 	email.Subject = "subject"
-	email.Attachments.Add(Provider.GetFileUri(FileName))
+	email.Attachments.Add(Provider.GetFileUri("kmt.mariana.db"))
 '	email.Attachments.Add(Provider.GetFileUri(FileName)) 'second attachment
 	Dim in As Intent = email.GetIntent
 	in.Flags = 1 'FLAG_GRANT_READ_URI_PERMISSION
@@ -783,4 +797,10 @@ Private Sub b_importarBD_Click
 	File.Copy(Result.Dir, Result.FileName, File.DirInternal, "kmt.db") 'Copia la base de datos seleccionada al directorio interno.
 	Starter.skmt.Initialize(Starter.ruta,"kmt.db", True) 'Reiniciliza la base de datos con la recien importada.
 	ToastMessageShow("¡BD importada!", False)
-End Sub
+End Sub
+
+Private Sub cb_importarBDWA_CheckedChange(Checked As Boolean)
+'	LogColor($"cb_importarBDWA_CheckedChange = ${Checked}"$, Colors.Red)
+	Starter.skmt.ExecNonQuery("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'IMPORTAR_BD_WA'")
+	Starter.skmt.ExecNonQuery($"insert into CAT_VARIABLES (CAT_VA_DESCRIPCION, CAT_VA_VALOR) values ('IMPORTAR_BD_WA', '${Checked}')"$)
+End Sub

B4A/C_Subs.bas

@@ -19,6 +19,8 @@ Sub Class_Globals
 	Dim reqsList As List
 	Dim reqError As Boolean = False
 	Private subsLogs As Boolean = False
+	Dim in As Intent
+	Dim intentUsado As Boolean = False
 End Sub
 
 'You can add more parameters here.
@@ -604,4 +606,49 @@ Sub borraPedidoClienteActual As String
 	Starter.skmt.ExecNonQuery("delete from pedido where pe_cliente in (Select CUENTA from cuentaa)")
 	Starter.skmt.ExecNonQuery("UPDATE kmt_info set gestion = 0  where CAT_CL_CODIGO In (select cuenta from cuentaa)")
 	Return 1
+End Sub
+
+'Regresa si se debe de usar el intent de importar la base d datos desde Whatsapp. 
+Sub traeUsarIntentBDWA As Boolean 'ignore
+	Private BDWA As Boolean = False
+	Private x As Cursor = Starter.skmt.ExecQuery($"select CAT_VA_VALOR from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'IMPORTAR_BD_WA'"$)
+	If x.RowCount > 0 Then
+		x.Position = 0
+		If x.GetString("CAT_VA_VALOR") = "true" Then BDWA = True
+	End If
+'	Log($"cb_importarBDWA = ${BDWA}"$)
+	Return BDWA
+End Sub
+
+' Se revisa si hay una intención (intent) de abrir una base de datos y si es así, entonces se importa esa base de datos.
+Sub importaBDDesdeWhatsApp
+	Private tmpBDWA As Boolean = traeUsarIntentBDWA
+	If Not(in.IsInitialized) Then in = B4XPages.GetNativeParent(B4XPages.MainPage).GetStartingIntent ' Si se usa esta funcion en Mainpage, se pone "Me" en lugar de B4XPages.MainPage.
+	If Not(intentUsado) And in <> Null Then
+'		Log(in)
+		intentUsado = True
+'			Log(in.As(String))
+		If in.GetData <> Null Then
+			Dim XmlData As String
+			XmlData = in.GetData
+			Try
+				Dim OutStr As OutputStream = File.OpenOutput(File.DirInternal,"kmt.db",False)
+				Dim InStr As InputStream = File.OpenInput("ContentDir",XmlData)
+				File.Copy2(InStr,OutStr)
+				LogColor("BD copiada a interna.", Colors.Blue)
+				OutStr.Close
+				If in.As(String).Contains("whatsapp") Then ToastMessageShow("BD cargada desde Whatsapp", False)
+			Catch
+				Log(LastException)
+			End Try
+'				ExitApplication
+			db.ExecNonQuery("delete from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'IMPORTAR_BD_WA'")
+			db.ExecNonQuery($"insert into CAT_VARIABLES (CAT_VA_DESCRIPCION, CAT_VA_VALOR) values ('IMPORTAR_BD_WA', '${tmpBDWA}')"$)
+			Private a As Cursor = db.ExecQuery($"select CAT_VA_VALOR from CAT_VARIABLES where CAT_VA_DESCRIPCION = 'APP_NAME'"$)
+			If a.RowCount > 0 Then
+				a.Position = 0
+				ToastMessageShow($"BD de "${a.GetString("CAT_VA_VALOR")}" cargada."$, True)
+			End If
+		End If
+	End If
 End Sub

B4A/Mariana.b4a.meta

@@ -82,6 +82,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-NavigationStack=C_Nota,b_desc_Click,231,0,C_Nota,B4XPage_Appear,105,0,B4XMainPage,B4XPage_Created,173,0,Main,Activity_KeyPress,42,0,C_Principal,Class_Globals,0,0,C_Principal,p_marcascodigo_Click,2567,0,C_Principal,checaPedido,2568,0,C_Principal,B4XPage_Appear,312,0,C_Principal,B_OK_PAS_Click,2024,0,Main,Activity_ActionBarHomeClick,37,0,Main,Globals,24,0
+NavigationStack=B4XMainPage,i_engrane_Click,713,3,B4XMainPage,b_apk_Click,693,0,B4XMainPage,b_regesar_Click,724,0,Visual Designer,login.bal,-100,6,B4XMainPage,ocultaProgreso,705,0,B4XMainPage,b_importarBD_Click,790,0,B4XMainPage,CheckNotificationAccess,779,0,B4XMainPage,b_envioBD_Click,758,6,C_Principal,Class_Globals,219,0,C_Principal,JobDone,990,0,C_Principal,cargar_Click,989,0
 SelectedBuild=0
-VisibleModules=2,12,4,5,6,26,10,27,25,8
+VisibleModules=2,12,4,5,6,26,10,16