From 064c9d461f9adeb04464762865c917e34130a5ca Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Sun, 17 May 2015 01:13:41 +0200
Subject: re-parcel log in LogDisplayFragment

---
 .../keychain/ui/LogDisplayFragment.java            | 26 +++++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'OpenKeychain')

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 138f2f4e7..3c8fbf8c9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/LogDisplayFragment.java
@@ -49,7 +49,6 @@ import org.sufficientlysecure.keychain.util.Log;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.PrintWriter;
-import java.util.Iterator;
 
 public class LogDisplayFragment extends ListFragment implements OnItemClickListener {
 
@@ -58,6 +57,7 @@ public class LogDisplayFragment extends ListFragment implements OnItemClickListe
     OperationResult mResult;
 
     public static final String EXTRA_RESULT = "log";
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -75,7 +75,12 @@ public class LogDisplayFragment extends ListFragment implements OnItemClickListe
             return;
         }
 
-        mResult = intent.getParcelableExtra(EXTRA_RESULT);
+        if (savedInstanceState != null) {
+            mResult = savedInstanceState.getParcelable(EXTRA_RESULT);
+        } else {
+            mResult = intent.getParcelableExtra(EXTRA_RESULT);
+        }
+
         if (mResult == null) {
             getActivity().finish();
             return;
@@ -91,6 +96,14 @@ public class LogDisplayFragment extends ListFragment implements OnItemClickListe
 
     }
 
+    @Override
+    public void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        // need to parcel this again, logs are only single-instance parcelable
+        outState.putParcelable(EXTRA_RESULT, mResult);
+    }
+
     @Override
     public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
         inflater.inflate(R.menu.log_display, menu);
@@ -110,7 +123,6 @@ public class LogDisplayFragment extends ListFragment implements OnItemClickListe
     }
 
     private void exportLog() {
-
         showExportLogDialog(new File(Constants.Path.APP_DIR, "export.log"));
     }
 
@@ -142,7 +154,9 @@ public class LogDisplayFragment extends ListFragment implements OnItemClickListe
             }
         }
 
-        if (!error) currLog.add(OperationResult.LogType.MSG_EXPORT_LOG_EXPORT_SUCCESS, 1);
+        if (!error) {
+            currLog.add(OperationResult.LogType.MSG_EXPORT_LOG_EXPORT_SUCCESS, 1);
+        }
 
         int opResultCode = error ? OperationResult.RESULT_ERROR : OperationResult.RESULT_OK;
         OperationResult opResult = new LogExportResult(opResultCode, currLog);
@@ -158,8 +172,8 @@ public class LogDisplayFragment extends ListFragment implements OnItemClickListe
      */
     private String getPrintableOperationLog(OperationResult.OperationLog opLog, String basePadding) {
         String log = "";
-        for (Iterator<LogEntryParcel> logIterator = opLog.iterator(); logIterator.hasNext(); ) {
-            log += getPrintableLogEntry(logIterator.next(), basePadding) + "\n";
+        for (LogEntryParcel anOpLog : opLog) {
+            log += getPrintableLogEntry(anOpLog, basePadding) + "\n";
         }
         log = log.substring(0, log.length() - 1);//gets rid of extra new line
         return log;
-- 
cgit v1.2.3