From: peli0101 <peli0101@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Sat, 17 Jan 2009 13:20:48 +0000 (+0000)
Subject: OI Safe: Include EULA activity.
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=b0b407e08863698123465826fb66316cfb96ef97;p=android-vcpass-oisafe

OI Safe: Include EULA activity.

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@1750 72b678ce-9140-0410-bee8-679b907dd61a
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 54bd7ed..329b9d8 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -62,6 +62,8 @@
         <activity class=".Restore" android:name="Restore" android:label="@string/app_name" />
         <activity class=".Preferences" android:name="Preferences" android:label="@string/app_name" />
         <activity class=".LogOffActivity" android:name="LogOffActivity" android:label="@string/app_name" />
+        
+        <activity android:name="org.openintents.distribution.EulaActivity" android:label="@string/eula_title" />
         
         <service class=".service.ServiceDispatchImpl" android:name=".service.ServiceDispatchImpl"
             android:label="@string/app_name"
diff --git a/res/raw/license_short.txt b/res/raw/license_short.txt
index 99a0b46..2c00097 100644
--- a/res/raw/license_short.txt
+++ b/res/raw/license_short.txt
@@ -1,5 +1,5 @@
 Copyright (C) 2008-2009 Steven Osborn - http://steven.bitsetters.com and
-Randy McEoin (and others, see About box)
+Randy McEoin (and others, see About)
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/src/org/openintents/distribution/EulaActivity.java b/src/org/openintents/distribution/EulaActivity.java
index 363bbba..830d897 100644
--- a/src/org/openintents/distribution/EulaActivity.java
+++ b/src/org/openintents/distribution/EulaActivity.java
@@ -11,6 +11,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Bundle;
+import android.os.Parcel;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -21,7 +22,7 @@ import android.widget.TextView;
 /**
  * Displays the Eula for the first time, reading it from a raw resource.
  * 
- * @version 2009-01-17
+ * @version 2009-01-17, 13:00 UTC
  * @author Peli
  *
  */
@@ -38,12 +39,14 @@ public class EulaActivity extends Activity {
 	 */
 	private static final String EXTRA_LAUNCH_ACTIVITY_PACKAGE = "org.openintents.extra.launch_activity_package";
 	private static final String EXTRA_LAUNCH_ACTIVITY_CLASS = "org.openintents.extra.launch_activity_class";
+	private static final String EXTRA_LAUNCH_ACTIVITY_INTENT = "org.openintents.extra.launch_activity_intent";
 	
 	private Button mAgree;
 	private Button mDisagree;
 	
 	private String mLaunchPackage;
 	private String mLaunchClass;
+	private Intent mLaunchIntent;
 	
 	/** Called when the activity is first created. */
 	@Override
@@ -57,6 +60,8 @@ public class EulaActivity extends Activity {
 		Bundle b = i.getExtras();
 		mLaunchPackage = b.getString(EXTRA_LAUNCH_ACTIVITY_PACKAGE);
 		mLaunchClass = b.getString(EXTRA_LAUNCH_ACTIVITY_CLASS);
+		//mLaunchIntent 
+		mLaunchIntent = b.getParcelable(EXTRA_LAUNCH_ACTIVITY_INTENT);
 		
 		//mIntroContinue = (Button) findViewById(R.id.intro_continue);
 		mAgree = (Button) findViewById(RD.id.button1);
@@ -88,8 +93,14 @@ public class EulaActivity extends Activity {
 		e.commit();
 		
 		// Call the activity that originally called checkEula()
-		Intent i = new Intent();
-		i.setClassName(mLaunchPackage, mLaunchClass);
+		Intent i;
+		if (mLaunchIntent != null) {
+			i = mLaunchIntent;
+		} else {
+			i = new Intent();
+			i.setClassName(mLaunchPackage, mLaunchClass);
+		}
+		i.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
 		startActivity(i);
 		finish();
 	}
@@ -106,12 +117,16 @@ public class EulaActivity extends Activity {
 		finish();
 	}
 
+	public static boolean checkEula(Activity activity) {
+		return checkEula(activity, null);
+	}
+	
 	/**
 	 * Test whether EULA has been accepted. Otherwise display EULA.
 	 * 
 	 * @return True if Eula has been accepted.
 	 */
-	public static boolean checkEula(Activity activity) {
+	public static boolean checkEula(Activity activity, Intent intent) {
 		SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(activity);
 		boolean accepted = sp.getBoolean(PREFERENCES_EULA_ACCEPTED, false);
 		
@@ -131,6 +146,10 @@ public class EulaActivity extends Activity {
 			Log.d(TAG, "Local class name: " + ci.getClassName());
 			i.putExtra(EXTRA_LAUNCH_ACTIVITY_PACKAGE, ci.getPackageName());
 			i.putExtra(EXTRA_LAUNCH_ACTIVITY_CLASS, ci.getClassName());
+			if (intent != null) {
+				i.putExtra(EXTRA_LAUNCH_ACTIVITY_INTENT, intent);
+			}
+			i.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
 			activity.startActivity(i);
 			activity.finish();
 			return false;
diff --git a/src/org/openintents/safe/AskPassword.java b/src/org/openintents/safe/AskPassword.java
index be585a4..dfee994 100644
--- a/src/org/openintents/safe/AskPassword.java
+++ b/src/org/openintents/safe/AskPassword.java
@@ -16,6 +16,7 @@
  */
 package org.openintents.safe;
 
+import org.openintents.distribution.EulaActivity;
 import org.openintents.util.VersionUtils;
 
 import android.app.Activity;
@@ -63,6 +64,11 @@ public class AskPassword extends Activity {
 	@Override
 	public void onCreate(Bundle icicle) {
 		super.onCreate(icicle);
+        
+		if (!EulaActivity.checkEula(this, getIntent())) {
+            return;
+        }
+        
 		Intent thisIntent = getIntent();
 		
 		boolean isLocal = thisIntent.getBooleanExtra (EXTRA_IS_LOCAL, false);