From f50c0e1905f699e929d5f4962d700214aff4c684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sun, 21 Sep 2014 22:56:16 +0200 Subject: Fix LogDisplayFragment --- .../sufficientlysecure/keychain/ui/LogDisplayFragment.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java index f363520e8..4fdfd3a21 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java @@ -57,11 +57,11 @@ public class LogDisplayFragment extends ListFragment implements OnTouchListener public static final String EXTRA_RESULT = "log"; @Override - public void onCreate(Bundle savedInstanceState) { + public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); Intent intent = getActivity().getIntent(); - if (intent.getExtras() == null || !intent.getExtras().containsKey(EXTRA_RESULT)) { + if (intent == null) { getActivity().finish(); return; } @@ -90,7 +90,8 @@ public class LogDisplayFragment extends ListFragment implements OnTouchListener }); getListView().setFastScrollEnabled(true); - + getListView().setDividerHeight(0); + getListView().setOnTouchListener(this); } public void decreaseLogLevel() { @@ -119,13 +120,6 @@ public class LogDisplayFragment extends ListFragment implements OnTouchListener */ } - @Override - public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - getListView().setDividerHeight(0); - getListView().setOnTouchListener(this); - } - @Override public boolean onTouch(View v, MotionEvent event) { mDetector.onTouchEvent(event); -- cgit v1.2.3