diff --git a/app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java b/app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java index 440d78f41..6c5ac02c3 100644 --- a/app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java +++ b/app/src/main/java/org/fdroid/fdroid/views/RepoDetailsActivity.java @@ -408,6 +408,7 @@ public class RepoDetailsActivity extends AppCompatActivity { TextView name = repoView.findViewById(R.id.text_repo_name); TextView numApps = repoView.findViewById(R.id.text_num_apps); TextView lastUpdated = repoView.findViewById(R.id.text_last_update); + TextView lastDownloaded = repoView.findViewById(R.id.text_last_update_downloaded); name.setText(repo.getName(App.getLocales())); disposable = Single.fromCallable(() -> appDao.getNumberOfAppsInRepository(repoId)) @@ -419,15 +420,21 @@ public class RepoDetailsActivity extends AppCompatActivity { setupRepoFingerprint(repoView, repo); setupCredentials(repoView, repo); - // Repos that existed before this feature was supported will have an - // "Unknown" last update until next time they update... - if (repo.getLastUpdated() == null) { + if (repo.getTimestamp() == -1) { lastUpdated.setText(R.string.unknown); + } else { + int format = DateUtils.isToday(repo.getTimestamp()) ? + DateUtils.FORMAT_SHOW_TIME : + DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_DATE; + lastUpdated.setText(DateUtils.formatDateTime(this, repo.getTimestamp(), format)); + } + if (repo.getLastUpdated() == null) { + lastDownloaded.setText(R.string.unknown); } else { int format = DateUtils.isToday(repo.getLastUpdated()) ? DateUtils.FORMAT_SHOW_TIME : DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_SHOW_DATE; - lastUpdated.setText(DateUtils.formatDateTime(this, repo.getLastUpdated(), format)); + lastDownloaded.setText(DateUtils.formatDateTime(this, repo.getLastUpdated(), format)); } } diff --git a/app/src/main/res/layout/activity_repo_details.xml b/app/src/main/res/layout/activity_repo_details.xml index e686fc7e3..d4e27a993 100644 --- a/app/src/main/res/layout/activity_repo_details.xml +++ b/app/src/main/res/layout/activity_repo_details.xml @@ -83,7 +83,17 @@ android:text="@string/repo_last_update" /> + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3750e3bb2..aa175d5a3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -427,6 +427,7 @@ This often occurs with apps installed via Google Play or other sources, if they Fingerprint of the signing key (SHA-256) Description Last update + Last update downloaded Official mirrors User mirrors Name