moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 16:38:50 -05:00
Code Issues Releases Wiki Activity

Fix LogDisplayFragment

Browse Source
This commit is contained in:
Dominik Schürmann 2014-09-21 22:56:16 +02:00
parent 65c3d69d9a
commit f50c0e1905
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ConsolidateResult.java
View File

@ -26,13 +26,16 @@ public class ConsolidateResult extends OperationResult {
super(result, log); super(result, log);
} }
/** /** Construct from a parcel - trivial because we have no extra data. */
* Construct from a parcel - trivial because we have no extra data.
*/
public ConsolidateResult(Parcel source) { public ConsolidateResult(Parcel source) {
super(source); super(source);
} }
@Override
public void writeToParcel(Parcel dest, int flags) {
super.writeToParcel(dest, flags);
}
public static Creator<ConsolidateResult> CREATOR = new Creator<ConsolidateResult>() { public static Creator<ConsolidateResult> CREATOR = new Creator<ConsolidateResult>() {
public ConsolidateResult createFromParcel(final Parcel source) { public ConsolidateResult createFromParcel(final Parcel source) {
return new ConsolidateResult(source); return new ConsolidateResult(source);

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/SingletonResult.java
View File

@ -67,7 +67,11 @@ public class SingletonResult extends OperationResult {
toast.setIndeterminate(false); toast.setIndeterminate(false);
toast.setSwipeToDismiss(true); toast.setSwipeToDismiss(true);
return toast; return toast;
}
@Override
public void writeToParcel(Parcel dest, int flags) {
super.writeToParcel(dest, flags);
} }
public static Creator<SingletonResult> CREATOR = new Creator<SingletonResult>() { public static Creator<SingletonResult> CREATOR = new Creator<SingletonResult>() {

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java
View File

@ -57,11 +57,11 @@ public class LogDisplayFragment extends ListFragment implements OnTouchListener
public static final String EXTRA_RESULT = "log"; public static final String EXTRA_RESULT = "log";
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
Intent intent = getActivity().getIntent(); Intent intent = getActivity().getIntent();
if (intent.getExtras() == null || !intent.getExtras().containsKey(EXTRA_RESULT)) { if (intent == null) {
getActivity().finish(); getActivity().finish();
return; return;
} }
@ -90,7 +90,8 @@ public class LogDisplayFragment extends ListFragment implements OnTouchListener
}); });
getListView().setFastScrollEnabled(true); getListView().setFastScrollEnabled(true);
getListView().setDividerHeight(0);
getListView().setOnTouchListener(this);
} }
public void decreaseLogLevel() { 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 @Override
public boolean onTouch(View v, MotionEvent event) { public boolean onTouch(View v, MotionEvent event) {
mDetector.onTouchEvent(event); mDetector.onTouchEvent(event);