UI improvements, linter

Signed-off-by: rapterjet2004 <[email protected]>

Author: rapterjet2004

app/src/main/java/com/nextcloud/talk/account/BrowserLoginActivity.kt

@@ -52,12 +52,14 @@ import okhttp3.FormBody
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
+import org.json.JSONException
 import org.json.JSONObject
 import java.io.IOException
 import java.util.concurrent.Executors
 import java.util.concurrent.ScheduledExecutorService
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
+import javax.net.ssl.SSLHandshakeException
 import javax.net.ssl.SSLSession
 
 @AutoInjector(NextcloudTalkApplication::class)
@@ -150,8 +152,8 @@ class BrowserLoginActivity : BaseActivity() {
                     launchDefaultWebBrowser(loginUrl)
                 }
                 token = jsonObject.getAsJsonObject("poll").get("token").asString
-            } catch (e: Exception) {
-                Log.d(TAG, "Error caught at anonymouslyPostLoginRequest: $e")
+            } catch (e: SSLHandshakeException) {
+                Log.e(TAG, "Error caught at anonymouslyPostLoginRequest: $e")
             }
         }
     }
@@ -229,8 +231,8 @@ class BrowserLoginActivity : BaseActivity() {
                         runOnUiThread { completeLoginFlow(response, status) }
                     }
                 }
-        } catch (e: Exception) {
-            Log.d(TAG, "Error caught at performLoginFlowV2: $e")
+        } catch (e: IllegalStateException) {
+            Log.e(TAG, "Error caught at performLoginFlowV2: $e")
         }
     }
 
@@ -251,8 +253,8 @@ class BrowserLoginActivity : BaseActivity() {
                 (status == HTTP_OK && !server.isEmpty() && !loginName.isEmpty() && !appPassword.isEmpty())
 
             parseAndLogin(loginData)
-        } catch (e: java.lang.Exception) {
-            Log.d(TAG, "Error caught at completeLoginFlow: $e")
+        } catch (e: JSONException) {
+            Log.e(TAG, "Error caught at completeLoginFlow: $e")
         }
 
         loginFlowExecutorService?.shutdown()

app/src/main/res/layout/activity_web_view_login.xml

@@ -3,27 +3,16 @@
   ~ Nextcloud Talk - Android Client
   ~
   ~ SPDX-FileCopyrightText: 2017 Mario Danic <[email protected]>
+  ~ SPDX-FileCopyrightText: 2025 Julius Linus <[email protected]>
   ~ SPDX-License-Identifier: GPL-3.0-or-later
 -->
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/colorPrimary"
     android:keepScreenOn="true"
     android:orientation="vertical">
 
-    <ImageView
-        android:id="@+id/image_logo"
-        android:layout_width="match_parent"
-        android:layout_height="96dp"
-        android:layout_marginHorizontal="@dimen/standard_margin"
-        android:layout_marginTop="185dp"
-        android:contentDescription="@string/nc_app_product_name"
-        android:scaleType="centerInside"
-        app:srcCompat="@drawable/ic_logo" />
-
     <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/progress_bar"
         android:layout_width="@dimen/item_height"
@@ -37,25 +26,33 @@
         android:indeterminateTint="@color/white"
         android:indeterminateTintMode="src_in" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/cancel_desc"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/progress_bar"
-        android:layout_marginTop="@dimen/standard_double_margin"
-        android:textAlignment="center"
-        android:text="@string/please_continue_the_login_process_in_the_browser"
-        android:layout_centerInParent="true"/>
+        android:layout_marginBottom="@dimen/standard_double_margin"
+        android:orientation="vertical"
+        android:layout_alignParentBottom="true">
 
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/cancel_desc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/standard_double_margin"
+            android:textAlignment="center"
+            android:layout_gravity="center"
+            android:textSize="@dimen/headline_text_size"
+            android:textColor="@color/white"
+            android:text="@string/please_continue_the_login_process_in_the_browser"
+            />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/cancel_login_btn"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/cancel_desc"
-        android:layout_marginTop="@dimen/standard_double_margin"
-        android:layout_centerInParent="true"
-        android:text="@string/cancel_login"
-        />
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/cancel_login_btn"
+            android:layout_width="300dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/standard_double_margin"
+            android:text="@string/cancel_login"
+            />
+    </LinearLayout>
 
 </RelativeLayout>