diff --git a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateNotifications.kt b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateNotifications.kt index c985929f8a..1f8958dc0b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateNotifications.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdateNotifications.kt @@ -83,7 +83,7 @@ object ApkUpdateNotifications { ServiceUtil.getNotificationManager(context).notify(NotificationIds.APK_UPDATE_FAILED_INSTALL, notification) } - fun showAutoUpdateSuccess(context: Context) { + fun showUpdateSuccess(context: Context, userInitiated: Boolean) { val pendingIntent = PendingIntent.getActivity( context, 0, @@ -93,9 +93,15 @@ object ApkUpdateNotifications { val appVersionName = context.packageManager.getPackageInfo(context.packageName, 0).versionName + val body = if (userInitiated) { + context.getString(R.string.ApkUpdateNotifications_manual_update_success_body, appVersionName) + } else { + context.getString(R.string.ApkUpdateNotifications_auto_update_success_body, appVersionName) + } + val notification = NotificationCompat.Builder(context, NotificationChannels.getInstance().APP_UPDATES) .setContentTitle(context.getString(R.string.ApkUpdateNotifications_auto_update_success_title)) - .setContentText(context.getString(R.string.ApkUpdateNotifications_auto_update_success_body, appVersionName)) + .setContentText(body) .setSmallIcon(R.drawable.ic_notification) .setColor(ContextCompat.getColor(context, R.color.core_ultramarine)) .setContentIntent(pendingIntent) diff --git a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdatePackageInstallerReceiver.kt b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdatePackageInstallerReceiver.kt index 8330aae4c5..56a0482012 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdatePackageInstallerReceiver.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/apkupdate/ApkUpdatePackageInstallerReceiver.kt @@ -39,7 +39,7 @@ class ApkUpdatePackageInstallerReceiver : BroadcastReceiver() { if (SignalStore.apkUpdate.lastApkUploadTime != SignalStore.apkUpdate.pendingApkUploadTime) { Log.i(TAG, "Update installed successfully! Updating our lastApkUploadTime to ${SignalStore.apkUpdate.pendingApkUploadTime}") SignalStore.apkUpdate.lastApkUploadTime = SignalStore.apkUpdate.pendingApkUploadTime - ApkUpdateNotifications.showAutoUpdateSuccess(context) + ApkUpdateNotifications.showUpdateSuccess(context, userInitiated) } else { Log.i(TAG, "Spurious 'success' notification?") } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index dd34fc2ddb..72dda52c79 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2651,6 +2651,7 @@ We will try again later. Signal successfully updated You were automatically updated to version %1$s. + You updated to version %1$s. Send message?