moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 11:12:15 -05:00
Code Issues Releases Wiki Activity

re-parcel log in LogDisplayFragment

Browse Source
This commit is contained in:
Vincent Breitmoser 2015-05-17 01:13:41 +02:00
parent 7e5e0df0bc
commit 064c9d461f
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,6 @@ import org.sufficientlysecure.keychain.util.Log;
import java.io.File; import java.io.File;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.Iterator;
public class LogDisplayFragment extends ListFragment implements OnItemClickListener { public class LogDisplayFragment extends ListFragment implements OnItemClickListener {
@ -58,6 +57,7 @@ public class LogDisplayFragment extends ListFragment implements OnItemClickListe
OperationResult mResult; OperationResult mResult;
public static final String EXTRA_RESULT = "log"; public static final String EXTRA_RESULT = "log";
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -75,7 +75,12 @@ public class LogDisplayFragment extends ListFragment implements OnItemClickListe
return; return;
} }
mResult = intent.getParcelableExtra(EXTRA_RESULT); if (savedInstanceState != null) {
mResult = savedInstanceState.getParcelable(EXTRA_RESULT);
} else {
mResult = intent.getParcelableExtra(EXTRA_RESULT);
}
if (mResult == null) { if (mResult == null) {
getActivity().finish(); getActivity().finish();
return; 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 @Override
public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) { public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
inflater.inflate(R.menu.log_display, menu); inflater.inflate(R.menu.log_display, menu);
@ -110,7 +123,6 @@ public class LogDisplayFragment extends ListFragment implements OnItemClickListe
} }
private void exportLog() { private void exportLog() {
showExportLogDialog(new File(Constants.Path.APP_DIR, "export.log")); 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; int opResultCode = error ? OperationResult.RESULT_ERROR : OperationResult.RESULT_OK;
OperationResult opResult = new LogExportResult(opResultCode, currLog); 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) { private String getPrintableOperationLog(OperationResult.OperationLog opLog, String basePadding) {
String log = ""; String log = "";
for (Iterator<LogEntryParcel> logIterator = opLog.iterator(); logIterator.hasNext(); ) { for (LogEntryParcel anOpLog : opLog) {
log += getPrintableLogEntry(logIterator.next(), basePadding) + "\n"; log += getPrintableLogEntry(anOpLog, basePadding) + "\n";
} }
log = log.substring(0, log.length() - 1);//gets rid of extra new line log = log.substring(0, log.length() - 1);//gets rid of extra new line
return log; return log;