diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-06 00:59:12 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-06 00:59:12 +0200 |
| commit | d2ce770c1ab541aae20906c8e38056f24968aac4 (patch) | |
| tree | c683409c17c67ba8af80edc361ce07452b964288 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service | |
| parent | 8e60bf70a1ef6bd7be3220afc45c9a59c231d2d4 (diff) | |
| parent | afda9d86f84fcd36aad8de4a4e9c1fe12b6b042c (diff) | |
| download | open-keychain-d2ce770c1ab541aae20906c8e38056f24968aac4.tar.gz open-keychain-d2ce770c1ab541aae20906c8e38056f24968aac4.tar.bz2 open-keychain-d2ce770c1ab541aae20906c8e38056f24968aac4.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service')
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java index 3243df1a8..8aebae7aa 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeyserverSyncAdapterService.java @@ -427,7 +427,7 @@ public class KeyserverSyncAdapterService extends Service { private Notification getOrbotNoification(Context context) { NotificationCompat.Builder builder = new NotificationCompat.Builder(context); builder.setSmallIcon(R.drawable.ic_stat_notify_24dp) - .setLargeIcon(getBitmap(R.drawable.ic_launcher, context)) + .setLargeIcon(getBitmap(R.mipmap.ic_launcher, context)) .setContentTitle(context.getString(R.string.keyserver_sync_orbot_notif_title)) .setContentText(context.getString(R.string.keyserver_sync_orbot_notif_msg)) .setAutoCancel(true); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java index be269c66d..5d04317b3 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java @@ -509,7 +509,7 @@ public class PassphraseCacheService extends Service { private Notification getNotification() { NotificationCompat.Builder builder = new NotificationCompat.Builder(this); builder.setSmallIcon(R.drawable.ic_stat_notify_24dp) - .setLargeIcon(getBitmap(R.drawable.ic_launcher, getBaseContext())) + .setLargeIcon(getBitmap(R.mipmap.ic_launcher, getBaseContext())) .setContentTitle(getResources().getQuantityString(R.plurals.passp_cache_notif_n_keys, mPassphraseCache.size(), mPassphraseCache.size())) .setContentText(getString(R.string.passp_cache_notif_click_to_clear)); @@ -601,4 +601,4 @@ public class PassphraseCacheService extends Service { this.passphrase = passphrase; } } -}
\ No newline at end of file +} |