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

Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
This commit is contained in:
Vincent Breitmoser
2015-03-21 15:57:35 +01:00
parent 93c7eb72fb c7efaacc9d
commit 9ef2795fcd
27 changed files with 217 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/CertifyResult.java
View File

@@ -124,7 +124,7 @@ public class CertifyResult extends InputPendingResult {
mCertifyError, mCertifyError);
}
return Notify.createNotify(activity, str, duration, style, new ActionListener() {
return Notify.create(activity, str, duration, style, new ActionListener() {
@Override
public void onAction() {
Intent intent = new Intent(

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/DeleteResult.java
View File

@@ -116,7 +116,7 @@ public class DeleteResult extends OperationResult {
}
}
return Notify.createNotify(activity, str, duration, style, new ActionListener() {
return Notify.create(activity, str, duration, style, new ActionListener() {
@Override
public void onAction() {
Intent intent = new Intent(

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/ImportKeyResult.java
View File

@@ -179,7 +179,7 @@ public class ImportKeyResult extends OperationResult {
}
}
return Notify.createNotify(activity, str, duration, style, new ActionListener() {
return Notify.create(activity, str, duration, style, new ActionListener() {
@Override
public void onAction() {
Intent intent = new Intent(

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
View File

@@ -281,10 +281,10 @@ public abstract class OperationResult implements Parcelable {
}
if (getLog() == null || getLog().isEmpty()) {
return Notify.createNotify(activity, logText, Notify.LENGTH_LONG, style);
return Notify.create(activity, logText, Notify.LENGTH_LONG, style);
}
return Notify.createNotify(activity, logText, Notify.LENGTH_LONG, style,
return Notify.create(activity, logText, Notify.LENGTH_LONG, style,
new ActionListener() {
@Override
public void onAction() {