kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix potential NPE when getting last changed timestamp.

Browse source
This commit is contained in:
حسين 2019-01-01 16:29:05 +00:00
parent e58a5e73d6
commit 38cebb56be
No known key found for this signature in database
GPG key ID: B14B8E108F5E6329
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/com/zeapo/pwdstore/PasswordStore.java
View file

@ -444,23 +444,32 @@ public class PasswordStore extends AppCompatActivity {
Repository repository = PasswordRepository.getRepository(repoPath); Repository repository = PasswordRepository.getRepository(repoPath);
if (repository == null) { if (repository == null) {
Log.e(TAG, "getLastChangedTimestamp: No git repository");
return -1; return -1;
} }
Git git = new Git(repository); Git git = new Git(repository);
String relativePath = getRelativePath(fullPath, repoPath.getAbsolutePath()).substring(1); String relativePath = getRelativePath(fullPath, repoPath.getAbsolutePath())
Iterable<RevCommit> iterable; .substring(1); // Removes leading '/'
Iterator<RevCommit> iterator;
try { try {
iterable = git.log().addPath(relativePath).call(); iterator = git
.log()
.addPath(relativePath)
.call()
.iterator();
} catch (GitAPIException e) { } catch (GitAPIException e) {
System.out.println("Exception caught :("); Log.e(TAG, "getLastChangedTimestamp: GITAPIException", e);
e.printStackTrace();
return -1; return -1;
} }
RevCommit latestCommit = iterable.iterator().next(); if (!iterator.hasNext()) {
return latestCommit.getCommitTime(); Log.w(TAG, "getLastChangedTimestamp: No commits for file: " + relativePath);
return -1;
}
return iterator.next().getCommitTime();
} }
public void decryptPassword(PasswordItem item) { public void decryptPassword(PasswordItem item) {