Merge branch 'master' into 'master'

fixes #2673 - use the correct toast message

Closes #2673

See merge request fdroid/fdroidclient!1314
This commit is contained in:
Torsten Grote
2023-12-12 12:15:56 +00:00

View File

@@ -474,16 +474,13 @@ public class AppDetailsActivity extends AppCompatActivity
case DownloadInterrupted:
if (justReceived) {
if (TextUtils.isEmpty(newStatus.errorText)) {
Toast.makeText(this, R.string.details_notinstalled, Toast.LENGTH_LONG).show();
} else {
String msg = newStatus.errorText;
if (!newStatus.getCanonicalUrl().equals(msg)) {
msg += " " + newStatus.getCanonicalUrl();
}
Toast.makeText(this, R.string.download_error, Toast.LENGTH_SHORT).show();
Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
String msg = getString(R.string.download_error);
if (!TextUtils.isEmpty(newStatus.errorText)) {
msg += "\n" + newStatus.errorText;
}
Toast.makeText(this, msg, Toast.LENGTH_LONG).show();
}
adapter.clearProgress();
break;