Skip to content

Commit ff83383

Browse files
AchoArnoldAchoArnold
committed
Fix send message box
1 parent 1004375 commit ff83383

5 files changed

Lines changed: 43 additions & 32 deletions

File tree

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,6 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
7171
return Result.failure()
7272
}
7373

74-
Receiver.registerReceivers(applicationContext)
75-
7674
val owner = Settings.getOwner(applicationContext) ?: return Result.failure()
7775
val message = getMessage(applicationContext, owner) ?: return Result.failure()
7876

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import android.app.NotificationChannel
77
import android.app.NotificationManager
88
import android.content.Context
99
import android.content.Intent
10+
import android.content.IntentFilter
1011
import android.content.pm.PackageManager
1112
import android.os.Bundle
1213
import android.telephony.PhoneNumberUtils
@@ -23,6 +24,9 @@ import java.util.*
2324

2425

2526
class MainActivity : AppCompatActivity() {
27+
private val sentReceiver = SentReceiver()
28+
private val deliveredReceiver = DeliveredReceiver()
29+
2630
override fun onCreate(savedInstanceState: Bundle?) {
2731
super.onCreate(savedInstanceState)
2832

@@ -40,7 +44,8 @@ class MainActivity : AppCompatActivity() {
4044
setActiveStatus(this)
4145
registerListeners()
4246
refreshToken(this)
43-
Receiver.registerReceivers(this)
47+
48+
registerReceivers(this)
4449
}
4550

4651
override fun onResume() {
@@ -50,6 +55,18 @@ class MainActivity : AppCompatActivity() {
5055
refreshToken(this)
5156
}
5257

58+
fun registerReceivers(context: Context) {
59+
context.registerReceiver(
60+
this.sentReceiver,
61+
IntentFilter(SmsManagerService.ACTION_SMS_SENT)
62+
)
63+
context.registerReceiver(
64+
this.deliveredReceiver,
65+
IntentFilter(SmsManagerService.ACTION_SMS_DELIVERED)
66+
)
67+
Settings.setReceiverRegistered(context, true)
68+
}
69+
5370
private fun refreshToken(context: Context) {
5471
if(!Settings.isLoggedIn(context)) {
5572
Timber.w("cannot refresh token because owner is not logged in")

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

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.httpsms
22

33
import android.content.Context
4-
import android.content.IntentFilter
54
import timber.log.Timber
65

76

@@ -23,28 +22,4 @@ object Receiver {
2322
}
2423
return true
2524
}
26-
27-
fun registerReceivers(context: Context) {
28-
try {
29-
context.unregisterReceiver(SentReceiver())
30-
} catch (error: IllegalArgumentException ) {
31-
Timber.e(error)
32-
}
33-
34-
context.registerReceiver(
35-
SentReceiver(),
36-
IntentFilter(SmsManagerService.ACTION_SMS_SENT)
37-
)
38-
39-
try {
40-
context.unregisterReceiver(DeliveredReceiver())
41-
} catch (error: IllegalArgumentException ) {
42-
Timber.e(error)
43-
}
44-
45-
context.registerReceiver(
46-
DeliveredReceiver(),
47-
IntentFilter(SmsManagerService.ACTION_SMS_DELIVERED)
48-
)
49-
}
5025
}

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ object Settings {
1111
private const val SETTINGS_ACTIVE = "SETTINGS_ACTIVE_STATUS"
1212
private const val SETTINGS_API_KEY = "SETTINGS_API_KEY"
1313
private const val SETTINGS_FCM_TOKEN = "SETTINGS_FCM_TOKEN"
14+
private const val SETTINGS_RECEIVER_REGISTERED = "SETTINGS_RECEIVER_REGISTERED"
1415
private const val SETTINGS_FCM_TOKEN_UPDATE_TIMESTAMP = "SETTINGS_FCM_TOKEN_UPDATE_TIMESTAMP"
1516

1617
fun getOwner(context: Context): String? {
@@ -135,4 +136,24 @@ object Settings {
135136
.putString(this.SETTINGS_FCM_TOKEN, apiKey)
136137
.apply()
137138
}
139+
140+
fun getReceiverRegistered(context: Context): Boolean{
141+
Timber.d(Settings::getReceiverRegistered.name)
142+
143+
val receiverRegistered = PreferenceManager
144+
.getDefaultSharedPreferences(context)
145+
.getBoolean(this.SETTINGS_RECEIVER_REGISTERED,false)
146+
147+
Timber.d("SETTINGS_RECEIVER_REGISTERED: [$receiverRegistered]")
148+
return receiverRegistered
149+
}
150+
151+
fun setReceiverRegistered(context: Context, registered: Boolean) {
152+
Timber.d(Settings::setReceiverRegistered.name)
153+
154+
PreferenceManager.getDefaultSharedPreferences(context)
155+
.edit()
156+
.putBoolean(this.SETTINGS_RECEIVER_REGISTERED, registered)
157+
.apply()
158+
}
138159
}

‎web/pages/threads/_id.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,23 +135,23 @@
135135
lazy-validation
136136
@submit.prevent="sendMessage"
137137
>
138-
<v-textarea
138+
<v-text-field
139139
ref="messageInput"
140140
v-model="formMessage"
141141
:disabled="submitting"
142-
:rows="2"
142+
:rows="1"
143143
filled
144144
class="no-scrollbar"
145145
:rules="formMessageRules"
146146
placeholder="Type your message here"
147147
rounded
148148
@keydown.enter="sendMessage"
149-
></v-textarea>
149+
></v-text-field>
150150
<v-btn
151151
:disabled="submitting"
152152
type="submit"
153153
color="primary"
154-
class="pa-5 white--text ml-2 mt-1"
154+
class="white--text ml-2"
155155
fab
156156
>
157157
<v-progress-circular

0 commit comments

Comments
 (0)