From 3b2fc905696d0dab756ec95261cd7292af0d298b Mon Sep 17 00:00:00 2001
From: Jannis Mattheis <contact@jmattheis.de>
Date: Fri, 8 Mar 2019 10:13:46 +0100
Subject: [PATCH] Show full url in connection string

---
 .../gotify/messages/MessagesActivity.java     | 18 ++++++++++-----
 app/src/main/res/layout/nav_header_drawer.xml | 22 ++++++++++++++-----
 app/src/main/res/values/dimens.xml            |  2 +-
 app/src/main/res/values/strings.xml           |  4 ++--
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/app/src/main/java/com/github/gotify/messages/MessagesActivity.java b/app/src/main/java/com/github/gotify/messages/MessagesActivity.java
index ed75074..8bd9f14 100644
--- a/app/src/main/java/com/github/gotify/messages/MessagesActivity.java
+++ b/app/src/main/java/com/github/gotify/messages/MessagesActivity.java
@@ -23,6 +23,7 @@ import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import butterknife.BindView;
 import butterknife.ButterKnife;
+import com.github.gotify.BuildConfig;
 import com.github.gotify.MissedMessageUtil;
 import com.github.gotify.R;
 import com.github.gotify.Settings;
@@ -53,7 +54,6 @@ import com.squareup.picasso.Target;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import okhttp3.HttpUrl;
 import okhttp3.OkHttpClient;
 
 import static java.util.Collections.emptyList;
@@ -200,12 +200,18 @@ public class MessagesActivity extends AppCompatActivity
 
         navigationView.setNavigationItemSelectedListener(this);
         View headerView = navigationView.getHeaderView(0);
-        TextView header = headerView.findViewById(R.id.header_username);
-        String host = HttpUrl.parse(settings.url()).host();
-        header.setText(getString(R.string.connection, settings.user().getName(), host));
 
-        TextView version = headerView.findViewById(R.id.header_versions);
-        version.setText(getString(R.string.server_version, settings.serverVersion()));
+        TextView user = headerView.findViewById(R.id.header_user);
+        user.setText(settings.user().getName());
+
+        TextView connection = headerView.findViewById(R.id.header_connection);
+        connection.setText(
+                getString(R.string.connection, settings.user().getName(), settings.url()));
+
+        TextView version = headerView.findViewById(R.id.header_version);
+        version.setText(
+                getString(R.string.versions, BuildConfig.VERSION_NAME, settings.serverVersion()));
+
         ImageButton refreshAll = headerView.findViewById(R.id.refresh_all);
         refreshAll.setOnClickListener(this::onRefreshAll);
     }
diff --git a/app/src/main/res/layout/nav_header_drawer.xml b/app/src/main/res/layout/nav_header_drawer.xml
index 32839ed..c365bf5 100644
--- a/app/src/main/res/layout/nav_header_drawer.xml
+++ b/app/src/main/res/layout/nav_header_drawer.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="@dimen/nav_header_height"
     android:layout_alignParentBottom="false"
@@ -21,25 +22,36 @@
         android:focusableInTouchMode="true"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
         android:scaleType="fitCenter"
-        app:layout_constraintBottom_toTopOf="@+id/header_versions"
+        app:layout_constraintBottom_toTopOf="@+id/header_user"
         app:layout_constraintStart_toStartOf="parent"
         app:srcCompat="@drawable/gotify" />
 
     <TextView
-        android:id="@+id/header_versions"
+        android:id="@+id/header_user"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
-        android:text="Gotify v1.0.0"
+        android:text="jmattheis"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        app:layout_constraintBottom_toTopOf="@+id/header_username"
+        app:layout_constraintBottom_toTopOf="@+id/header_connection"
         app:layout_constraintStart_toStartOf="parent" />
 
     <TextView
-        android:id="@+id/header_username"
+        android:id="@+id/header_connection"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="2dp"
+        android:text="admin@your.domain.de"
+        android:textSize="12sp"
+        app:layout_constraintBottom_toTopOf="@+id/header_version"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <TextView
+        android:id="@+id/header_version"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="admin@your.domain.de"
+        android:textSize="10sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index a445aca..1d92c4e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,5 +3,5 @@
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">16dp</dimen>
     <dimen name="nav_header_vertical_spacing">8dp</dimen>
-    <dimen name="nav_header_height">176dp</dimen>
+    <dimen name="nav_header_height">196dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c55b3ab..bb40d50 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -48,8 +48,7 @@
     <string name="websocket_listening">Listening to %s</string>
     <string name="websocket_could_not_connect">Could not connect %s</string>
     <string name="websocket_init">Initializing</string>
-    <string name="connection">%s@%s</string>
-    <string name="server_version">Gotify-Server v%s</string>
+    <string name="versions">gotify/android v%s; gotify/server v%s</string>
     <string name="advanced_settings">Advanced Settings</string>
     <string name="done">Done</string>
     <string name="no_certificate_selected">No certificate selected</string>
@@ -58,4 +57,5 @@
     <string name="http_warning">Using http is insecure and it\'s recommend to use https instead. Use your favorite search engine to get more information about this topic.</string>
     <string name="i_understand">I Understand</string>
     <string name="websocket_no_network">Waiting for network</string>
+    <string name="connection">%s@%s</string>
 </resources>