diff --git a/android/res/layout/part_details_header.xml b/android/res/layout/part_details_header.xml index 44d882cc..19c72a91 100644 --- a/android/res/layout/part_details_header.xml +++ b/android/res/layout/part_details_header.xml @@ -65,7 +65,7 @@ + android:layout_span="2" android:autoLink="web" /> diff --git a/android/src/org/transdroid/gui/DetailsListAdapter.java b/android/src/org/transdroid/gui/DetailsListAdapter.java index 0ea03df2..b17d2415 100644 --- a/android/src/org/transdroid/gui/DetailsListAdapter.java +++ b/android/src/org/transdroid/gui/DetailsListAdapter.java @@ -147,7 +147,7 @@ public class DetailsListAdapter extends MergeAdapter { (fineDetails != null && fineDetails.getErrors() != null && !fineDetails.getErrors().isEmpty()? "\n" + fineDetails.getErrorsText(): ""): (fineDetails != null && fineDetails.getErrors() != null && !fineDetails.getErrors().isEmpty()? fineDetails.getErrorsText(): null); - if (errorsText == null) { + if (errorsText == null || errorsText.equals("")) { errors.setText(""); errorshint.setText(""); } else { @@ -155,8 +155,9 @@ public class DetailsListAdapter extends MergeAdapter { if (showingErrors) { errorshint.setText(detailsFragment.getString(R.string.details_trackers_collapse)); } else { + String[] err = errorsText.split("\n"); errorshint.setText(detailsFragment.getString(R.string.details_trackers_expand, - errorsText.split("\n")[0])); + err.length >= 0? err[0]: "")); } } diff --git a/lib/src/org/transdroid/daemon/Transmission/TransmissionAdapter.java b/lib/src/org/transdroid/daemon/Transmission/TransmissionAdapter.java index f37bb74f..c25202fd 100644 --- a/lib/src/org/transdroid/daemon/Transmission/TransmissionAdapter.java +++ b/lib/src/org/transdroid/daemon/Transmission/TransmissionAdapter.java @@ -473,9 +473,11 @@ public class TransmissionAdapter implements IDaemonAdapter { // Error is a number, see https://trac.transmissionbt.com/browser/trunk/libtransmission/transmission.h#L1747 // We only consider it a real error if it is local (blocking), which is error code 3 boolean hasError = tor.getInt(RPC_ERROR) == 3; - String errorString = tor.getString(RPC_ERRORSTRING); - String commentString = tor.getString(RPC_COMMENT); - errorString = errorString == ""? commentString : errorString + "\n" + commentString; + String errorString = tor.getString(RPC_ERRORSTRING).trim(); + String commentString = tor.getString(RPC_COMMENT).trim(); + if (!commentString.equals("")) { + errorString = errorString.equals("")? commentString : errorString + "\n" + commentString; + } torrents.add(new Torrent( tor.getInt(RPC_ID), null,