Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'acra-fixes' into 'master'

Browse Source 
ACRA fixes

Closes #1074

See merge request !544
This commit is contained in:
Hans-Christoph Steiner 2017-06-26 10:13:54 +00:00
commit 61ab88f8ea
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/org/fdroid/fdroid/views/AppDetailsRecyclerViewAdapter.java
View File

@ -414,7 +414,8 @@ public class AppDetailsRecyclerViewAdapter
lastUpdateView.setVisibility(View.GONE); lastUpdateView.setVisibility(View.GONE);
} }
if (TextUtils.isEmpty(app.whatsNew)) { Apk suggestedApk = getSuggestedApk();
if (suggestedApk == null || TextUtils.isEmpty(app.whatsNew)) {
whatsNewView.setVisibility(View.GONE); whatsNewView.setVisibility(View.GONE);
} else { } else {
//noinspection deprecation Ignore deprecation because the suggested way is only available in API 24. //noinspection deprecation Ignore deprecation because the suggested way is only available in API 24.
@ -422,7 +423,7 @@ public class AppDetailsRecyclerViewAdapter
StringBuilder sbWhatsNew = new StringBuilder(); StringBuilder sbWhatsNew = new StringBuilder();
sbWhatsNew.append(whatsNewView.getContext().getString(R.string.details_new_in_version, sbWhatsNew.append(whatsNewView.getContext().getString(R.string.details_new_in_version,
getSuggestedApk().versionName).toUpperCase(locale)); suggestedApk.versionName).toUpperCase(locale));
sbWhatsNew.append("\n\n"); sbWhatsNew.append("\n\n");
sbWhatsNew.append(app.whatsNew); sbWhatsNew.append(app.whatsNew);
whatsNewView.setText(sbWhatsNew); whatsNewView.setText(sbWhatsNew);

2
app/src/main/java/org/fdroid/fdroid/views/main/CategoriesViewBinder.java
View File

@ -62,7 +62,7 @@ class CategoriesViewBinder implements LoaderManager.LoaderCallbacks<Cursor> {
} }
}); });
activity.getSupportLoaderManager().initLoader(LOADER_ID, null, this); activity.getSupportLoaderManager().restartLoader(LOADER_ID, null, this);
} }
@Override @Override