Skip to content

Commit 3743659

Browse files
author
rjmatthews62
committed
Fix npe in layout typefaces.
Rebuilt template
1 parent c540281 commit 3743659

File tree

4 files changed

+3
-2
lines changed

4 files changed

+3
-2
lines changed

android/Common/src/com/googlecode/android_scripting/facade/ui/ViewInflater.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,8 @@ private void setProperty(View view, ViewGroup root, String attr, String value)
510510
}
511511
} else if (attr.equals("typeface")) {
512512
TextView textview = (TextView) view;
513-
int style = textview.getTypeface().getStyle();
513+
Typeface typeface = textview.getTypeface();
514+
int style = typeface == null ? 0 : typeface.getStyle();
514515
textview.setTypeface(Typeface.create(value, style));
515516
} else if (attr.equals("src")) {
516517
setImage(view, value);
37 Bytes
Binary file not shown.

android/ScriptingLayerForAndroid/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.googlecode.android_scripting" android:installLocation="auto"
4-
android:versionCode="519" android:versionName="5x19">
4+
android:versionCode="521" android:versionName="5x21">
55
<uses-permission android:name="android.permission.RECEIVE_SMS" />
66
<uses-permission android:name="net.dinglisch.android.tasker.PERMISSION_RUN_TASKS" />
77
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
-69 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)