From 534c27240e4eaa197954538cddbc0cef5c88fd57 Mon Sep 17 00:00:00 2001 From: Brian Pellin Date: Fri, 22 Feb 2013 21:45:38 -0600 Subject: [PATCH] Add workaround for broken HTC Linkify --- CHANGELOG | 1 + src/com/keepassdroid/LockCloseActivity.java | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e3851b910..d9f2bce9a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ * Updated German translations from Meviox * Add Finnish translations from Mika Takala + * Add workaround for broken HTC Linkify KeePassDroid (1.99.2) * Fix crash on entries without icons set (closes: #484) diff --git a/src/com/keepassdroid/LockCloseActivity.java b/src/com/keepassdroid/LockCloseActivity.java index 0dd0a8611..d4e551f72 100644 --- a/src/com/keepassdroid/LockCloseActivity.java +++ b/src/com/keepassdroid/LockCloseActivity.java @@ -20,6 +20,9 @@ package com.keepassdroid; import android.annotation.SuppressLint; +import android.content.ActivityNotFoundException; +import android.content.Intent; + import com.android.keepass.KeePass; import com.keepassdroid.app.App; @@ -41,4 +44,19 @@ public class LockCloseActivity extends LockingActivity { } + /* (non-Javadoc) Workaround for HTC Linkify issues + * @see android.app.Activity#startActivity(android.content.Intent) + */ + @Override + public void startActivity(Intent intent) { + try { + if (intent.getComponent() != null && intent.getComponent().getShortClassName().equals(".HtcLinkifyDispatcherActivity")) { + intent.setComponent(null); + } + super.startActivity(intent); + } catch (ActivityNotFoundException e) { + /* Catch the bad HTC implementation case */ + super.startActivity(Intent.createChooser(intent, null)); + } + } }