From ec073552bd9d2c465b4645505de48980f525635f Mon Sep 17 00:00:00 2001
From: Johannes Marbach <johannesm@element.io>
Date: Thu, 23 Jun 2022 10:47:39 +0200
Subject: [PATCH 1/2] Expose pusher profile tag in advanced settings

Signed-off-by: Johannes Marbach <johannesm@element.io>
---
 changelog.d/6369.feature                        |  2 ++
 .../features/settings/push/PushGatewayItem.kt   |  3 +++
 vector/src/main/res/layout/item_pushgateway.xml | 17 +++++++++++++++++
 vector/src/main/res/values/strings.xml          |  1 +
 4 files changed, 23 insertions(+)
 create mode 100644 changelog.d/6369.feature

diff --git a/changelog.d/6369.feature b/changelog.d/6369.feature
new file mode 100644
index 0000000000..3c3e936dfd
--- /dev/null
+++ b/changelog.d/6369.feature
@@ -0,0 +1,2 @@
+ Expose pusher profile tag in advanced settings
+ 
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
index ae163eee0d..03eb581b7f 100644
--- a/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/push/PushGatewayItem.kt
@@ -48,6 +48,7 @@ abstract class PushGatewayItem : EpoxyModelWithHolder<PushGatewayItem.Holder>()
         holder.appName.text = pusher.appDisplayName
         holder.url.setTextOrHide(pusher.data.url, hideWhenBlank = true, holder.urlTitle)
         holder.format.setTextOrHide(pusher.data.format, hideWhenBlank = true, holder.formatTitle)
+        holder.profileTag.setTextOrHide(pusher.profileTag, hideWhenBlank = true, holder.profileTagTitle)
         holder.deviceName.text = pusher.deviceDisplayName
         holder.removeButton.setOnClickListener {
             interactions.onRemovePushTapped(pusher)
@@ -60,6 +61,8 @@ abstract class PushGatewayItem : EpoxyModelWithHolder<PushGatewayItem.Holder>()
         val deviceName by bind<TextView>(R.id.pushGatewayDeviceNameValue)
         val formatTitle by bind<View>(R.id.pushGatewayFormat)
         val format by bind<TextView>(R.id.pushGatewayFormatValue)
+        val profileTagTitle by bind<TextView>(R.id.pushGatewayProfileTag)
+        val profileTag by bind<TextView>(R.id.pushGatewayProfileTagValue)
         val urlTitle by bind<View>(R.id.pushGatewayURL)
         val url by bind<TextView>(R.id.pushGatewayURLValue)
         val appName by bind<TextView>(R.id.pushGatewayAppNameValue)
diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index c43f9eea7c..c9a63e3335 100644
--- a/vector/src/main/res/layout/item_pushgateway.xml
+++ b/vector/src/main/res/layout/item_pushgateway.xml
@@ -125,6 +125,23 @@
         android:textStyle=""
         tools:text="event_id_only" />
 
+    <TextView
+        android:id="@+id/pushGatewayProfileTag"
+        style="@style/Widget.Vector.TextView.Body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="4dp"
+        android:text="@string/push_gateway_item_profile_tag"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/pushGatewayProfileTagValue"
+        style="@style/Widget.Vector.TextView.Body"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="16dp"
+        android:textStyle="" />
+
     <Button
         android:id="@+id/pushGatewayDeleteButton"
         android:layout_width="wrap_content"
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 852de7317c..0e959a9564 100644
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -1657,6 +1657,7 @@
     <string name="push_gateway_item_device_name">session_name:</string>
     <string name="push_gateway_item_url">Url:</string>
     <string name="push_gateway_item_format">Format:</string>
+    <string name="push_gateway_item_profile_tag">Profile tag:</string>
 
     <string name="preference_voice_and_video">Voice &amp; Video</string>
     <string name="preference_root_help_about">Help &amp; About</string>

From 231bd6292acfe8a1569baa1387542109a7f4300b Mon Sep 17 00:00:00 2001
From: Johannes Marbach <johannesm@element.io>
Date: Thu, 23 Jun 2022 12:13:56 +0200
Subject: [PATCH 2/2] Remove empty textStyle properties

Signed-off-by: Johannes Marbach <johannesm@element.io>
---
 vector/src/main/res/layout/item_pushgateway.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/vector/src/main/res/layout/item_pushgateway.xml b/vector/src/main/res/layout/item_pushgateway.xml
index c9a63e3335..afc40e5b7a 100644
--- a/vector/src/main/res/layout/item_pushgateway.xml
+++ b/vector/src/main/res/layout/item_pushgateway.xml
@@ -32,7 +32,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
-        android:textStyle=""
         tools:text="im.vector.app.android" />
 
     <TextView
@@ -50,7 +49,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
-        android:textStyle=""
         tools:text="fBbCDxVa-n8:APA91bE0wGY4ijpj-LQkkmjJYhNp2vA_9Xvabh02xaTKua9WA9wpNZwxfHdsbIDWthVXKPFTNcCl75ek1kqMGOggnUwnSCj-8ReF4G69pZVUhz-" />
 
     <TextView
@@ -68,7 +66,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
-        android:textStyle=""
         tools:text="EBMDOLFJD" />
 
     <TextView
@@ -86,7 +83,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
-        android:textStyle=""
         tools:text="EBMDOLFJD" />
 
     <TextView
@@ -104,7 +100,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
-        android:textStyle=""
         tools:text="EBMDOLFJD" />
 
     <TextView
@@ -122,7 +117,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="16dp"
-        android:textStyle=""
         tools:text="event_id_only" />
 
     <TextView
@@ -139,8 +133,7 @@
         style="@style/Widget.Vector.TextView.Body"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:textStyle="" />
+        android:layout_marginBottom="16dp" />
 
     <Button
         android:id="@+id/pushGatewayDeleteButton"