Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abab693b authored by Alexandre Roux's avatar Alexandre Roux
Browse files

fix auto sim selection

parent 394a6191

appinfo/database.xml

+0 −6
Original line number Diff line number Diff line
@@ -294,7 +294,6 @@ 
			<field>

				<name>address</name>

				<type>text</type>

				<notnull>true</notnull>

				<default></default>

				<length>15</length>

			</field>
@@ -308,35 +307,30 @@ 
			<field>

				<name>card_number</name>

				<type>text</type>

				<notnull>true</notnull>

				<default></default>

				<length>15</length>

			</field>

			<field>

				<name>card_slot</name>

				<type>integer</type>

				<notnull>true</notnull>

				<default>-1</default>

				<length>2</length>

			</field>

			<field>

				<name>icc_id</name>

				<type>text</type>

				<notnull>true</notnull>

				<default></default>

				<length>20</length>

			</field>

			<field>

				<name>device_name</name>

				<type>text</type>

				<notnull>true</notnull>

				<default></default>

				<length>20</length>

			</field>

			<field>

				<name>carrier_name</name>

				<type>text</type>

				<notnull>true</notnull>

				<default></default>

				<length>20</length>

			</field>

db/smsmapper.php

+2 −0
Original line number Diff line number Diff line
@@ -179,6 +179,8 @@ class SmsMapper extends Mapper { 
				$qb->expr()->eq('address', $qb->createNamedParameter($phoneNumber)),

			)

		)->execute();

		if($auto)

			return;

		$qb->insert('esms_selected_sim')

			->values(array(

				'user_id' => $qb->createNamedParameter($userId),

js/devel/conversation.js

+14 −6
Original line number Diff line number Diff line
@@ -130,6 +130,11 @@ var Conversation = new Vue({ 
						'id': id,

						'nc_id': vals['nc_id'],

						'db_id': vals['id'],

						'carrier_name': vals['carrier_name'],

						'card_number': vals['card_number'],

						'device_name': vals['device_name'],

						'card_slot': vals['card_slot'],

						'icc_id': vals['icc_id'],

						'sent': vals['sent'],

						'type': msgClass,

						'date': new Date(id * 1),
@@ -192,7 +197,8 @@ var Conversation = new Vue({ 
			sms['smsDatas'][0]['read'] = "true";

			sms['smsDatas'][0]['seen'] = "true";

			sms['smsDatas'][0]['address'] = Conversation.selectedContact.nav;

			if (SimCardList.selectedSim != "auto") {

			if (!SimCardList.selectedSim.auto) {



				sms['smsDatas'][0]['card_number'] = SimCardList.selectedSim['card_number'];

				sms['smsDatas'][0]['card_slot'] = SimCardList.selectedSim['card_slot'];

				sms['smsDatas'][0]['icc_id'] = "";
@@ -200,11 +206,13 @@ var Conversation = new Vue({ 
				sms['smsDatas'][0]['device_name'] = SimCardList.selectedSim['device_name'];

			}

			else {

				sms['smsDatas'][0]['card_number'] = "";

				sms['smsDatas'][0]['card_slot'] = 0;

				sms['smsDatas'][0]['icc_id'] = "";

				sms['smsDatas'][0]['carrier_name'] = "";

				sms['smsDatas'][0]['device_name'] = "";

				//take last message

				var last = self.messages[self.messages.length - 1]

				sms['smsDatas'][0]['card_number'] = last['card_number'];

				sms['smsDatas'][0]['card_slot'] = last['card_slot'];

				sms['smsDatas'][0]['icc_id'] = last['icc_id'];

				sms['smsDatas'][0]['carrier_name'] = last['carrier_name'];

				sms['smsDatas'][0]['device_name'] = last['device_name'];

			}

			sms['smsDatas'][0]['body'] = $("#esms-message").val();

			$("#esms-message").val("");

js/devel/sim_card_list.js

+2 −6
Original line number Diff line number Diff line
@@ -35,15 +35,16 @@ var SimCardList = new Vue({ 
		selectSimCard: function (card) {

			if (card != undefined)

				for (var sim of this.list) {



					if (sim['card_number'] == card['card_number'] &&

						sim['card_slot'] == card['card_slot'] &&

						sim['device_name'] == card['device_name'] &&

						sim['carrier_name'] == card['carrier_name']) {

						sim.checked = true;

						this.selectedSim = sim

					}

					else sim.checked = false;

				}

			this.selectedSim = card

			this.list.__ob__.dep.notify()



		},
@@ -66,11 +67,6 @@ var SimCardList = new Vue({ 
				}

				var sim = {}

				sim.text = "Auto"

				sim['card_number'] = ""

				sim['card_slot'] = ""

				sim['device_name'] = ""

				sim['carrier_name'] = ""

				sim['icc_id'] = ""

				sim.auto = true;

				sim.checked = true;

				self.list = [sim]