moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity

some coding practice and potential bug fixes

Browse Source
This commit is contained in:
Thialfihar 2010-05-27 20:27:21 +00:00
parent 570b7a6d8e
commit b42f02ba92
4 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/thialfihar/android/apg/Apg.java
View File

@ -1017,7 +1017,10 @@ public class Apg {
keyIds.add(c.getInt(0)); keyIds.add(c.getInt(0));
} while (c.moveToNext()); } while (c.moveToNext());
} }
c.close();
if (c != null) {
c.close();
}
return keyIds; return keyIds;
} }

6
src/org/thialfihar/android/apg/CachedPassPhrase.java
View File

@ -10,6 +10,12 @@ public class CachedPassPhrase {
this.passPhrase = passPhrase; this.passPhrase = passPhrase;
} }
public int hashCode() {
int hc1 = (int)(this.timestamp & 0xffffffff);
int hc2 = (this.passPhrase == null ? 0 : this.passPhrase.hashCode());
return (hc1 + hc2) * hc2 + hc1;
}
public boolean equals(Object other) { public boolean equals(Object other) {
if (!(other instanceof CachedPassPhrase)) { if (!(other instanceof CachedPassPhrase)) {
return false; return false;

1
src/org/thialfihar/android/apg/EncryptActivity.java
View File

@ -755,6 +755,7 @@ public class EncryptActivity extends BaseActivity {
EncryptActivity.this. EncryptActivity.this.
startActivity(Intent.createChooser(emailIntent, startActivity(Intent.createChooser(emailIntent,
getString(R.string.title_sendEmail))); getString(R.string.title_sendEmail)));
break;
} }
case Id.target.file: { case Id.target.file: {

37
src/org/thialfihar/android/apg/provider/Database.java
View File

@ -200,7 +200,10 @@ public class Database extends SQLiteOpenHelper {
} }
} while (cursor.moveToNext()); } while (cursor.moveToNext());
} }
cursor.close();
if (cursor != null) {
cursor.close();
}
break; break;
} }
@ -427,7 +430,10 @@ public class Database extends SQLiteOpenHelper {
rowId = mDb.insert(KeyRings.TABLE_NAME, KeyRings.WHO_ID, values); rowId = mDb.insert(KeyRings.TABLE_NAME, KeyRings.WHO_ID, values);
mStatus = Id.return_value.ok; mStatus = Id.return_value.ok;
} }
c.close();
if (c != null) {
c.close();
}
return rowId; return rowId;
} }
@ -465,11 +471,14 @@ public class Database extends SQLiteOpenHelper {
if (c != null && c.moveToFirst()) { if (c != null && c.moveToFirst()) {
rowId = c.getLong(0); rowId = c.getLong(0);
mDb.update(UserIds.TABLE_NAME, values, mDb.update(UserIds.TABLE_NAME, values,
UserIds._ID + " = ?", new String[] { "" + rowId }); UserIds._ID + " = ?", new String[] { "" + rowId });
} else { } else {
rowId = mDb.insert(UserIds.TABLE_NAME, UserIds.USER_ID, values); rowId = mDb.insert(UserIds.TABLE_NAME, UserIds.USER_ID, values);
} }
c.close();
if (c != null) {
c.close();
}
return rowId; return rowId;
} }
@ -500,7 +509,10 @@ public class Database extends SQLiteOpenHelper {
} }
} }
} }
c.close();
if (c != null) {
c.close();
}
return keyRing; return keyRing;
} }
@ -522,7 +534,10 @@ public class Database extends SQLiteOpenHelper {
if (c != null && c.moveToFirst()) { if (c != null && c.moveToFirst()) {
data = c.getBlob(0); data = c.getBlob(0);
} }
c.close();
if (c != null) {
c.close();
}
return data; return data;
} }
@ -539,7 +554,10 @@ public class Database extends SQLiteOpenHelper {
if (c != null && c.moveToFirst()) { if (c != null && c.moveToFirst()) {
data = c.getBlob(0); data = c.getBlob(0);
} }
c.close();
if (c != null) {
c.close();
}
return data; return data;
} }
@ -561,7 +579,10 @@ public class Database extends SQLiteOpenHelper {
deleteKey(keyId); deleteKey(keyId);
} while (c.moveToNext()); } while (c.moveToNext());
} }
c.close();
if (c != null) {
c.close();
}
mDb.setTransactionSuccessful(); mDb.setTransactionSuccessful();
mDb.endTransaction(); mDb.endTransaction();