Fixed file opening.

2 files changed, 22 insertions, 1 deletions

diff --git a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
index cf042a426421..50e8a0669b26 100644
--- a/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
+++ b/android/experimental/DocumentLoader/src/org/libreoffice/android/examples/DocumentLoader.java
@@ -102,6 +102,8 @@ public class DocumentLoader
     ViewGroup.LayoutParams matchParent;
 
     ViewFlipper flipper;
+    
+    Bundle extras;
 
     class GestureListener
         extends GestureDetector.SimpleOnGestureListener
@@ -510,6 +512,8 @@ public class DocumentLoader
     {
         super.onCreate(savedInstanceState);
 
+		extras = getIntent().getExtras();
+
         gestureDetector = new GestureDetector(this, new GestureListener());
 
         try {
@@ -591,6 +595,21 @@ public class DocumentLoader
     {
         return gestureDetector.onTouchEvent(event);
     }
+    
+    @Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+	    switch (item.getItemId()) {
+	        case android.R.id.home:
+	            // app icon in action bar clicked; go home
+	            Intent intent = new Intent(this, LibreOfficeUIActivity.class);
+	            intent.putExtras( extras );
+	            //intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+	            startActivity(intent);
+	            return true;
+	        default:
+	            return super.onOptionsItemSelected(item);
+	    }
+	}
 }
 
 // vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
index bdf2c53ed283..0f31f199a088 100644
--- a/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/experimental/LibreOffice4Android/src/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -167,7 +167,9 @@ public class LibreOfficeUIActivity extends Activity implements OnNavigationListe
     	i.putExtra( EXPLORER_VIEW_TYPE_KEY  , viewMode );
     	startActivity( i );
     	*/
-    	startActivity( new Intent( this , DocumentLoader.class ) );
+    	Intent i = new Intent( this , DocumentLoader.class );
+    	i.putExtra("input",new File( currentDirectory , file).getAbsolutePath() );
+    	startActivity( i );
     }
     
     @Override