Android Extensions: Fix KT-10969 (NullPointerException when finding view in Fragment if getView() is null)

(cherry picked from commit 80f5852)
2016-04-21 21:06:30 +03:00
parent 2cd0e9c8d8
commit 530ab42de6
8 changed files with 140 additions and 1 deletions
@@ -5,5 +5,5 @@ import android.app.Activity

 abstract class Fragment {
    open fun getActivity(): Activity = throw Exception("Function getActivity() is not overridden")
-    open fun getView(): View = throw Exception("Function getView() is not overridden")
+    open fun getView(): View? = throw Exception("Function getView() is not overridden")
 }
@@ -0,0 +1,34 @@
+package test
+
+import android.app.Activity
+import android.app.Fragment
+import android.content.Context
+import android.view.View
+import android.widget.*
+import org.my.cool.MyButton
+import kotlinx.android.synthetic.main.layout.*
+
+class R {
+    class id {
+        companion object {
+            const val login = 5
+        }
+    }
+}
+
+class MyFragment(): Fragment() {
+    val baseActivity = Activity()
+
+    override fun getActivity(): Activity = baseActivity
+
+    override fun getView(): View? = null
+
+    public fun box(): String {
+        val button = login
+        return if (button == null) "OK" else "Button is not null: $button"
+    }
+}
+
+fun box(): String {
+    return MyFragment().box()
+}
@@ -0,0 +1,26 @@
+package test
+
+import android.app.Activity
+import android.app.Fragment
+import android.content.Context
+import android.view.View
+import android.widget.*
+import org.my.cool.MyButton
+import kotlinx.android.synthetic.main.layout.*
+
+class R {
+    class id {
+        companion object {
+            const val login = 5
+        }
+    }
+}
+
+class MyFragment(): Fragment() {
+    val baseActivity = Activity()
+    override fun getView(): View? = null
+}
+
+fun box(): String {
+    return "OK"
+}
@@ -0,0 +1,33 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="test"
+          android:versionCode="1"
+          android:versionName="1.0" >
+
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-sdk
+            android:minSdkVersion="18"
+            android:targetSdkVersion="18" />
+    <permission android:name="android"></permission>
+
+    <application
+            android:allowBackup="true"
+            android:icon="@drawable/ic_launcher"
+            android:label="@string/app_name"
+            android:theme="@style/Theme.Sample" >
+        <activity
+                android:name="com.example.android.basiccontactables.MainActivity"
+                android:label="@string/app_name"
+                android:launchMode="singleTop">
+            <meta-data
+                    android:name="android.app.searchable"
+                    android:resource="@xml/searchable" />
+            <intent-filter>
+                <action android:name="android.intent.action.SEARCH" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
@@ -0,0 +1,8 @@
+package org.my.cool
+
+import android.widget.Button
+import android.content.Context
+
+class MyButton(ctx: Context): Button(ctx) {
+    override fun toString(): String {return "MyButton"}
+}
@@ -0,0 +1,15 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:tools="http://schemas.android.com/tools"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             tools:context=".ItemDetailActivity"
+             tools:ignore="MergeRootFrame" >
+
+    <view
+        class="org.my.cool.MyButton"
+        android:id="@+id/login"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Sign in" />
+
+</FrameLayout>