moparisthebest
/
k-9
mirror of https://github.com/moparisthebest/k-9
1
0
Fork 0
Code Issues Releases Wiki Activity

Better solution coming up! 

Revert "Added fallback for when WebView.setEmbeddedTitleBar() is not available"

This reverts commit 6073b9d3fa.
This commit is contained in:
Jesse Vincent 2012-08-02 16:11:10 -07:00
parent 91d404350f
commit 17a6f79365
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/fsck/k9/view/MessageWebView.java
View File

@ -164,9 +164,15 @@ public class MessageWebView extends WebView {
}
}
public void wrapSetTitleBar(final View title) throws Exception {
Class<?> webViewClass = Class.forName("android.webkit.WebView");
Method setEmbeddedTitleBar = webViewClass.getMethod("setEmbeddedTitleBar", View.class);
setEmbeddedTitleBar.invoke(this, title);
public void wrapSetTitleBar(final View title) {
try {
Class<?> webViewClass = Class.forName("android.webkit.WebView");
Method setEmbeddedTitleBar = webViewClass.getMethod("setEmbeddedTitleBar", View.class);
setEmbeddedTitleBar.invoke(this, title);
}
catch (Exception e) {
Log.v(K9.LOG_TAG, "failed to find the setEmbeddedTitleBar method",e);
}
}
}

14
src/com/fsck/k9/view/SingleMessageView.java
View File

@ -160,19 +160,7 @@ public class SingleMessageView extends LinearLayout implements OnClickListener,
mTitleBarHeaderContainer = new LinearLayout(activity);
mTitleBarHeaderContainer.addView(mHeaderContainer);
try {
mMessageContentView.wrapSetTitleBar(mTitleBarHeaderContainer);
} catch (Exception e) {
// If wrapSetTitleBar() fails we put the header back. This isn't a very good
// fall-back but better than not displaying the message header at all.
// FIXME: Get rid of the setEmbeddedTitleBar-method and come up with something that
// feels just like it but doesn't use undocumented methods.
mTitleBarHeaderContainer.removeView(mHeaderContainer);
mHeaderPlaceHolder.addView(mHeaderContainer);
mTitleBarHeaderContainer = null;
}
mMessageContentView.wrapSetTitleBar(mTitleBarHeaderContainer);
}
mShowHiddenAttachments.setOnClickListener(this);