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

Commit 43b44157 authored by Alexandre Roux's avatar Alexandre Roux
Browse files

auto mode choose first sim card when nothing else is available

parent ee285dd0
Loading
Loading
Loading
Loading
+5 −13
Original line number Diff line number Diff line
@@ -288,20 +288,12 @@ class SmsMapper extends Mapper {

	public function getSimCardList ($userId) {
		$simCardList = array();
		$sql = 'SELECT sms_card_number,  max(id) as id, sms_card_slot, sms_icc_id, sms_device_name, sms_carrier_name FROM `*PREFIX*esms_smsdatas` 
		group by sms_card_number,  sms_card_slot, sms_icc_id, sms_device_name, sms_carrier_name order by id DESC';
        $stmt = $this->db->prepare($sql);
		$result = $stmt->execute();

		$qb = $this->db->getQueryBuilder();
		$qb
		->groupBy('sms_card_number', 'sms_card_slot', 'sms_icc_id', 'sms_device_name', 'sms_carrier_name')	

		->select('sms_card_number', 'sms_card_slot', 'sms_icc_id', 'sms_device_name', 'sms_carrier_name')
		->from('esms_smsdatas')
			->where($qb->expr()->andX(
				$qb->expr()->eq('user_id', $qb->createNamedParameter($userId)),
				)
			);
		$result = $qb->execute();

		while ($row = $result->fetch()) {
		while ($row = $stmt->fetch()) {
			array_push($simCardList, array(
				"card_number" =>  $row["sms_card_number"],
				"card_slot" =>  $row["sms_card_slot"],
+2 −0
Original line number Diff line number Diff line
@@ -208,6 +208,8 @@ var Conversation = new Vue({
			else {
				//take last message
				var last = self.messages[self.messages.length - 1]
				if (last == undefined && SimCardList.list.length > 1)
					last = SimCardList.list[1]
				if (last != undefined) {
					sms['smsDatas'][0]['card_number'] = last['card_number'];
					sms['smsDatas'][0]['card_slot'] = last['card_slot'];