aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-05-17 02:09:58 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-05-17 02:09:58 +0200
commitb430ba51eb1df64c3386a824fe8fbddcc9c00ece (patch)
treef85b366ea817babd2bd2bc9055b79c32a56fbb3d /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
parentbd8e45b55680d71190c5c565dc144dc5d940ea89 (diff)
downloadopen-keychain-b430ba51eb1df64c3386a824fe8fbddcc9c00ece.tar.gz
open-keychain-b430ba51eb1df64c3386a824fe8fbddcc9c00ece.tar.bz2
open-keychain-b430ba51eb1df64c3386a824fe8fbddcc9c00ece.zip
do nfc dispatching in MainActivity
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
index 78df612a7..e63e28667 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
@@ -24,7 +24,6 @@ import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.widget.AdapterView;
@@ -39,10 +38,11 @@ import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.operations.results.OperationResult;
import org.sufficientlysecure.keychain.remote.ui.AppsListFragment;
+import org.sufficientlysecure.keychain.ui.base.BaseNfcActivity;
import org.sufficientlysecure.keychain.util.FabContainer;
import org.sufficientlysecure.keychain.util.Preferences;
-public class MainActivity extends AppCompatActivity implements FabContainer {
+public class MainActivity extends BaseNfcActivity implements FabContainer {
public Drawer.Result mDrawerResult;
private Toolbar mToolbar;
@@ -196,4 +196,5 @@ public class MainActivity extends AppCompatActivity implements FabContainer {
}
}
+
}