cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better handling of unknown status

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-07-20 21:30:47 +02:00
parent 57b0e16ecc
commit 66465f7c1b
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/loader/KeyserverStatusLoader.java
View File

@@ -68,9 +68,12 @@ public class KeyserverStatusLoader extends AsyncTaskLoader<KeyserverStatus> {
try {
if (cursor.moveToFirst()) {
if (cursor.isNull(INDEX_SEEN_ON_KEYSERVERS) || cursor.isNull(INDEX_LAST_UPDATED)) {
return new KeyserverStatus(masterKeyId);
}
boolean isPublished = cursor.getInt(INDEX_SEEN_ON_KEYSERVERS) != 0;
Date lastUpdated = cursor.isNull(INDEX_LAST_UPDATED) ?
null : new Date(cursor.getLong(INDEX_LAST_UPDATED) * 1000);
Date lastUpdated = new Date(cursor.getLong(INDEX_LAST_UPDATED) * 1000);
return new KeyserverStatus(masterKeyId, isPublished, lastUpdated);
}

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/view/KeyserverStatusView.java
View File

@@ -88,7 +88,7 @@ public class KeyserverStatusView extends FrameLayout implements KeyserverStatusM
@Override
public void setDisplayStatusUnknown() {
setDisplayStatus(KeyserverDisplayStatus.UNKNOWN);
vSubtitle.setVisibility(View.GONE);
vSubtitle.setText(R.string.keyserver_last_updated_never);
}
@Override