show key expiry status similar to revocation

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java

@@ -179,7 +179,6 @@ public class KeychainDatabase extends SQLiteOpenHelper {
             // Enable foreign key constraints
             db.execSQL("PRAGMA foreign_keys=ON;");
             // TODO remove, once we remove the "always migrate" debug stuff
-            // db.execSQL("DROP TABLE certs;");
             // db.execSQL("DROP TABLE user_ids;");
             db.execSQL(CREATE_USER_IDS);
             db.execSQL(CREATE_CERTS);

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java

@@ -207,17 +207,12 @@ public class ProviderHelper {
             Log.e(Constants.TAG, "Key could not be deleted! Maybe we are creating a new one!", e);
         }
 
+        // insert new version of this keyRing
         ContentValues values = new ContentValues();
-        // use exactly the same _ID again to replace key in-place.
-        // NOTE: If we would not use the same _ID again,
-        // getting back to the ViewKeyActivity would result in Nullpointer,
-        // because the currently loaded key would be gone from the database
         values.put(KeyRingData.MASTER_KEY_ID, masterKeyId);
         values.put(KeyRingData.KEY_RING_DATA, keyRing.getEncoded());
-
-        // insert new version of this keyRing
         Uri uri = KeyRingData.buildPublicKeyRingUri(Long.toString(masterKeyId));
-        Uri insertedUri = context.getContentResolver().insert(uri, values);
+        context.getContentResolver().insert(uri, values);
 
         // save all keys and userIds included in keyRing object in database
         ArrayList<ContentProviderOperation> operations = new ArrayList<ContentProviderOperation>();