Improved layout of login GUI

4 files changed, 18 insertions, 20 deletions

diff --git a/res/layout/gpodnetauth_credentials.xml b/res/layout/gpodnetauth_credentials.xml
index 8d32a5e2b..b66fc9414 100644
--- a/res/layout/gpodnetauth_credentials.xml
+++ b/res/layout/gpodnetauth_credentials.xml
@@ -53,13 +53,15 @@
 
     <TextView
         android:id="@+id/txtvError"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_below="@id/etxtPassword"
         android:layout_alignParentLeft="true"
-        android:layout_alignBottom="@id/butLogin"
+        android:layout_toLeftOf="@id/butLogin"
         android:textColor="@color/download_failed_red"
-        android:textSize="@dimen/text_size_medium"
+        android:textSize="@dimen/text_size_small"
+        android:maxLines="2"
+        android:ellipsize="end"
         android:gravity="center"
         android:layout_margin="16dp"/>
 
@@ -67,10 +69,9 @@
         android:id="@+id/progBarLogin"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_toLeftOf="@id/butLogin"
-        android:layout_below="@id/etxtPassword"
-        android:layout_alignBottom="@id/butLogin"
-        android:visibility="gone"/>
+        android:visibility="gone"
+        android:layout_alignTop="@+id/butLogin"
+        android:layout_toLeftOf="@+id/butLogin"/>
 
     <TextView
         android:layout_width="match_parent"
diff --git a/res/layout/gpodnetauth_device.xml b/res/layout/gpodnetauth_device.xml
index 21f2ef295..ac08cb5ad 100644
--- a/res/layout/gpodnetauth_device.xml
+++ b/res/layout/gpodnetauth_device.xml
@@ -66,11 +66,9 @@
         android:id="@+id/progbarCreateDevice"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_below="@id/etxtCaption"
-        android:layout_alignBottom="@id/butCreateNewDevice"
+        android:layout_alignTop="@id/butCreateNewDevice"
+        android:layout_toLeftOf="@id/butCreateNewDevice"
         android:textColor="@color/download_failed_red"
-        android:layout_margin="16dp"
         android:textSize="@dimen/text_size_medium"
         android:visibility="gone"
         />
@@ -87,12 +85,12 @@
 
     <Button
         android:id="@+id/butChooseExistingDevice"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_margin="16dp"
         android:text="@string/gpodnetauth_device_butChoose"
-        android:layout_alignTop="@+id/spinnerChooseDevice"
-        android:layout_alignRight="@+id/txtvChooseExistingDevice"/>
+        android:layout_below="@+id/spinnerChooseDevice"
+        android:layout_alignLeft="@+id/butCreateNewDevice"
+        android:layout_alignRight="@+id/butCreateNewDevice"/>
 
     <Spinner
         android:id="@+id/spinnerChooseDevice"
@@ -100,8 +98,7 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/txtvChooseExistingDevice"
         android:layout_alignParentLeft="true"
-        android:layout_toLeftOf="@id/butChooseExistingDevice"
-
-        android:layout_margin="16dp"/>
+        android:layout_margin="8dp"
+        android:layout_alignParentRight="true"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/de/danoeh/antennapod/activity/PreferenceActivity.java b/src/de/danoeh/antennapod/activity/PreferenceActivity.java
index 517e71158..da3f0a660 100644
--- a/src/de/danoeh/antennapod/activity/PreferenceActivity.java
+++ b/src/de/danoeh/antennapod/activity/PreferenceActivity.java
@@ -187,7 +187,6 @@ public class PreferenceActivity extends android.preference.PreferenceActivity {
                 return true;
             }
         });
-        updateGpodnetPreferenceScreen();
         buildUpdateIntervalPreference();
         buildAutodownloadSelectedNetworsPreference();
         setSelectedNetworksEnabled(UserPreferences
@@ -244,6 +243,7 @@ public class PreferenceActivity extends android.preference.PreferenceActivity {
         checkItemVisibility();
         setEpisodeCacheSizeText(UserPreferences.getEpisodeCacheSize());
         setDataFolderText();
+        updateGpodnetPreferenceScreen();
     }
 
     @SuppressWarnings("deprecation")
diff --git a/src/de/danoeh/antennapod/gpoddernet/GpodnetService.java b/src/de/danoeh/antennapod/gpoddernet/GpodnetService.java
index 4c922d12b..7e0a34e0b 100644
--- a/src/de/danoeh/antennapod/gpoddernet/GpodnetService.java
+++ b/src/de/danoeh/antennapod/gpoddernet/GpodnetService.java
@@ -616,7 +616,7 @@ public class GpodnetService {
         int responseCode = response.getStatusLine().getStatusCode();
         if (responseCode != HttpStatus.SC_OK) {
             if (responseCode == HttpStatus.SC_UNAUTHORIZED) {
-                throw new GpodnetServiceAuthenticationException();
+                throw new GpodnetServiceAuthenticationException("Wrong username or password");
             } else {
                 throw new GpodnetServiceBadStatusCodeException(
                         "Bad response code: " + responseCode, responseCode);