diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-09-03 21:01:07 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-09-03 21:01:07 +0200 |
commit | c63d0002525481f44c68b029cf2e547a1eb92a0f (patch) | |
tree | ec1eec2e70092e3263807b04c24d5df943c73a1b /OpenKeychain/src/main/java/org | |
parent | 87f7fe65a8ddf9f9f2f9881c0f2ef8f5d0e8c9f1 (diff) | |
parent | dd850e5c72db1601aef54f9f35e1a2b11ae719c5 (diff) | |
download | open-keychain-c63d0002525481f44c68b029cf2e547a1eb92a0f.tar.gz open-keychain-c63d0002525481f44c68b029cf2e547a1eb92a0f.tar.bz2 open-keychain-c63d0002525481f44c68b029cf2e547a1eb92a0f.zip |
Merge pull request #1518 from 0-kaladin/master
Fixes open-keychain/open-keychain#1515
Diffstat (limited to 'OpenKeychain/src/main/java/org')
4 files changed, 6 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListFragment.java index 2deb33a67..a1451fb09 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListFragment.java @@ -243,7 +243,7 @@ public class AppsListFragment extends ListFragment implements null, isInstalled(packageName), 1, // registered! - R.drawable.ic_launcher // icon is retrieved later + R.mipmap.ic_launcher // icon is retrieved later }); break; } @@ -265,7 +265,7 @@ public class AppsListFragment extends ListFragment implements name, isInstalled(packageName), 1, // registered! - R.drawable.ic_launcher // icon is retrieved later + R.mipmap.ic_launcher // icon is retrieved later }); break; } 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 +} diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java index 26e56280a..9c0122b7b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java @@ -448,7 +448,7 @@ public class DecryptListFragment new Intent(intent) .setClass(activity, DisplayTextActivity.class) .putExtra(DisplayTextActivity.EXTRA_METADATA, result), - BuildConfig.APPLICATION_ID, R.string.view_internal, R.drawable.ic_launcher); + BuildConfig.APPLICATION_ID, R.string.view_internal, R.mipmap.ic_launcher); Intent chooserIntent = Intent.createChooser(intent, getString(R.string.intent_show)); chooserIntent.putExtra(Intent.EXTRA_INITIAL_INTENTS, |