diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-17 02:09:58 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-28 16:33:14 +0200 |
commit | 6e3ed1d2db1f9dcf8cc90deda4370a1dc058f79b (patch) | |
tree | 2c1e7143806ae2706733abde5181150d649c5145 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java | |
parent | 1fcd9d3fde07f0217ec16fcf64d527bbc3436cac (diff) | |
download | open-keychain-6e3ed1d2db1f9dcf8cc90deda4370a1dc058f79b.tar.gz open-keychain-6e3ed1d2db1f9dcf8cc90deda4370a1dc058f79b.tar.bz2 open-keychain-6e3ed1d2db1f9dcf8cc90deda4370a1dc058f79b.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.java | 5 |
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 { } } + } |