From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Thu, 16 Feb 2012 19:22:19 +0000 (+0000)
Subject: Populate the warning dialog with the messages.  Fix the onCLick and onCancel to not... 
X-Git-Tag: upstream/12.03~1^2~49
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=38a7976b08bbf22af8d4fce325bb02324d6a8494;p=debian%2Fopenrocket

Populate the warning dialog with the messages.  Fix the onCLick and onCancel to not finish the activity but instead make the workflow move on to the viewer.

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@422 180e2498-e6e9-4542-8430-84ac67f01cd8
---

diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java
index dde3ccf4..ac272b87 100644
--- a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java
+++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java
@@ -112,7 +112,6 @@ implements TCQueryAction.OnTCQueryCompleteListener, OpenRocketLoaderFragment.OnO
 		WarningSet warnings = ((Application)OpenRocketLoaderActivity.this.getApplication()).getWarnings();
 		if (warnings == null || warnings.isEmpty()) {
 		} else {
-			// TODO - Build a warning listing dialog
 			DialogFragment newFragment = WarningDialogFragment.newInstance();
 			newFragment.show(getSupportFragmentManager(), "dialog");
 			return;
@@ -134,7 +133,7 @@ implements TCQueryAction.OnTCQueryCompleteListener, OpenRocketLoaderFragment.OnO
 		displayWarningDialog();
 	}
 
-	private void moveOnToViewer() {
+	public void moveOnToViewer() {
 		Intent i = new Intent(this,OpenRocketViewer.class);
 		startActivity(i);
 		finish();