Update feedback URL (#1356)

* Update feedback URL

* Change references to NonTranslatableStringConstants

Author: SessionHero01

app/src/main/java/org/session/libsession/utilities/NonTranslatableStringConstants.kt

@@ -5,7 +5,6 @@ object NonTranslatableStringConstants {
     const val APP_NAME                   = "Session"
     const val SESSION_PRO                = "Session Pro"
     const val SESSION_DOWNLOAD_URL       = "https://getsession.org/download"
-    const val SESSION_FEEDBACK_URL       = "https://getsession.org/feedback-android"
     const val GIF                        = "GIF"
     const val OXEN_FOUNDATION            = "Oxen Foundation"
     const val NETWORK_NAME               = "Session Network"

app/src/main/java/org/thoughtcrime/securesms/InputBarDialogs.kt

@@ -66,7 +66,7 @@ fun InputBarDialogs(
             SimpleSessionProCTA(
                 heroImage = R.drawable.cta_hero_char_limit,
                 text = Phrase.from(LocalContext.current, R.string.proCallToActionLongerMessages)
-                    .put(APP_PRO_KEY, NonTranslatableStringConstants.SESSION_PRO)
+                    .put(APP_PRO_KEY, NonTranslatableStringConstants.APP_PRO)
                     .format()
                     .toString(),
                 features = listOf(

app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt

@@ -885,7 +885,7 @@ class SettingsActivity : ScreenLockActionBarActivity() {
                  heroImageBg = R.drawable.cta_hero_animated_bg,
                  heroImageAnimatedFg = R.drawable.cta_hero_animated_fg,
                  text = Phrase.from(LocalContext.current, R.string.proAnimatedDisplayPictureCallToActionDescription)
-                     .put(APP_PRO_KEY, NonTranslatableStringConstants.SESSION_PRO)
+                     .put(APP_PRO_KEY, NonTranslatableStringConstants.APP_PRO)
                      .format()
                      .toString(),
                  features = listOf(

app/src/main/java/org/thoughtcrime/securesms/reviews/ui/InAppReview.kt

@@ -16,15 +16,16 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.core.net.toUri
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import com.squareup.phrase.Phrase
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.collectLatest
+import network.loki.messenger.BuildConfig
 import network.loki.messenger.R
-import org.session.libsession.utilities.NonTranslatableStringConstants.SESSION_FEEDBACK_URL
 import org.session.libsession.utilities.StringSubstitutionConstants.APP_NAME_KEY
 import org.session.libsession.utilities.StringSubstitutionConstants.EMOJI_KEY
 import org.session.libsession.utilities.StringSubstitutionConstants.STORE_VARIANT_KEY
@@ -36,6 +37,8 @@ import org.thoughtcrime.securesms.ui.GetString
 import org.thoughtcrime.securesms.ui.OpenURLAlertDialog
 import org.thoughtcrime.securesms.ui.theme.LocalColors
 
+private const val SESSION_FEEDBACK_BASE_URL = "https://getsession.org/feedback?platform=android"
+
 @Composable
 fun InAppReview(
     uiStateFlow: Flow<InAppReviewViewModel.UiState>,
@@ -87,7 +90,12 @@ fun InAppReview(
 
             InAppReviewViewModel.UiState.ConfirmOpeningSurvey -> OpenURLAlertDialog(
                 onDismissRequest = { sendCommands(InAppReviewViewModel.UiCommand.CloseButtonClicked) },
-                url = SESSION_FEEDBACK_URL,
+                url = SESSION_FEEDBACK_BASE_URL
+                    .toUri()
+                    .buildUpon()
+                    .appendQueryParameter("version", BuildConfig.VERSION_NAME)
+                    .build()
+                    .toString(),
             )
             InAppReviewViewModel.UiState.ReviewLimitReached -> AlertDialog(
                 onDismissRequest = { sendCommands(InAppReviewViewModel.UiCommand.CloseButtonClicked) },

app/src/main/java/org/thoughtcrime/securesms/ui/Components.kt

@@ -928,12 +928,12 @@ fun PinProCTA(
         heroImage = R.drawable.cta_hero_pins,
         text = if(overTheLimit)
             Phrase.from(context,R.string.proCallToActionPinnedConversations)
-                .put(APP_PRO_KEY, NonTranslatableStringConstants.SESSION_PRO)
+                .put(APP_PRO_KEY, NonTranslatableStringConstants.APP_PRO)
                 .format()
                 .toString()
                 else
             Phrase.from(context,R.string.proCallToActionPinnedConversationsMoreThan)
-                .put(APP_PRO_KEY, NonTranslatableStringConstants.SESSION_PRO)
+                .put(APP_PRO_KEY, NonTranslatableStringConstants.APP_PRO)
                 .format()
                 .toString(),
         features = listOf(

app/src/main/java/org/thoughtcrime/securesms/ui/UserProfileModal.kt

@@ -282,7 +282,7 @@ fun UserProfileModal(
             heroImageAnimatedFg = R.drawable.cta_hero_generic_fg,
             text = Phrase.from(context,R.string.proUserProfileModalCallToAction)
                 .put(APP_NAME_KEY, context.getString(R.string.app_name))
-                .put(APP_PRO_KEY, NonTranslatableStringConstants.SESSION_PRO)
+                .put(APP_PRO_KEY, NonTranslatableStringConstants.APP_PRO)
                 .format()
                 .toString(),
             features = listOf(