added additional error messages

Author: RaNaN

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
  package="org.pyload.android.client"
- android:versionCode="14"
- android:versionName="0.3.1">
+ android:versionCode="15"
+ android:versionName="0.3.2">
 
  <uses-sdk android:minSdkVersion="7"
  android:targetSdkVersion="17"/>
@@ -97,6 +97,5 @@
 
  <activity android:name=".RemoteSettings" android:label="@string/remotesettings_activity"/>
 
-
  </application>
 </manifest>

Changelog.md

@@ -1,14 +1,14 @@
-Changelog
-=========
+0.3.2:
+* More detailed error messages, when no connection can be established
+* TODO: Fixed refreshing of remote settings
+* TODO: Fixed reported crashes
 
-0.3.1
------
- - fixed captcha inputs
+0.3.1:
+* fixed captcha inputs
 
-0.3.0
------
- - Updated design to Holo theme
- - ActionBar for Android ICS and above
- - Allow to send links to pyLoad app
- - Improved performance, reduced footprint
+0.3.0:
+* Updated design to Holo theme
+* ActionBar for Android ICS and above
+* Allow to send links to pyLoad app
+* Improved performance, reduced footprint
 

proguard-project.txt

@@ -26,3 +26,9 @@
 -keepclasseswithmembers class org.apache.commons.codec.binary.** {
  *;
 }
+
+# java.lang.NoSuchMethodError: android.app.ActionBar.setHomeButtonEnabled
+# Derived from error reports, no clue how to reproduce it
+-keep class android.app.ActionBar {
+ public void set*(...);
+}

res/values/strings.xml

@@ -59,13 +59,15 @@
  <string name="ssl">SSL Connection</string>
  <string name="ssl_desc">Establish a secure connection to the core if you activated SSL</string>
  <string name="ssl_validate">Validate SSL Certificate</string>
- <string name="ssl_validate_desc">If "SSL Connection" is enabled, check that the certificate presented by the core is signed by a CA known by Android</string>
+ <string name="ssl_validate_desc">If "SSL Connection" is enabled, check that the certificate presented by the core is
+ signed by a CA known by Android
+ </string>
  <string name="old_server">Server version does not match, please use pyLoad %s.</string>
  <string name="choose_file">Container File</string>
  <string name="choose">Choose</string>
- <string name="current_dir">Current Dir: </string>
+ <string name="current_dir">Current Dir:</string>
  <string name="folder">Folder</string>
- <string name="file_size">File Size: </string>
+ <string name="file_size">File Size:</string>
  <string name="parent_dir">Parent Directory</string>
  <string name="eula_title">License</string>
  <string name="eula_accept">Accept</string>
@@ -89,4 +91,12 @@
  <string name="invalid">invalid</string>
  <string name="trafficleft">Traffic:</string>
  <string name="validuntil">Expires:</string>
+ <string name="certificate_error">SSL certificate not accepted. Add it to android or disable validation.</string>
+ <string name="connect_timeout">Connecting timed out. Please check that the server settings are correct.</string>
+ <string name="socket_error">Could not connect to target host. Check the server settings, your network configuration
+ or port forwarding.
+ </string>
+ <string name="connect_error">Could not connect to pyLoad. Check that pyLoad is running and server settings are
+ correct.
+ </string>
 </resources>

src/org/pyload/android/client/pyLoadApp.java

@@ -1,16 +1,16 @@
 package org.pyload.android.client;
 
 import java.io.IOException;
+import java.net.ConnectException;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.*;
 
 import android.annotation.TargetApi;
 import android.content.Context;
@@ -176,7 +176,7 @@ public void run() {
 
 public void onException() {
 client = null;
-Log.d("pyLoad", "Exception caught");
+ // The task queue will log an error with exception
 
 if (lastException instanceof TTransportException) {
 Toast t = Toast.makeText(this, R.string.lost_connection,
@@ -187,8 +187,20 @@ public void onException() {
 Toast.LENGTH_SHORT);
 t.show();
 } else if (lastException instanceof TException) {
-Toast t = Toast.makeText(this, R.string.no_connection,
-Toast.LENGTH_SHORT);
+ Throwable tr = findException(lastException);
+
+ Toast t;
+ if (tr instanceof SSLHandshakeException)
+ t = Toast.makeText(this, R.string.certificate_error, Toast.LENGTH_SHORT);
+ else if(tr instanceof SocketTimeoutException)
+ t = Toast.makeText(this, R.string.connect_timeout, Toast.LENGTH_SHORT);
+ else if(tr instanceof ConnectException)
+ t = Toast.makeText(this, R.string.connect_error, Toast.LENGTH_SHORT);
+ else if(tr instanceof SocketException)
+ t = Toast.makeText(this, R.string.socket_error, Toast.LENGTH_SHORT);
+ else
+ t = Toast.makeText(this, R.string.no_connection, Toast.LENGTH_SHORT);
+
 t.show();
 } else if (lastException instanceof WrongServer) {
 Toast t = Toast.makeText(this, String.format(
@@ -200,6 +212,21 @@ public void onException() {
 setProgress(false);
 }
 
+ /**
+ * Retrieves first root exception on stack of several TExceptions.
+ * @return the first exception not a TException or the last TException
+ */
+ private Throwable findException(Throwable e) {
+ // will not terminate when cycles occur, hopefully nobody cycle exception causes
+ while (e instanceof TException) {
+ if (e.getCause() == null) break;
+ if (e.getCause() == e) break; // just to avoid loop
+ e = e.getCause();
+ }
+
+ return e;
+ }
+
 final public Runnable handleSuccess = new Runnable() {
 @Override
 public void run() {