moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-26 00:11:52 -05:00
Code Issues Releases Wiki Activity

extras for database broadcast

Browse Source
This commit is contained in:
Dominik Schürmann 2013-01-19 00:24:27 +01:00
parent 4177f7159c
commit 99122fa8d9
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
OpenPGP-Keychain/src/org/sufficientlysecure/keychain/provider/KeychainProvider.java
View File

@ -51,6 +51,9 @@ public class KeychainProvider extends ContentProvider {
public static final String ACTION_BROADCAST_DATABASE_CHANGE = Constants.PACKAGE_NAME public static final String ACTION_BROADCAST_DATABASE_CHANGE = Constants.PACKAGE_NAME
+ ".action.DATABASE_CHANGE"; + ".action.DATABASE_CHANGE";
public static final String EXTRA_BROADCAST_KEY_TYPE = "keyType";
public static final String EXTRA_BROADCAST_CONTENT_ITEM_TYPE = "contentItemType";
private static final int PUBLIC_KEY_RING = 101; private static final int PUBLIC_KEY_RING = 101;
private static final int PUBLIC_KEY_RING_BY_ROW_ID = 102; private static final int PUBLIC_KEY_RING_BY_ROW_ID = 102;
private static final int PUBLIC_KEY_RING_BY_MASTER_KEY_ID = 103; private static final int PUBLIC_KEY_RING_BY_MASTER_KEY_ID = 103;
@ -322,8 +325,9 @@ public class KeychainProvider extends ContentProvider {
break; break;
default: default:
throw new IllegalArgumentException("Unknown match " + match); Log.e(Constants.TAG, "Unknown match " + match);
type = -1;
break;
} }
return type; return type;
@ -670,14 +674,15 @@ public class KeychainProvider extends ContentProvider {
default: default:
throw new UnsupportedOperationException("Unknown uri: " + uri); throw new UnsupportedOperationException("Unknown uri: " + uri);
} }
// notify of changes in db
getContext().getContentResolver().notifyChange(uri, null);
sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
} catch (SQLiteConstraintException e) { } catch (SQLiteConstraintException e) {
Log.e(Constants.TAG, "Constraint exception on insert! Entry already existing?"); Log.e(Constants.TAG, "Constraint exception on insert! Entry already existing?");
} }
// notify of changes in db
getContext().getContentResolver().notifyChange(uri, null);
sendBroadcastDatabaseChange();
return rowUri; return rowUri;
} }
@ -725,7 +730,7 @@ public class KeychainProvider extends ContentProvider {
// notify of changes in db // notify of changes in db
getContext().getContentResolver().notifyChange(uri, null); getContext().getContentResolver().notifyChange(uri, null);
sendBroadcastDatabaseChange(); sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
return count; return count;
} }
@ -777,14 +782,15 @@ public class KeychainProvider extends ContentProvider {
default: default:
throw new UnsupportedOperationException("Unknown uri: " + uri); throw new UnsupportedOperationException("Unknown uri: " + uri);
} }
// notify of changes in db
getContext().getContentResolver().notifyChange(uri, null);
sendBroadcastDatabaseChange(getKeyType(match), getType(uri));
} catch (SQLiteConstraintException e) { } catch (SQLiteConstraintException e) {
Log.e(Constants.TAG, "Constraint exception on update! Entry already existing?"); Log.e(Constants.TAG, "Constraint exception on update! Entry already existing?");
} }
// notify of changes in db
getContext().getContentResolver().notifyChange(uri, null);
sendBroadcastDatabaseChange();
return count; return count;
} }
@ -877,9 +883,11 @@ public class KeychainProvider extends ContentProvider {
* This broadcast is send system wide to inform other application that a keyring was inserted, * This broadcast is send system wide to inform other application that a keyring was inserted,
* updated, or deleted * updated, or deleted
*/ */
private void sendBroadcastDatabaseChange() { private void sendBroadcastDatabaseChange(int keyType, String contentItemType) {
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(ACTION_BROADCAST_DATABASE_CHANGE); intent.setAction(ACTION_BROADCAST_DATABASE_CHANGE);
intent.putExtra(EXTRA_BROADCAST_KEY_TYPE, keyType);
intent.putExtra(EXTRA_BROADCAST_CONTENT_ITEM_TYPE, contentItemType);
getContext().sendBroadcast(intent, Constants.PERMISSION_ACCESS_API); getContext().sendBroadcast(intent, Constants.PERMISSION_ACCESS_API);
} }
} }