aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-02-15 13:10:29 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2016-02-15 13:25:55 +0100
commitbb997920f56326927a4838f12421b5d00d329dfa (patch)
tree42d7e2c2d23e62385c3b27513a7186b2cd1520de /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
parent0b00410123c30a5b7ecaaa8ecf4e56e90bfe7cdf (diff)
downloadopen-keychain-bb997920f56326927a4838f12421b5d00d329dfa.tar.gz
open-keychain-bb997920f56326927a4838f12421b5d00d329dfa.tar.bz2
open-keychain-bb997920f56326927a4838f12421b5d00d329dfa.zip
Split RemoteServiceActivity into multiple activities
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PanicExitActivity.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ExitActivity.java)7
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PanicResponderActivity.java5
2 files changed, 9 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ExitActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PanicExitActivity.java
index fd49461ed..3f64bfe25 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ExitActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PanicExitActivity.java
@@ -23,7 +23,10 @@ import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
-public class ExitActivity extends Activity {
+/**
+ * For Guardianproject's PANIC app
+ */
+public class PanicExitActivity extends Activity {
@SuppressLint("NewApi")
@Override
@@ -40,7 +43,7 @@ public class ExitActivity extends Activity {
}
public static void exitAndRemoveFromRecentApps(Activity activity) {
- Intent intent = new Intent(activity, ExitActivity.class);
+ Intent intent = new Intent(activity, PanicExitActivity.class);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PanicResponderActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PanicResponderActivity.java
index 2380c02a8..ff7b649f7 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PanicResponderActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PanicResponderActivity.java
@@ -25,6 +25,9 @@ import android.os.Bundle;
import org.sufficientlysecure.keychain.service.PassphraseCacheService;
+/**
+ * Responder for Guardianproject's PANIC app
+ */
public class PanicResponderActivity extends Activity {
public static final String PANIC_TRIGGER_ACTION = "info.guardianproject.panic.action.TRIGGER";
@@ -37,7 +40,7 @@ public class PanicResponderActivity extends Activity {
Intent intent = getIntent();
if (intent != null && PANIC_TRIGGER_ACTION.equals(intent.getAction())) {
PassphraseCacheService.clearCachedPassphrases(this);
- ExitActivity.exitAndRemoveFromRecentApps(this);
+ PanicExitActivity.exitAndRemoveFromRecentApps(this);
}
if (Build.VERSION.SDK_INT >= 21) {