From 88142a28d6fa9acb31537b60530b7f5be89b4997 Mon Sep 17 00:00:00 2001
From: peli0101 <peli0101@72b678ce-9140-0410-bee8-679b907dd61a>
Date: Sat, 17 Jan 2009 12:50:04 +0000
Subject: [PATCH] OI Safe: Add OI About support. (somewhat redundant, because
 most info is included in the Help box?) Prepare for inclusion of more
 dialogs.

git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@1749 72b678ce-9140-0410-bee8-679b907dd61a
---
 AndroidManifest.xml                           |  26 ++-
 res/drawable/ic_launcher_folder_small.png     | Bin 0 -> 1522 bytes
 res/layout/dialog_filename.xml                |  34 ++++
 res/layout/eula.xml                           |  79 ++++++++
 res/raw/license_short.txt                     |  14 ++
 res/values/strings_and_arrays_about_info.xml  |  45 +++++
 res/values/strings_distribution.xml           |  46 +++++
 .../openintents/distribution/AboutDialog.java |  61 ++++++
 .../distribution/EulaActivity.java            | 176 ++++++++++++++++++
 .../distribution/GetFromMarketDialog.java     |  58 ++++++
 src/org/openintents/distribution/RD.java      |  60 ++++++
 .../openintents/distribution/UpdateMenu.java  | 120 ++++++++++++
 .../openintents/intents/AboutMiniIntents.java |  72 +++++++
 .../intents/FileManagerIntents.java           |  66 +++++++
 src/org/openintents/safe/CategoryList.java    |  10 +
 src/org/openintents/safe/FrontDoor.java       |  51 ++---
 .../safe/dialog/DialogHostingActivity.java    | 157 ++++++++++++++++
 .../safe/dialog/FilenameDialog.java           | 109 +++++++++++
 src/org/openintents/util/IntentUtils.java     |  43 +++++
 19 files changed, 1204 insertions(+), 23 deletions(-)
 create mode 100644 res/drawable/ic_launcher_folder_small.png
 create mode 100644 res/layout/dialog_filename.xml
 create mode 100644 res/layout/eula.xml
 create mode 100644 res/raw/license_short.txt
 create mode 100644 res/values/strings_and_arrays_about_info.xml
 create mode 100644 res/values/strings_distribution.xml
 create mode 100644 src/org/openintents/distribution/AboutDialog.java
 create mode 100644 src/org/openintents/distribution/EulaActivity.java
 create mode 100644 src/org/openintents/distribution/GetFromMarketDialog.java
 create mode 100644 src/org/openintents/distribution/RD.java
 create mode 100644 src/org/openintents/distribution/UpdateMenu.java
 create mode 100644 src/org/openintents/intents/AboutMiniIntents.java
 create mode 100644 src/org/openintents/intents/FileManagerIntents.java
 create mode 100644 src/org/openintents/safe/dialog/DialogHostingActivity.java
 create mode 100644 src/org/openintents/safe/dialog/FilenameDialog.java
 create mode 100644 src/org/openintents/util/IntentUtils.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f1fb5af..54bd7ed 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,7 +3,29 @@
     package="org.openintents.safe" 
     android:versionCode="1" 
     android:versionName="0.7.0">
-    <application android:icon="@drawable/icon_safe" android:allowClearUserData="true" android:debuggable="true" android:label="@string/app_name">
+    <application android:icon="@drawable/icon_safe" android:allowClearUserData="true" android:debuggable="true" android:label="@string/app_name">
+    
+		<meta-data android:name="org.openintents.metadata.COMMENTS"
+                       android:value="@string/about_comments" />
+        <meta-data android:name="org.openintents.metadata.COPYRIGHT"
+                       android:value="@string/about_copyright" />
+        <meta-data android:name="org.openintents.metadata.AUTHORS"
+                       android:resource="@array/about_authors" />
+        <meta-data android:name="org.openintents.metadata.DOCUMENTERS"
+                       android:resource="@array/about_documenters" />
+        <meta-data android:name="org.openintents.metadata.TRANSLATORS"
+                       android:resource="@array/about_translators" />
+        <meta-data android:name="org.openintents.metadata.ARTISTS"
+                       android:resource="@array/about_artists" />
+        <meta-data android:name="org.openintents.metadata.WEBSITE_LABEL"
+                       android:value="@string/about_website_label" />
+        <meta-data android:name="org.openintents.metadata.WEBSITE_URL"
+                       android:value="@string/about_website_url" />
+        <meta-data android:name="org.openintents.metadata.LICENSE"
+                       android:resource="@raw/license_short" />
+        <meta-data android:name="org.openintents.metadata.EMAIL"
+                       android:value="@string/about_email" />
+                       
         <activity class=".FrontDoor" android:name="FrontDoor" android:label="@string/app_name">
          	<intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -39,7 +61,7 @@
         <activity class=".ChangePass" android:name="ChangePass" android:label="@string/app_name" />
         <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 class=".LogOffActivity" android:name="LogOffActivity" android:label="@string/app_name" />
         
         <service class=".service.ServiceDispatchImpl" android:name=".service.ServiceDispatchImpl"
             android:label="@string/app_name"
diff --git a/res/drawable/ic_launcher_folder_small.png b/res/drawable/ic_launcher_folder_small.png
new file mode 100644
index 0000000000000000000000000000000000000000..5df8d60f04bcd636d11402840ef9cccaf4aad404
GIT binary patch
literal 1522
zcmV<O1r7R%P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOb;
z5DW@B*yK0>00nYML_t(o!|j(%Y+P3r$A9PE`{w(N$JkErIH{f3b!@5>B`9eTin@Xg
z5+GJ=sVae#3YMq{RTV6%Dyk|rY*<i<4MkNENC>fDfxvtS2|*lJkf>5iL}Hxr*UWf6
zJn!AZV%{5%$2Lt-5Sw1<>fZPC-aWtbKj(hIhvolV<WUXu@+&vEdgaPezL0;mGB##&
z+1%U4$eI}Q=h?^3?tfr_U;k!>XRdwfp^V>n^|hR;z6e~m#*~e<l*5p6xlE-}>6A*v
zJChR=KP(oDuUD(n5B?*-%dgz1OifNcTNxk!c%@Rgo6qHL8)N<<MsACkji;`BA{zew
z)z`jT0G=24jxi=<ti>3EH3pMZ7X&<Z=1hBTZua{8{P`aY|L*`)RR9qYU#rz#+T7gy
zy0sQ-45ct63`52%6^g}T>*v4t<=>pMw?*XU#>U2bo3+j7#F%HSF~$rTO{*mB&hBo0
zuhqH+90pL;kE-g|fH_rt=gqf%^4WX;yvNq|HUdOZM16OcX0wSkrjW^IFK4sa%Rvx)
zDT*TRg1`)WETa%2{r4gOQ=^Kz{a)_{5xEXnfG>Rha|jT}F^xu(t?e!9^#(gTJM8VX
zXm{FlI$gTmE=I(-Oy*dRhYcHJu+|`Asz(4+bwX7w{TQICNp=WfIix&RPU(rFh<3X}
zr_-U?=tI>uH>uYfL{W4ifEa^_0d)L0fVTk!L={9vb5sXV#u!SaBBfH1$;k->5MuzS
z*Xz`G>um4r&~CNqbUU=$9pX41K&a|z=iF2jMQxx1#Lj#FS6~k)^%XcUE}|R=(kDw{
zL<9whV*rZ9BBfG^nKLu^IHud}(r7eUy|sq-9udLEK3^`EuWfB@Z2)(H2PTf=dvWa7
z<Jgl{?+;g1P5ON``p*ab6e|4=5wf`)Q>Ug_SeVCJi?x<Gj-^m2UIm^8J_*b@?|luV
z1}vmr_8S?5Lk4k?p%9Js^~ifwr5uK2G8y7HMpbdn=71tl1s=FK_UoW`L7qNr_@wp#
z=>5P%1Y<4PY=%y!i&v#sEV(4P91ysPkBs*o)M|IqMR9oWM*?63YaL>GsCuk5>6aep
zx&HKue+7K={f&R{76j*Pe?F;_FBDt?un#mHfcO4Ss@f8f!U4d;C?dxya_FCA`ie+@
zHYDkh0JI&zOm({P?t6FN5aG+Ify0K6@1JON2(-Td^%pVkeHtfCrhX%pgE)?U3i3q}
z#!~M_L5AUuH+&Sr81P=%-#>IDP@p+bAjyN@sp=m^<TL4DhdmMg8?aRVZnv9GO$8!g
z2WSldy!SO#{l2PxTKeUPN5?~q8b1u^y~kL?ey@iBtyU{a;=c>*4*-^z78Q8&w=2JY
zL5%rECJ4rDa<~}mbOU8ZD??yM70Lt|x}7d!gzfF^7SI5;fXI#RPPcBYeJ_{G-tk_a
zpPrt+TqqXCoV8fz21}|v0ctoGhQTtK3{ezeon?1-cMqs1IS?NK`07`lYXENnKMR5&
zys)(V#Ny)O;-yQMFP=Mh{+x66tP6t4%2?%8HkZx01k4?ymN5q*3(Fzv>+7vXqfrOe
z69AQmI5pdJ*$jdpx3si8y?Eh5b$R(?=Yt@aFO|Ye)79$2=~Ji9T4!<2VU5K(J5bCR
z!@c|WSy@@R|LvDv{1)&B;P1yOFjCTtjet(C*K4k>-rQVWy}6b^IUon*X6NQ+E?#`{
ziK|zix->U;Zr)f^4V)Vf!*C*BC=^7*H0t$tfp>uWK>R4~1u~+P1v2@3A^-T|;`Hq7
z?CFJt$7jMYoUzV5xpr&yFF$_cN3R3_N}PIh7n5U(84Y2w0ku=(|7(Dg?jQQ$g><<5
Y8^FyV#?4~7fdBvi07*qoM6N<$f={f|vj6}9

literal 0
HcmV?d00001

diff --git a/res/layout/dialog_filename.xml b/res/layout/dialog_filename.xml
new file mode 100644
index 0000000..c9b4bfa
--- /dev/null
+++ b/res/layout/dialog_filename.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2006-2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="horizontal"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="10dip"
+    >
+    <EditText android:id="@+id/file_path"
+	    android:layout_width="0dip" 
+	    android:layout_height="wrap_content" 
+	    android:layout_weight="1"/>
+	<ImageButton android:id="@+id/file_manager"
+		android:src="@drawable/ic_launcher_folder_small"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/eula.xml b/res/layout/eula.xml
new file mode 100644
index 0000000..47d446e
--- /dev/null
+++ b/res/layout/eula.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+ * Copyright (C) 2007-2008 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+    	<TextView  
+			    android:id="@+id/text1"
+				android:layout_width="fill_parent" 
+			    android:layout_height="34dip" 
+			    android:text="@string/eula_title"
+    			android:gravity="center"
+			    android:textStyle="bold"
+			    android:textColor="#ffffffff"
+			    android:layout_marginTop="10dip"
+			    android:layout_marginBottom="10dip"
+				/>
+		<ScrollView
+				android:layout_width="fill_parent"
+				android:layout_height="0dip"
+				android:layout_weight="1"
+			    android:layout_marginBottom="10dip"
+				android:layout_marginLeft="5dip"
+			>
+				<TextView  
+				    android:id="@+id/text"
+					android:layout_width="wrap_content" 
+				    android:layout_height="wrap_content" 
+				    android:autoLink="web"
+			    	android:bufferType="spannable"
+				    android:textColor="#ffffffff"
+				    android:layout_marginLeft="10dip"
+				    android:layout_marginRight="10dip"
+				    android:layout_marginTop="10dip"
+				    android:layout_marginBottom="10dip"
+					/>
+			</ScrollView>
+		<LinearLayout
+			android:id="@+id/container2"
+			android:orientation="horizontal"
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			>
+			<Button android:id="@+id/button1"
+				android:layout_width="0dip"
+				android:layout_height="wrap_content" 				
+				android:layout_gravity="bottom"
+				android:layout_weight="1"
+				android:text="@string/eula_accept" />
+			<LinearLayout
+				android:orientation="horizontal"
+				android:layout_width="0dip"
+				android:layout_height="wrap_content"
+				android:layout_weight="1"
+				/>
+			<Button android:id="@+id/button2"
+				android:layout_width="0dip"
+				android:layout_height="wrap_content" 				
+				android:layout_gravity="bottom"
+				android:layout_weight="1"
+				android:text="@string/eula_refuse" />
+		</LinearLayout>
+		
+</LinearLayout>
\ No newline at end of file
diff --git a/res/raw/license_short.txt b/res/raw/license_short.txt
new file mode 100644
index 0000000..99a0b46
--- /dev/null
+++ b/res/raw/license_short.txt
@@ -0,0 +1,14 @@
+Copyright (C) 2008-2009 Steven Osborn - http://steven.bitsetters.com and
+Randy McEoin (and others, see About box)
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
diff --git a/res/values/strings_and_arrays_about_info.xml b/res/values/strings_and_arrays_about_info.xml
new file mode 100644
index 0000000..14d80a5
--- /dev/null
+++ b/res/values/strings_and_arrays_about_info.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+ * Copyright (C) 2007-2008 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+<resources>
+
+    <!-- Strings for OI About -->
+	<string name="about_comments">OI Safe keeps all your private data encrypted.</string>  
+	<string name="about_copyright">Copyright © 2008-2009 Steven Osborn and Randy McEoin</string> 
+	<string name="about_website_label">OI Safe at OpenIntents</string> 
+	<string name="about_website_url">http://www.openintents.org</string>
+	<string name="about_email">support@openintents.org</string>
+	
+    <string-array name="about_authors"><!-- Add your name here if you helped out -->
+        <item>Steven Osborn - http://steven.bitsetters.com</item>
+        <item>Randy McEoin</item>
+        <item>Isaac Potoczny-Jones - http://www.syntaxpolice.org</item>
+        <item>Peli</item>
+    </string-array>
+    
+    <string-array name="about_documenters"><!-- Add your name here if you helped out -->
+        <!-- <item></item> -->
+    </string-array>
+    
+    <string-array name="about_translators"><!-- Add your name here if you helped out, but only in the arrays.xml for the localization that you helped to translate into! -->
+        <!-- <item></item>  -->
+    </string-array>
+    
+    <string-array name="about_artists"><!-- Add your name here if you helped out -->
+        <item>David Vignoni - http://www.icon-king.com/</item>
+        <item>Peli</item>
+    </string-array>
+</resources>
diff --git a/res/values/strings_distribution.xml b/res/values/strings_distribution.xml
new file mode 100644
index 0000000..06f700b
--- /dev/null
+++ b/res/values/strings_distribution.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 
+ * Copyright (C) 2007-2008 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ -->
+<resources>
+	
+	<!-- EULA -->
+	<string name="eula_title">OI Safe EULA</string>
+	<string name="eula_accept">Accept</string>
+	<string name="eula_refuse">Cancel</string>
+	
+	<!-- Update -->
+		<string name="update_box_text">Please check manually for updates or install OI Update
+for automatic notifications.
+Current version: %s
+	</string>
+	<string name="update_check_now">Check now.</string>
+	<string name="update_get_updater">Get OI Updater.</string>
+	<string name="update_app_url">market://search?q=pname:org.openintents.safe</string>
+	<string name="update_checker_url">market://search?q=pname:org.openintents.updatechecker</string>
+	<string name="update_error">Download application not available.</string>
+	<string name="update">Check updates</string>
+	
+    <!-- About -->
+    <string name="about">About</string>
+	<string name="aboutapp_not_available">Version %s\n\nNo compatible extension available to display full info (contact, credits, license).</string>
+    <string name="aboutapp_get">Get OI About</string>
+    <string name="aboutapp_market_uri">market://search?q=pname:org.openintents.about</string>
+    
+    <!-- File Manager -->
+    <string name="filemanager_not_available">No compatible file manager is available.</string>
+    <string name="filemanager_get_oi_filemanager">Get OI File Manager</string>
+    <string name="filemanager_market_uri">market://search?q=pname:org.openintents.filemanager</string>
+</resources>
diff --git a/src/org/openintents/distribution/AboutDialog.java b/src/org/openintents/distribution/AboutDialog.java
new file mode 100644
index 0000000..258c744
--- /dev/null
+++ b/src/org/openintents/distribution/AboutDialog.java
@@ -0,0 +1,61 @@
+/* 
+ * Copyright (C) 2007-2008 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openintents.distribution;
+
+import org.openintents.intents.AboutMiniIntents;
+import org.openintents.util.IntentUtils;
+import org.openintents.util.VersionUtils;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * About dialog
+ *
+ * @version 2009-01-16
+ * @author Peli
+ *
+ */
+public class AboutDialog extends GetFromMarketDialog {
+	private static final String TAG = "About";
+    
+	public AboutDialog(Context context) {
+		super(context,
+				RD.string.aboutapp_not_available,
+				RD.string.aboutapp_get,
+				RD.string.aboutapp_market_uri);
+		
+		String version = VersionUtils.getVersionNumber(context);
+		String name = VersionUtils.getApplicationName(context);
+
+		setTitle(name);
+		setMessage(context.getString(RD.string.aboutapp_not_available, version));
+	}
+	
+	public static void showDialogOrStartActivity(Activity activity, int dialogId) {
+		Intent intent = new Intent(AboutMiniIntents.ACTION_SHOW_ABOUT_DIALOG);
+		intent.putExtra(AboutMiniIntents.EXTRA_PACKAGE_NAME, activity.getPackageName());
+		
+		if (IntentUtils.isIntentAvailable(activity, intent)) {
+			activity.startActivity(intent);
+		} else {
+			activity.showDialog(dialogId);
+		}
+	}
+
+}
diff --git a/src/org/openintents/distribution/EulaActivity.java b/src/org/openintents/distribution/EulaActivity.java
new file mode 100644
index 0000000..363bbba
--- /dev/null
+++ b/src/org/openintents/distribution/EulaActivity.java
@@ -0,0 +1,176 @@
+package org.openintents.distribution;
+
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+
+/**
+ * Displays the Eula for the first time, reading it from a raw resource.
+ * 
+ * @version 2009-01-17
+ * @author Peli
+ *
+ */
+public class EulaActivity extends Activity {
+
+	/** TAG for log messages. */
+	private static final String TAG = "EulaActivity";
+	
+	static final String PREFERENCES_EULA_ACCEPTED = "eula_accepted";
+	
+	/**
+	 * Extra for main intent.
+	 * Specifies activity that should be launched after Eula has been accepted.
+	 */
+	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 Button mAgree;
+	private Button mDisagree;
+	
+	private String mLaunchPackage;
+	private String mLaunchClass;
+	
+	/** Called when the activity is first created. */
+	@Override
+	public void onCreate(Bundle icicle) {
+		super.onCreate(icicle);
+		
+		setContentView(RD.layout.eula);
+		
+		// Extras are provided by checkEula() below.
+		Intent i = getIntent();
+		Bundle b = i.getExtras();
+		mLaunchPackage = b.getString(EXTRA_LAUNCH_ACTIVITY_PACKAGE);
+		mLaunchClass = b.getString(EXTRA_LAUNCH_ACTIVITY_CLASS);
+		
+		//mIntroContinue = (Button) findViewById(R.id.intro_continue);
+		mAgree = (Button) findViewById(RD.id.button1);
+		mAgree.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View view) {
+				acceptEula();
+			}
+		});
+		
+		mDisagree = (Button) findViewById(RD.id.button2);
+		mDisagree.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View view) {
+				refuseEula();
+			}
+		});
+		
+		TextView text = (TextView) findViewById(RD.id.text);
+		text.setText(readLicenseFromRawResource(RD.raw.license_short));
+		
+	}
+	
+	/**
+	 * Accept EULA and proceed with main application.
+	 */
+	public void acceptEula() {
+		SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
+		SharedPreferences.Editor e = sp.edit();
+		e.putBoolean(PREFERENCES_EULA_ACCEPTED, true);
+		e.commit();
+		
+		// Call the activity that originally called checkEula()
+		Intent i = new Intent();
+		i.setClassName(mLaunchPackage, mLaunchClass);
+		startActivity(i);
+		finish();
+	}
+	
+	/**
+	 * Refuse EULA.
+	 */
+	public void refuseEula() {
+		SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
+		SharedPreferences.Editor e = sp.edit();
+		e.putBoolean(PREFERENCES_EULA_ACCEPTED, false);
+		e.commit();
+		
+		finish();
+	}
+
+	/**
+	 * Test whether EULA has been accepted. Otherwise display EULA.
+	 * 
+	 * @return True if Eula has been accepted.
+	 */
+	public static boolean checkEula(Activity activity) {
+		SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(activity);
+		boolean accepted = sp.getBoolean(PREFERENCES_EULA_ACCEPTED, false);
+		
+		if (accepted) {
+			Log.i(TAG, "Eula has been accepted.");
+			return true;
+		} else {
+			Log.i(TAG, "Eula has not been accepted yet.");
+			
+			// Launch Eula activity
+			Intent i = new Intent(activity, EulaActivity.class);
+			ComponentName ci = activity.getComponentName();
+			
+			// Specify in intent extras which activity should be called
+			// after Eula has been accepted.
+			Log.d(TAG, "Local package name: " + ci.getPackageName());
+			Log.d(TAG, "Local class name: " + ci.getClassName());
+			i.putExtra(EXTRA_LAUNCH_ACTIVITY_PACKAGE, ci.getPackageName());
+			i.putExtra(EXTRA_LAUNCH_ACTIVITY_CLASS, ci.getClassName());
+			activity.startActivity(i);
+			activity.finish();
+			return false;
+		}
+	}
+	
+	/**
+	 * Read license from raw resource.
+	 * @param resourceid ID of the raw resource.
+	 * @return
+	 */
+	private String readLicenseFromRawResource(int resourceid) {
+
+		// Retrieve license from resource:
+		String license = "";
+		Resources resources = getResources();
+    		
+		//Read in the license file as a big String
+		BufferedReader in
+		   = new BufferedReader(new InputStreamReader(
+				resources.openRawResource(resourceid)));
+		String line;
+		StringBuilder sb = new StringBuilder();
+		try {
+			while ((line = in.readLine()) != null) { // Read line per line.
+				if (TextUtils.isEmpty(line)) {
+					// Empty line: Leave line break
+					sb.append("\n\n");
+				} else {
+					sb.append(line);
+					sb.append(" ");
+				}
+			}
+			license = sb.toString();
+		} catch (IOException e) {
+			//Should not happen.
+			e.printStackTrace();
+		}
+		
+    	
+    	return license;
+	}
+}
diff --git a/src/org/openintents/distribution/GetFromMarketDialog.java b/src/org/openintents/distribution/GetFromMarketDialog.java
new file mode 100644
index 0000000..f909bef
--- /dev/null
+++ b/src/org/openintents/distribution/GetFromMarketDialog.java
@@ -0,0 +1,58 @@
+package org.openintents.distribution;
+
+import android.app.AlertDialog;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.DialogInterface.OnClickListener;
+import android.net.Uri;
+import android.util.Log;
+import android.widget.Toast;
+
+public class GetFromMarketDialog extends AlertDialog implements OnClickListener {
+	private static final String TAG = "StartSaveActivity";
+
+    Context mContext;
+    int mMarketUri;
+    
+    public GetFromMarketDialog(Context context, int message, int buttontext, int market_uri) {
+        super(context);
+        mContext = context;
+        mMarketUri = market_uri;
+
+        //setTitle(context.getText(R.string.menu_edit_tags));
+        setMessage(mContext.getText(message));
+    	setButton(mContext.getText(buttontext), this);
+        
+    }
+
+	public void onClick(DialogInterface dialog, int which) {
+    	if (which == BUTTON1) {
+    		Uri uri = Uri.parse(mContext.getString(mMarketUri));
+    		
+			Intent intent = new Intent(Intent.ACTION_VIEW);
+			intent.setData(uri);
+			GetFromMarketDialog.startSaveActivity(mContext, intent);
+    	}
+		
+	}
+	
+	/**
+	 * Start an activity but prompt a toast if activity is not found
+	 * (instead of crashing).
+	 * 
+	 * @param context
+	 * @param intent
+	 */
+	public static void startSaveActivity(Context context, Intent intent) {
+		try {
+			context.startActivity(intent);
+		} catch (ActivityNotFoundException e) {
+			Toast.makeText(context,
+					RD.string.update_error,
+					Toast.LENGTH_SHORT).show();
+			Log.e(TAG, "Error starting activity.", e);
+		}
+	}
+}
diff --git a/src/org/openintents/distribution/RD.java b/src/org/openintents/distribution/RD.java
new file mode 100644
index 0000000..f4a40fe
--- /dev/null
+++ b/src/org/openintents/distribution/RD.java
@@ -0,0 +1,60 @@
+package org.openintents.distribution;
+
+import org.openintents.safe.R;
+
+/**
+ * Resources for the distribution package.
+ * RD = Resources Distribution
+ * @author Peli
+ *
+ */
+public class RD {
+	public class layout {
+		public static final int eula = R.layout.eula;
+	}
+	
+	public class id {
+		
+		///////////////////////////////////////
+		// Eula activity
+		public static final int button1 = R.id.button1;
+		public static final int button2 = R.id.button2;
+		public static final int text = R.id.text;
+		
+	}
+	
+	public class string {
+		
+		///////////////////////////////////////
+		// Eula activity
+
+		///////////////////////////////////////
+		// Update Menu
+		public static final int update_box_text = R.string.update_box_text;
+		public static final int update_check_now = R.string.update_check_now;
+		public static final int update_app_url = R.string.update_app_url;
+		public static final int update_get_updater = R.string.update_get_updater;
+		public static final int update_checker_url = R.string.update_checker_url;
+		public static final int update_error = R.string.update_error;
+
+		///////////////////////////////////////
+		// GetFromMarketDialog
+		public static final int filemanager_not_available = R.string.filemanager_not_available;
+		public static final int filemanager_get_oi_filemanager = R.string.filemanager_get_oi_filemanager;
+		public static final int filemanager_market_uri = R.string.filemanager_market_uri;
+
+		///////////////////////////////////////
+		// GetFromMarketDialog
+		public static final int aboutapp_not_available = R.string.aboutapp_not_available;
+		public static final int aboutapp_get = R.string.aboutapp_get;
+		public static final int aboutapp_market_uri = R.string.aboutapp_market_uri;
+		
+	}
+	
+	public class raw {
+		///////////////////////////////////////
+		// Eula activity
+		public static final int license_short = R.raw.license_short;
+		
+	}
+}
diff --git a/src/org/openintents/distribution/UpdateMenu.java b/src/org/openintents/distribution/UpdateMenu.java
new file mode 100644
index 0000000..56103cf
--- /dev/null
+++ b/src/org/openintents/distribution/UpdateMenu.java
@@ -0,0 +1,120 @@
+/* 
+ * Copyright (C) 2008 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openintents.distribution;
+
+// Version Nov 12, 2008
+
+import android.app.AlertDialog.Builder;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.DialogInterface.OnClickListener;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.net.Uri;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.widget.Toast;
+
+public class UpdateMenu {
+	
+	private static final String TAG = "UpdateMenu";
+	
+	public static final String UPDATE_CHECKER = "org.openintents.updatechecker";
+
+	/**
+	 * Adds a menu item for update only if update checker is not installed.
+	 * 
+	 * @param context
+	 * @param menu
+	 * @param groupId
+	 * @param itemId
+	 * @param order
+	 * @param titleRes
+	 * @return
+	 */
+	public static MenuItem addUpdateMenu(Context context, Menu menu, int groupId,
+			int itemId, int order, int titleRes) {
+		PackageInfo pi = null;
+		try {
+			pi = context.getPackageManager().getPackageInfo(
+					UPDATE_CHECKER, 0);
+		} catch (NameNotFoundException e) {
+			// ignore
+		}
+		if (pi == null) {
+			return menu.add(groupId, itemId, order, titleRes).setIcon(
+					android.R.drawable.ic_menu_info_details).setShortcut('9',
+					'u');
+		} else {
+			return null;
+		}
+	}
+	
+
+	/**
+	 * Shows dialog box with option to upgrade.
+	 * 
+	 * @param context
+	 */
+	public static void showUpdateBox(final Context context) {
+		String version = null;
+		try {
+			version = context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionName;
+		} catch (NameNotFoundException e) {
+			e.printStackTrace();
+		}
+		final Intent intent  = new Intent(Intent.ACTION_VIEW);
+		new Builder(context).setMessage(context.getString(RD.string.update_box_text, version))
+		.setPositiveButton(RD.string.update_check_now, new OnClickListener(){
+
+			public void onClick(DialogInterface arg0, int arg1) {
+				intent.setData(Uri.parse(context.getString(RD.string.update_app_url)));
+				startSaveActivity(context, intent);
+			}
+			
+		}).setNegativeButton(RD.string.update_get_updater, new OnClickListener(){
+
+			public void onClick(DialogInterface dialog, int which) {
+				intent.setData(Uri.parse(context.getString(RD.string.update_checker_url)));
+				startSaveActivity(context, intent);
+			}
+			
+		}).show();		
+	}
+	
+	/**
+	 * Start an activity but prompt a toast if activity is not found
+	 * (instead of crashing).
+	 * 
+	 * @param context
+	 * @param intent
+	 */
+	private static void startSaveActivity(Context context, Intent intent) {
+		try {
+			context.startActivity(intent);
+		} catch (ActivityNotFoundException e) {
+			Toast.makeText(context,
+					RD.string.update_error,
+					Toast.LENGTH_SHORT).show();
+			Log.e(TAG, "Error starting activity.", e);
+		}
+	}
+
+}
diff --git a/src/org/openintents/intents/AboutMiniIntents.java b/src/org/openintents/intents/AboutMiniIntents.java
new file mode 100644
index 0000000..d66c9f5
--- /dev/null
+++ b/src/org/openintents/intents/AboutMiniIntents.java
@@ -0,0 +1,72 @@
+/* 
+ * Copyright (C) 2008-2009 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openintents.intents;
+
+/**
+ * Intents definition belonging to OI About.
+ * 
+ * @version 2009-Jan-08
+ * 
+ * @author pjv
+ * @author Peli
+ *
+ */
+public final class AboutMiniIntents {
+	
+	/**
+	 * Empty, preventing instantiation.
+	 */
+	private AboutMiniIntents() {
+		//Empty, preventing instantiation.
+	}
+
+	/**
+	 * Activity Action: Show an about dialog to display
+	 * information about the application.
+	 * 
+	 * The application information is retrieved from the
+	 * application's manifest. In order to send the package
+	 * you have to launch this activity through
+	 * startActivityForResult().
+	 * 
+	 * Alternatively, you can specify the package name 
+	 * manually through the extra EXTRA_PACKAGE.
+	 * 
+	 * All data can be replaced using optional intent extras.
+	 * 
+	 * <p>
+	 * Constant Value: "org.openintents.action.SHOW_ABOUT_DIALOG"
+	 * </p>
+	 */
+	public static final String ACTION_SHOW_ABOUT_DIALOG = 
+		"org.openintents.action.SHOW_ABOUT_DIALOG";
+
+	/**
+	 * Optional intent extra: Specify your application package name.
+	 * 
+	 * If you start the About dialog through startActivityForResult()
+	 * then the application package is sent automatically and does
+	 * not need to be supplied here.
+	 * 
+	 * <p>
+	 * Constant Value: "org.openintents.extra.PACKAGE_NAME"
+	 * </p>
+	 */
+	public static final String EXTRA_PACKAGE_NAME = 
+		"org.openintents.extra.PACKAGE_NAME";
+	
+}
diff --git a/src/org/openintents/intents/FileManagerIntents.java b/src/org/openintents/intents/FileManagerIntents.java
new file mode 100644
index 0000000..cb7e535
--- /dev/null
+++ b/src/org/openintents/intents/FileManagerIntents.java
@@ -0,0 +1,66 @@
+/* 
+ * Copyright (C) 2008 OpenIntents.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openintents.intents;
+
+// Version Dec 9, 2008
+
+
+/**
+ * Provides OpenIntents actions, extras, and categories used by providers. 
+ * <p>These specifiers extend the standard Android specifiers.</p>
+ */
+public final class FileManagerIntents {
+
+	/**
+	 * Activity Action: Pick a file through the file manager, or let user
+	 * specify a custom file name.
+	 * Data is the current file name or file name suggestion.
+	 * Returns a new file name as file URI in data.
+	 * 
+	 * <p>Constant Value: "org.openintents.action.PICK_FILE"</p>
+	 */
+	public static final String ACTION_PICK_FILE = "org.openintents.action.PICK_FILE";
+
+	/**
+	 * Activity Action: Pick a directory through the file manager, or let user
+	 * specify a custom file name.
+	 * Data is the current directory name or directory name suggestion.
+	 * Returns a new directory name as file URI in data.
+	 * 
+	 * <p>Constant Value: "org.openintents.action.PICK_DIRECTORY"</p>
+	 */
+	public static final String ACTION_PICK_DIRECTORY = "org.openintents.action.PICK_DIRECTORY";
+	
+	/**
+	 * The title to display.
+	 * 
+	 * <p>This is shown in the title bar of the file manager.</p>
+	 * 
+	 * <p>Constant Value: "org.openintents.extra.TITLE"</p>
+	 */
+	public static final String EXTRA_TITLE = "org.openintents.extra.TITLE";
+
+	/**
+	 * The text on the button to display.
+	 * 
+	 * <p>Depending on the use, it makes sense to set this to "Open" or "Save".</p>
+	 * 
+	 * <p>Constant Value: "org.openintents.extra.BUTTON_TEXT"</p>
+	 */
+	public static final String EXTRA_BUTTON_TEXT = "org.openintents.extra.BUTTON_TEXT";
+
+}
diff --git a/src/org/openintents/safe/CategoryList.java b/src/org/openintents/safe/CategoryList.java
index 6baf7a5..fe9ff76 100644
--- a/src/org/openintents/safe/CategoryList.java
+++ b/src/org/openintents/safe/CategoryList.java
@@ -28,6 +28,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
+import org.openintents.distribution.AboutDialog;
 import org.openintents.intents.CryptoIntents;
 import org.openintents.safe.service.ServiceDispatchImpl;
 
@@ -80,6 +81,7 @@ public class CategoryList extends ListActivity {
     public static final int BACKUP_INDEX = Menu.FIRST + 9;
     public static final int RESTORE_INDEX = Menu.FIRST + 10;
     public static final int PREFERENCES_INDEX = Menu.FIRST + 11;
+    public static final int ABOUT_INDEX = Menu.FIRST + 12;
     
     public static final int REQUEST_ONCREATE = 0;
     public static final int REQUEST_EDIT_CATEGORY = 1;
@@ -93,6 +95,7 @@ public class CategoryList extends ListActivity {
     
     private static final int IMPORT_PROGRESS_KEY = 0;
     private static final int BACKUP_PROGRESS_KEY = IMPORT_PROGRESS_KEY + 1;
+    private static final int ABOUT_KEY = IMPORT_PROGRESS_KEY + 2;
 
     public static final int MAX_CATEGORIES = 256;
 
@@ -309,6 +312,8 @@ public class CategoryList extends ListActivity {
                 dialog.setCancelable(false);
                 return dialog;
             }
+            case ABOUT_KEY:
+            	return new AboutDialog(this);
         }
         return null;
     }
@@ -425,6 +430,8 @@ public class CategoryList extends ListActivity {
 		menu.add(0, RESTORE_INDEX, 0, R.string.restore);
 
 		menu.add(0, PREFERENCES_INDEX, 0, R.string.preferences);
+		menu.add(0, ABOUT_INDEX, 0, R.string.about).setIcon(
+ 				android.R.drawable.ic_menu_info_details);
 
 		return super.onCreateOptionsMenu(menu);
     }
@@ -514,6 +521,9 @@ public class CategoryList extends ListActivity {
 			Intent preferences = new Intent(this, Preferences.class);
 			startActivity(preferences);
 			break;
+		case ABOUT_INDEX:
+			AboutDialog.showDialogOrStartActivity(this, ABOUT_KEY);
+			break;
 		default:
 			Log.e(TAG,"Unknown itemId");
 			break;
diff --git a/src/org/openintents/safe/FrontDoor.java b/src/org/openintents/safe/FrontDoor.java
index c4b8e74..ff3adab 100644
--- a/src/org/openintents/safe/FrontDoor.java
+++ b/src/org/openintents/safe/FrontDoor.java
@@ -49,6 +49,10 @@ public class FrontDoor extends Activity {
 
 	private static final boolean debug = !false;
 	private static String TAG = "FrontDoor";
+	
+	private static final int REQUEST_CODE_ASK_PASSWORD = 1;
+	private static final int REQUEST_CODE_GRANT_EXTERNAL_ACCESS = 2;
+	
 
 	private DBHelper dbHelper;
 	private String masterKey;
@@ -71,29 +75,34 @@ public class FrontDoor extends Activity {
 
 	//currently only handles result from askPassword function.
 	protected void onActivityResult (int requestCode, int resultCode, Intent data) {
-		switch (resultCode) {
-		case RESULT_OK:
-			masterKey = data.getStringExtra("masterKey");
-			String timeout = mPreferences.getString("lock_timeout", "5"); 
-			int timeoutMinutes=5; // default to 5
-			try {
-				timeoutMinutes = Integer.valueOf(timeout);
-			} catch (NumberFormatException e) {
-				Log.d(TAG,"why is lock_timeout busted?");
-			}
-			try {
-				service.setTimeoutMinutes(timeoutMinutes);
-				service.setPassword(masterKey); // should already be connected.
-			} catch (RemoteException e1) {
-				// TODO Auto-generated catch block
-				e1.printStackTrace();
+		if (resultCode == RESULT_OK) {
+			switch (requestCode) {
+			case REQUEST_CODE_ASK_PASSWORD:
+				masterKey = data.getStringExtra("masterKey");
+				String timeout = mPreferences.getString("lock_timeout", "5"); 
+				int timeoutMinutes=5; // default to 5
+				try {
+					timeoutMinutes = Integer.valueOf(timeout);
+				} catch (NumberFormatException e) {
+					Log.d(TAG,"why is lock_timeout busted?");
+				}
+				try {
+					service.setTimeoutMinutes(timeoutMinutes);
+					service.setPassword(masterKey); // should already be connected.
+				} catch (RemoteException e1) {
+					// TODO Auto-generated catch block
+					e1.printStackTrace();
+				}
+				actionDispatch();
+				break;
+			case REQUEST_CODE_GRANT_EXTERNAL_ACCESS:
+				
+				break;
 			}
-			actionDispatch();
-			break;
-		case RESULT_CANCELED:
+			
+		} else { // resultCode == RESULT_CANCELED
 			setResult(RESULT_CANCELED);
 			finish();
-			break;
 		}
 	}
 	
@@ -390,7 +399,7 @@ public class FrontDoor extends Activity {
 						askPass.putExtra (CryptoIntents.EXTRA_TEXT, inputBody);
 						askPass.putExtra (AskPassword.EXTRA_IS_LOCAL, askPassIsLocal);
 						//TODO: Is there a way to make sure all the extras are set?	
-						startActivityForResult (askPass, 0);
+						startActivityForResult (askPass, REQUEST_CODE_ASK_PASSWORD);
 					} else {
 						if (debug) Log.d(TAG, "ask for password");
 						// Don't prompt but cancel
diff --git a/src/org/openintents/safe/dialog/DialogHostingActivity.java b/src/org/openintents/safe/dialog/DialogHostingActivity.java
new file mode 100644
index 0000000..04c8462
--- /dev/null
+++ b/src/org/openintents/safe/dialog/DialogHostingActivity.java
@@ -0,0 +1,157 @@
+package org.openintents.safe.dialog;
+
+import org.openintents.distribution.GetFromMarketDialog;
+import org.openintents.distribution.RD;
+import org.openintents.intents.FileManagerIntents;
+import org.openintents.safe.R;
+import org.openintents.util.IntentUtils;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.DialogInterface.OnDismissListener;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.EditText;
+
+public class DialogHostingActivity extends Activity {
+
+	private static final String TAG = "FilenameActivity";
+
+	public static final int DIALOG_ID_SAVE = 1;
+	public static final int DIALOG_ID_OPEN = 2;
+	public static final int DIALOG_ID_NO_FILE_MANAGER_AVAILABLE = 3;
+	
+	public static final String EXTRA_DIALOG_ID = "org.openintents.notepad.extra.dialog_id";
+	
+    EditText mEditText;
+    
+	@Override
+	protected void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		
+		Intent i = getIntent();
+		if (i != null) {
+			int dialogId = i.getIntExtra(EXTRA_DIALOG_ID, 0);
+			switch (dialogId) {
+			case DIALOG_ID_SAVE:
+				Log.i(TAG, "Show Save dialog");
+				saveFile();
+				break;
+			case DIALOG_ID_OPEN:
+				Log.i(TAG, "Show Save dialog");
+				openFile();
+				break;
+			case DIALOG_ID_NO_FILE_MANAGER_AVAILABLE:
+				Log.i(TAG, "Show no file manager dialog");
+				showDialog(DIALOG_ID_NO_FILE_MANAGER_AVAILABLE);
+				break;
+			}
+		}
+		
+		
+	}
+
+
+	/**
+	 * 
+	 */
+	private void saveFile() {
+		
+		// Check whether intent exists
+		Intent intent = new Intent(FileManagerIntents.ACTION_PICK_FILE);
+		intent.setData(getIntent().getData());
+		if (IntentUtils.isIntentAvailable(this, intent)) {
+			/*
+			intent.putExtra(NotePadIntents.EXTRA_URI, getIntent().getStringExtra(NotePadIntents.EXTRA_URI));
+			intent.putExtra(FileManagerIntents.EXTRA_TITLE, getText(R.string.menu_save_to_sdcard));
+			intent.putExtra(FileManagerIntents.EXTRA_BUTTON_TEXT, getText(R.string.save));
+			*/
+			intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+			startActivity(intent);
+			finish();
+		} else {
+			showDialog(DIALOG_ID_SAVE);
+		}
+	}
+	
+
+	private void openFile() {
+		
+		// Check whether intent exists
+		Intent intent = new Intent(FileManagerIntents.ACTION_PICK_FILE);
+		intent.setData(getIntent().getData());
+		if (IntentUtils.isIntentAvailable(this, intent)) {
+			/*
+			intent.putExtra(NotePadIntents.EXTRA_URI, getIntent().getStringExtra(NotePadIntents.EXTRA_URI));
+			intent.putExtra(FileManagerIntents.EXTRA_TITLE, getText(R.string.menu_open_from_sdcard));
+			intent.putExtra(FileManagerIntents.EXTRA_BUTTON_TEXT, getText(R.string.open));
+			intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
+			*/
+			startActivity(intent);
+			finish();
+		} else {
+			showDialog(DIALOG_ID_OPEN);
+		}
+	}
+
+	@Override
+	protected Dialog onCreateDialog(int id) {
+
+		switch (id) {
+		case DIALOG_ID_SAVE:
+			return new FilenameDialog(this);
+		case DIALOG_ID_OPEN:
+			return new FilenameDialog(this);
+		case DIALOG_ID_NO_FILE_MANAGER_AVAILABLE:
+			Log.i(TAG, "fmd - create");
+			return new GetFromMarketDialog(this, 
+					RD.string.filemanager_not_available,
+					RD.string.filemanager_get_oi_filemanager,
+					RD.string.filemanager_market_uri);
+
+		}
+		return null;
+	}
+
+	@Override
+	protected void onPrepareDialog(int id, Dialog dialog) {
+		FilenameDialog fd;
+		
+		dialog.setOnDismissListener(mDismissListener);
+		
+		switch (id) {
+		case DIALOG_ID_SAVE:
+			fd = (FilenameDialog) dialog;
+			//fd.setTitle(R.string.menu_save_to_sdcard);
+			
+			break;
+		case DIALOG_ID_OPEN:
+			fd = (FilenameDialog) dialog;
+			//fd.setTitle(R.string.menu_open_from_sdcard);
+			break;
+			
+		case DIALOG_ID_NO_FILE_MANAGER_AVAILABLE:
+			Log.i(TAG, "fmd - prepare");
+			/*
+			GetFileManagerFromMarketDialog gd = (GetFileManagerFromMarketDialog) dialog;
+			gd.setMessageResource(R.string.filemanager_not_available);
+			gd.setInfoResources(R.string.filemanager_get_oi_filemanager, 
+					R.string.filemanager_market_uri, 
+					R.drawable.ic_launcher_folder_small, 
+					R.string.update_error);
+					*/
+			break;
+		}
+	}
+	
+	OnDismissListener mDismissListener = new OnDismissListener() {
+		
+		public void onDismiss(DialogInterface dialoginterface) {
+			DialogHostingActivity.this.finish();
+		}
+		
+	};
+	
+}
diff --git a/src/org/openintents/safe/dialog/FilenameDialog.java b/src/org/openintents/safe/dialog/FilenameDialog.java
new file mode 100644
index 0000000..2802224
--- /dev/null
+++ b/src/org/openintents/safe/dialog/FilenameDialog.java
@@ -0,0 +1,109 @@
+package org.openintents.safe.dialog;
+
+import org.openintents.safe.R;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.DialogInterface.OnClickListener;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.ImageButton;
+
+public class FilenameDialog extends AlertDialog implements OnClickListener {
+	private static final String TAG = "FilenameDialog";
+
+    private static final String BUNDLE_TAGS = "tags";
+    
+	protected static final int DIALOG_ID_NO_FILE_MANAGER_AVAILABLE = 2;
+    
+    Context mContext;
+    
+    EditText mEditText;
+    
+    public FilenameDialog(Context context) {
+        super(context);
+        mContext = context;
+        
+        //setTitle(context.getText(R.string.menu_edit_tags));
+        setButton(context.getText(android.R.string.ok), this);
+        setButton2(context.getText(android.R.string.cancel), (OnClickListener) null);
+        setIcon(R.drawable.ic_launcher_folder_small);
+        
+        LayoutInflater inflater = 
+                (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View view = inflater.inflate(R.layout.dialog_filename, null);
+        setView(view);
+
+        mEditText = (EditText) view.findViewById(R.id.file_path);
+        
+        //SharedPreferences pm = PreferenceManager.getDefaultSharedPreferences(this);
+        //mEditText.setText(pm.getString(PREFERENCE_FILENAME, DEFAULT_FILENAME));
+
+        ImageButton buttonFileManager = (ImageButton) view.findViewById(R.id.file_manager);
+        
+        buttonFileManager.setOnClickListener(new View.OnClickListener() {
+			
+			public void onClick(View arg0) {
+				openFileManager();
+			}
+        });
+
+    }
+    
+          
+	public void onClick(DialogInterface dialog, int which) {
+    	if (which == BUTTON1) {
+    		openOrSave();
+    	}
+		
+	}
+    
+    void openOrSave() {
+    }
+
+	private void openFileManager() {
+		showNoFileManagerAvailableDialog();
+		
+		/*
+		String fileName = mEditText.getText().toString();
+		
+		Intent intent = new Intent(FileManagerIntents.ACTION_PICK_FILE);
+		intent.setData(Uri.parse("file://" + fileName));
+		*/
+		
+		//intent.putExtra(FileManagerIntents.EXTRA_TITLE, getString(RES_STRING_FILEMANAGER_TITLE));
+		//intent.putExtra(FileManagerIntents.EXTRA_BUTTON_TEXT, getString(RES_STRING_FILEMANAGER_BUTTON_TEXT));
+		
+		/*
+		try {
+			startActivityForResult(intent, REQUEST_CODE_PICK_FILE);
+		} catch (ActivityNotFoundException e) {
+			mContext.showDialog(DIALOG_ID_NO_FILE_MANAGER_AVAILABLE);
+		}
+		*/
+	}
+
+	void showNoFileManagerAvailableDialog() {
+
+		Intent i = new Intent(mContext, DialogHostingActivity.class);
+		i.putExtra(DialogHostingActivity.EXTRA_DIALOG_ID, DialogHostingActivity.DIALOG_ID_NO_FILE_MANAGER_AVAILABLE);
+		mContext.startActivity(i);
+	}
+	
+	@Override
+    public Bundle onSaveInstanceState() {
+        Bundle state = super.onSaveInstanceState();
+        state.putString(BUNDLE_TAGS, "");
+        return state;
+    }
+    
+    @Override
+    public void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        String tags = savedInstanceState.getString(BUNDLE_TAGS);
+    }
+}
diff --git a/src/org/openintents/util/IntentUtils.java b/src/org/openintents/util/IntentUtils.java
new file mode 100644
index 0000000..e4f71b9
--- /dev/null
+++ b/src/org/openintents/util/IntentUtils.java
@@ -0,0 +1,43 @@
+
+
+/**
+ * Original method retrieved from:
+ * http://android-developers.blogspot.com/2009/01/can-i-use-this-intent.html
+ */
+package org.openintents.util;
+
+import java.util.List;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+
+/**
+ * 
+ * @author romainguy
+ * @author Peli
+ *
+ */
+public class IntentUtils {
+	
+	/**
+	 * Indicates whether the specified action can be used as an intent. This
+	 * method queries the package manager for installed packages that can
+	 * respond to the specified intent. If no suitable package is
+	 * found, this method returns false.
+	 *
+	 * @param context The application's environment.
+	 * @param intent The Intent to check for availability.
+	 *
+	 * @return True if an Intent with the specified action can be sent and
+	 *         responded to, false otherwise.
+	 */
+	public static boolean isIntentAvailable(final Context context, final Intent intent) {
+	    final PackageManager packageManager = context.getPackageManager();
+	    List<ResolveInfo> list =
+	            packageManager.queryIntentActivities(intent,
+	                    PackageManager.MATCH_DEFAULT_ONLY);
+	    return list.size() > 0;
+	}
+}
-- 
2.50.1