VPN-5697 - Allow account deletion on Android (#8279)

* VPN-5697 - add account deletion to Android and fix up UI * add missing android library * PR feedback
mozilla-mobile · Oct 13, 2023 · bbbaf01 · bbbaf01
1 parent 3206e02
commit bbbaf01
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/nebula/ui/components/inAppAuth/MZInAppAuthenticationBase.qml b/nebula/ui/components/inAppAuth/MZInAppAuthenticationBase.qml
@@ -14,6 +14,7 @@ import components.forms 0.1
 MZFlickable {
     property var _menuButtonOnClick
     property bool _changeEmailLinkVisible: false
+    property bool _disclaimersVisible: true
     property string _viewObjectName: ""
 
     property alias _menuButtonImageSource: menuButtonImage.source
@@ -142,6 +143,7 @@ MZFlickable {
 
                 MZSubtitle {
                     id: subtitle
+                    visible: _subtitleText.length > 0
                     width: undefined
                     Layout.fillWidth: true
                 }
@@ -150,6 +152,7 @@ MZFlickable {
 
             MZBoldLabel {
                 id: inputLabel
+                visible: inputLabel.text.length > 0
             }
 
             ColumnLayout {
@@ -160,6 +163,7 @@ MZFlickable {
 
         ColumnLayout {
             id: disclaimers
+            visible: _disclaimersVisible
             Layout.maximumWidth: col.width - MZTheme.theme.vSpacing * 2
             Layout.leftMargin: MZTheme.theme.vSpacing
             Layout.rightMargin: MZTheme.theme.vSpacing

diff --git a/src/cmake/android.cmake b/src/cmake/android.cmake
@@ -51,6 +51,7 @@ set_property(TARGET mozillavpn PROPERTY QT_ANDROID_EXTRA_LIBS
     ${Qt6_DIR}/../../libQt6Widgets_${ANDROID_ABI}.so
     ${Qt6_DIR}/../../libQt6Xml_${ANDROID_ABI}.so
     ${Qt6_DIR}/../../libQt6Test_${ANDROID_ABI}.so
+    ${Qt6_DIR}/../../libQt6Svg_${ANDROID_ABI}.so
      ## --- END PILE OF SHAME --- ##
 
     ${OPENSSL_LIBS_DIR}/libcrypto.so

diff --git a/src/featurelist.h b/src/featurelist.h
@@ -17,7 +17,7 @@ FEATURE(accountDeletion,        // Feature ID
         FeatureCallback_true,   // Can be flipped on
         FeatureCallback_false,  // Can be flipped off
         QStringList(),          // feature dependencies
-        FeatureCallback_accountDeletion)
+        FeatureCallback_iosOrAndroid)
 
 FEATURE(addon,                 // Feature ID
         "Addon support",       // Feature name

diff --git a/src/featurelistcallback.h b/src/featurelistcallback.h
@@ -48,14 +48,6 @@ bool FeatureCallback_sentry() {
 #endif
 }
 
-bool FeatureCallback_accountDeletion() {
-#if defined(MZ_IOS)
-  return true;
-#else
-  return false;
-#endif
-}
-
 bool FeatureCallback_captivePortal() {
 #if defined(MZ_LINUX) || defined(MZ_MACOS) || defined(MZ_WINDOWS) || \
     defined(MZ_DUMMY) || defined(MZ_WASM)

diff --git a/src/ui/deleteAccount/ViewDeleteAccountRequest.qml b/src/ui/deleteAccount/ViewDeleteAccountRequest.qml
@@ -39,6 +39,7 @@ MZInAppAuthenticationBase {
     property bool allowAccountDeletion: false
 
     _changeEmailLinkVisible: false
+    _disclaimersVisible: false
     _viewObjectName: "authDeleteAccountRequest"
     _menuButtonAccessibleName: MZI18n.GlobalGoBack
     _menuButtonImageSource: "qrc:/nebula/resources/back.svg"
@@ -51,6 +52,7 @@ MZInAppAuthenticationBase {
 
     _inputs: ColumnLayout {
         objectName: "accountDeletionLayout"
+        spacing: MZTheme.theme.vSpacingSmall
         MZTextBlock {
             objectName: "accountDeletionLabel"
             color: MZTheme.theme.fontColor
@@ -59,9 +61,10 @@ MZInAppAuthenticationBase {
                 .arg("<b style='color:" + MZTheme.theme.fontColorDark + ";'>"
                     + MZAuthInApp.emailAddress + "</b>")
             textFormat: Text.RichText
+            font.pixelSize: MZTheme.theme.fontSize
 
             Layout.fillWidth: true
-            Layout.bottomMargin: MZTheme.theme.vSpacing
+            Layout.bottomMargin: MZTheme.theme.listSpacing
         }
 
         Repeater {
@@ -100,10 +103,8 @@ MZInAppAuthenticationBase {
         MZLinkButton {
             Layout.fillWidth: true
 
-            fontName: MZTheme.theme.fontBoldFamily
             // Cancel
             labelText: MZI18n.InAppSupportWorkflowSupportSecondaryActionText
-            linkColor: MZTheme.theme.redLinkButton
             onClicked: {
                 cancelAuthenticationFlow();
             }