cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Notification: follow design guidelines, fix #1313

Browse Source
This commit is contained in:
Dominik Schürmann
2015-06-24 13:08:37 +02:00
parent 8cd7e29540
commit 74cef32d25
2 changed files with 38 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java
View File

@@ -493,60 +493,43 @@ public class PassphraseCacheService extends Service {
private Notification getNotification() { private Notification getNotification() {
NotificationCompat.Builder builder = new NotificationCompat.Builder(this); NotificationCompat.Builder builder = new NotificationCompat.Builder(this);
builder.setSmallIcon(R.drawable.ic_stat_notify_24dp)
.setLargeIcon(getBitmap(R.drawable.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));
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { NotificationCompat.InboxStyle inboxStyle = new NotificationCompat.InboxStyle();
builder.setSmallIcon(R.drawable.ic_stat_notify_24dp)
.setLargeIcon(getBitmap(R.drawable.ic_launcher, getBaseContext()))
.setContentTitle(getString(R.string.app_name))
.setContentText(String.format(getString(R.string.passp_cache_notif_n_keys),
mPassphraseCache.size()));
NotificationCompat.InboxStyle inboxStyle = new NotificationCompat.InboxStyle(); inboxStyle.setBigContentTitle(getString(R.string.passp_cache_notif_keys));
inboxStyle.setBigContentTitle(getString(R.string.passp_cache_notif_keys)); // Moves events into the big view
for (int i = 0; i < mPassphraseCache.size(); i++) {
// Moves events into the big view inboxStyle.addLine(mPassphraseCache.valueAt(i).getPrimaryUserID());
for (int i = 0; i < mPassphraseCache.size(); i++) {
inboxStyle.addLine(mPassphraseCache.valueAt(i).getPrimaryUserID());
}
// Moves the big view style object into the notification object.
builder.setStyle(inboxStyle);
// Add purging action
Intent intent = new Intent(getApplicationContext(), PassphraseCacheService.class);
intent.setAction(ACTION_PASSPHRASE_CACHE_CLEAR);
builder.addAction(
R.drawable.abc_ic_clear_mtrl_alpha,
getString(R.string.passp_cache_notif_clear),
PendingIntent.getService(
getApplicationContext(),
0,
intent,
PendingIntent.FLAG_UPDATE_CURRENT
)
);
} else {
// Fallback, since expandable notifications weren't available back then
builder.setSmallIcon(R.drawable.ic_stat_notify)
.setLargeIcon(getBitmap(R.drawable.ic_launcher, getBaseContext()))
.setContentTitle(String.format(getString(R.string.passp_cache_notif_n_keys),
mPassphraseCache.size()))
.setContentText(getString(R.string.passp_cache_notif_click_to_clear));
Intent intent = new Intent(getApplicationContext(), PassphraseCacheService.class);
intent.setAction(ACTION_PASSPHRASE_CACHE_CLEAR);
builder.setContentIntent(
PendingIntent.getService(
getApplicationContext(),
0,
intent,
PendingIntent.FLAG_UPDATE_CURRENT
)
);
} }
// Moves the big view style object into the notification object.
builder.setStyle(inboxStyle);
Intent intent = new Intent(getApplicationContext(), PassphraseCacheService.class);
intent.setAction(ACTION_PASSPHRASE_CACHE_CLEAR);
PendingIntent clearCachePi = PendingIntent.getService(
getApplicationContext(),
0,
intent,
PendingIntent.FLAG_UPDATE_CURRENT
);
// Add cache clear PI to normal touch
builder.setContentIntent(clearCachePi);
// Add clear PI action below text
builder.addAction(
R.drawable.abc_ic_clear_mtrl_alpha,
getString(R.string.passp_cache_notif_clear),
clearCachePi
);
return builder.build(); return builder.build();
} }

9
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -1221,9 +1221,12 @@
<string name="msg_export_log_success">"Log exported successfully!"</string> <string name="msg_export_log_success">"Log exported successfully!"</string>
<!-- PassphraseCache --> <!-- PassphraseCache -->
<string name="passp_cache_notif_click_to_clear">"Click to clear cached passwords"</string> <string name="passp_cache_notif_click_to_clear">"Touch to clear password cache."</string>
<string name="passp_cache_notif_n_keys">"OpenKeychain has cached %d passwords"</string> <plurals name="passp_cache_notif_n_keys">
<string name="passp_cache_notif_keys">"Cached Passwords:"</string> <item quantity="one">"%d password cached"</item>
<item quantity="other">"%d passwords cached"</item>
</plurals>
<string name="passp_cache_notif_keys">"Cached passwords"</string>
<string name="passp_cache_notif_clear">"Clear Cache"</string> <string name="passp_cache_notif_clear">"Clear Cache"</string>
<string name="passp_cache_notif_pwd">"Password"</string> <string name="passp_cache_notif_pwd">"Password"</string>