Skip to content

Commit af88444

Browse files
erikssoneriksson
committed
Merge branch 'message_sim_card'
* message_sim_card: refactor: empty string check use SIM1 and SIM2 instead of ISMS and ISMS2
2 parents 6974f1a + 4ce0e86 commit af88444

6 files changed

Lines changed: 23 additions & 23 deletions

File tree

‎android/app/src/main/java/com/httpsms/SmsManagerService.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ class SmsManagerService {
4343
context.getSystemService(SubscriptionManager::class.java)
4444
}
4545

46-
val subscriptionId = if (sim == "ISMS" && localSubscriptionManager.activeSubscriptionInfoList.size > 0) {
46+
val subscriptionId = if (sim == "SIM1" && localSubscriptionManager.activeSubscriptionInfoList.size > 0) {
4747
localSubscriptionManager.activeSubscriptionInfoList[0].subscriptionId
48-
} else if (sim == "ISMS2" && localSubscriptionManager.activeSubscriptionInfoList.size > 1) {
48+
} else if (sim == "SIM2" && localSubscriptionManager.activeSubscriptionInfoList.size > 1) {
4949
localSubscriptionManager.activeSubscriptionInfoList[1].subscriptionId
5050
} else{
5151
SubscriptionManager.getDefaultSmsSubscriptionId()

‎api/pkg/entities/message.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ const (
6363
type SIM string
6464

6565
const (
66-
// ISMS_1 use the SIM card in slot 1 to send the message
67-
ISMS_1 = SIM("ISMS")
68-
// ISMS_2 use the SIM card in slot 2 to send the message
69-
ISMS_2 = SIM("ISMS2")
70-
// DEFAULT use the SIM card configured as default communication card to send the message
71-
ISMS_DEFAULT = SIM("DEFAULT")
66+
// SIM_1 use the SIM card in slot 1 to send the message
67+
SIM_1 = SIM("SIM1")
68+
// SIM_2 use the SIM card in slot 2 to send the message
69+
SIM_2 = SIM("SIM2")
70+
// SIM_DEFAULT use the SIM card configured as default communication card to send the message
71+
SIM_DEFAULT = SIM("DEFAULT")
7272
)
7373

7474
// Message represents a message sent between 2 phone numbers

‎api/pkg/requests/message_bulk_send_request.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ func (input *MessageBulkSend) Sanitize() MessageBulkSend {
2929
}
3030
input.To = to
3131
input.From = input.sanitizeAddress(input.From)
32-
if len(strings.TrimSpace(string(input.SIM))) == 0 {
33-
input.SIM = entities.ISMS_DEFAULT
32+
if strings.TrimSpace(string(input.SIM)) == "" {
33+
input.SIM = entities.SIM_DEFAULT
3434
}
3535
return *input
3636
}

‎api/pkg/requests/message_receive_request.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ type MessageReceive struct {
2727
func (input *MessageReceive) Sanitize() MessageReceive {
2828
input.To = input.sanitizeAddress(input.To)
2929
input.From = input.sanitizeAddress(input.From)
30-
if len(strings.TrimSpace(string(input.SIM))) == 0 {
31-
input.SIM = entities.ISMS_DEFAULT
30+
if strings.TrimSpace(string(input.SIM)) == "" {
31+
input.SIM = entities.SIM_DEFAULT
3232
}
3333
return *input
3434
}

‎api/pkg/requests/message_send_request.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ type MessageSend struct {
2525
func (input *MessageSend) Sanitize() MessageSend {
2626
input.To = input.sanitizeAddress(input.To)
2727
input.From = input.sanitizeAddress(input.From)
28-
if len(strings.TrimSpace(string(input.SIM))) == 0 {
29-
input.SIM = entities.ISMS_DEFAULT
28+
if strings.TrimSpace(string(input.SIM)) == "" {
29+
input.SIM = entities.SIM_DEFAULT
3030
}
3131
return *input
3232
}

‎api/pkg/validators/message_handler_validator.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ func (validator MessageHandlerValidator) ValidateMessageReceive(_ context.Contex
5858
"sim": []string{
5959
"required",
6060
"in:" + strings.Join([]string{
61-
string(entities.ISMS_1),
62-
string(entities.ISMS_2),
63-
string(entities.ISMS_DEFAULT),
61+
string(entities.SIM_1),
62+
string(entities.SIM_2),
63+
string(entities.SIM_DEFAULT),
6464
}, ","),
6565
},
6666
},
@@ -95,9 +95,9 @@ func (validator MessageHandlerValidator) ValidateMessageSend(ctx context.Context
9595
"sim": []string{
9696
"required",
9797
"in:" + strings.Join([]string{
98-
string(entities.ISMS_1),
99-
string(entities.ISMS_2),
100-
string(entities.ISMS_DEFAULT),
98+
string(entities.SIM_1),
99+
string(entities.SIM_2),
100+
string(entities.SIM_DEFAULT),
101101
}, ","),
102102
},
103103
},
@@ -149,9 +149,9 @@ func (validator MessageHandlerValidator) ValidateMessageBulkSend(ctx context.Con
149149
"sim": []string{
150150
"required",
151151
"in:" + strings.Join([]string{
152-
string(entities.ISMS_1),
153-
string(entities.ISMS_2),
154-
string(entities.ISMS_DEFAULT),
152+
string(entities.SIM_1),
153+
string(entities.SIM_2),
154+
string(entities.SIM_DEFAULT),
155155
}, ","),
156156
},
157157
},

0 commit comments

Comments
 (0)