From c4799a719b045b5f8ac6097c5511bc60334d0f2a Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Tue, 10 Dec 2024 13:38:07 +0530 Subject: [PATCH] [server] Fix next reminder time --- mobile/lib/emergency/emergency_page.dart | 2 +- mobile/lib/emergency/emergency_service.dart | 3 ++- server/pkg/repo/emergency/recovery.go | 6 +++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mobile/lib/emergency/emergency_page.dart b/mobile/lib/emergency/emergency_page.dart index bd8995886f..ba6e142dda 100644 --- a/mobile/lib/emergency/emergency_page.dart +++ b/mobile/lib/emergency/emergency_page.dart @@ -40,7 +40,7 @@ class EmergencyPage extends StatefulWidget { class _EmergencyPageState extends State { late int currentUserID; EmergencyInfo? info; - final Logger _logger = Logger('EmergencyPage'); + bool hasTrustedContact = false; @override diff --git a/mobile/lib/emergency/emergency_service.dart b/mobile/lib/emergency/emergency_service.dart index e4a147c65c..09c6c2816d 100644 --- a/mobile/lib/emergency/emergency_service.dart +++ b/mobile/lib/emergency/emergency_service.dart @@ -220,7 +220,8 @@ class EmergencyContactService { SetupSRPResponse.fromJson(response.data); final serverB = SRP6Util.decodeBigInt(base64Decode(setupSRPResponse.srpB)); - // ignore: need to calculate secret to get M1, unused_local_variable + + // ignore: unused_local_variable final clientS = client.calculateSecret(serverB); final clientM = client.calculateClientEvidenceMessage(); // ignore: unused_local_variable diff --git a/server/pkg/repo/emergency/recovery.go b/server/pkg/repo/emergency/recovery.go index f84478dc60..3e547babda 100644 --- a/server/pkg/repo/emergency/recovery.go +++ b/server/pkg/repo/emergency/recovery.go @@ -34,8 +34,12 @@ func (r RecoverRow) CanRecover() error { func (repo *Repository) InsertIntoRecovery(ctx *gin.Context, req ente.ContactIdentifier, row ContactRow) (bool, error) { waitTime := time.MicrosecondsAfterHours(row.NoticePeriodInHrs) + nextReminder := time.MicrosecondsAfterHours(row.NoticePeriodInHrs - 24) + if row.NoticePeriodInHrs < 25 { + nextReminder = time.Microseconds() + } result, err := repo.DB.ExecContext(ctx, `INSERT INTO emergency_recovery (id,user_id, emergency_contact_id, status, wait_till, next_reminder_at) VALUES ($1, $2, $3, $4, $5, $6) on conflict DO NOTHING`, - uuid.New(), req.UserID, req.EmergencyContactID, ente.RecoveryStatusWaiting, waitTime, row.NoticePeriodInHrs) + uuid.New(), req.UserID, req.EmergencyContactID, ente.RecoveryStatusWaiting, waitTime, nextReminder) if err != nil { return false, stacktrace.Propagate(err, "") }