[Libreoffice-commits] core.git: Branch 'feature/tiled-editing' - android/experimental

[Miklos Vajna]

 android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c562919db2cec7810e8dbaf3a9b8fd4d7b5691ec
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Wed Jan 21 11:27:05 2015 +0100

    android: eliminate hardcoded LibreOfficeMainActivity and package in LOAbout
    
    Change-Id: I276f27a96b4fb970520dec588b9321731e7fc26b

diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java
index 27bb50a..13c436f 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/LOAbout.java
@@ -39,9 +39,9 @@ public abstract class LOAbout extends Activity {
     private void loadFromAbout(String input) {
         if (mNewActivity) {
             Intent i = new Intent(Intent.ACTION_VIEW, Uri.fromFile(new File(input)));
-            i.setComponent(new ComponentName(
-                        "org.libreoffice",
-                        "org.libreoffice.LibreOfficeMainActivity"));
+            String packageName = getApplicationContext().getPackageName();
+            ComponentName componentName = new ComponentName(packageName, LibreOfficeMainActivity.class.getName());
+            i.setComponent(componentName);
             startActivity(i);
         } else {
             LOKitShell.sendEvent(LOEventFactory.close());