fixed bug: null in context menu of top fragments

Dzmitry-Lakisau · Sep 29, 2018 · 3da7b5c · 3da7b5c
1 parent 292f552
commit 3da7b5c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,8 +14,8 @@ android {
 
     defaultConfig {
         applicationId "by.d1makrat.library_fm"
-        versionCode 11
-        versionName "2.2.1"
+        versionCode 12
+        versionName "2.2.2"
         minSdkVersion 15
         targetSdkVersion 27
         buildConfigField("String", "API_KEY", API_KEY)

diff --git a/app/src/main/java/by/d1makrat/library_fm/ui/fragment/top/TopArtistsFragment.kt b/app/src/main/java/by/d1makrat/library_fm/ui/fragment/top/TopArtistsFragment.kt
@@ -18,10 +18,10 @@ import by.d1makrat.library_fm.ui.CenteredToast
 
 class TopArtistsFragment : TopItemsFragment<TopArtist>() {
 
-    override fun onCreateContextMenu(menu: ContextMenu, v: View, menuInfo: ContextMenu.ContextMenuInfo) {
+    override fun onCreateContextMenu(menu: ContextMenu?, v: View?, menuInfo: ContextMenu.ContextMenuInfo?) {
         super.onCreateContextMenu(menu, v, menuInfo)
 
-        menu.add(mPeriod.hashCode(), TopItemsFragment.MENU_SCROBBLES_OF_ARTIST, 0, R.string.scrobbles_of_artist)
+        menu?.add(mPeriod.hashCode(), TopItemsFragment.MENU_SCROBBLES_OF_ARTIST, 0, R.string.scrobbles_of_artist)
     }
 
     override fun onContextItemSelected(item: MenuItem?): Boolean {

diff --git a/app/src/main/java/by/d1makrat/library_fm/ui/fragment/top/TopTracksFragment.kt b/app/src/main/java/by/d1makrat/library_fm/ui/fragment/top/TopTracksFragment.kt
@@ -18,11 +18,11 @@ import by.d1makrat.library_fm.ui.CenteredToast
 
 class TopTracksFragment : TopItemsFragment<TopTrack>() {
 
-    override fun onCreateContextMenu(menu: ContextMenu, v: View, menuInfo: ContextMenu.ContextMenuInfo) {
+    override fun onCreateContextMenu(menu: ContextMenu?, v: View?, menuInfo: ContextMenu.ContextMenuInfo?) {
         super.onCreateContextMenu(menu, v, menuInfo)
 
-        menu.add(mPeriod.hashCode(), TopItemsFragment.MENU_SCROBBLES_OF_ARTIST, 0, R.string.scrobbles_of_artist)
-        menu.add(mPeriod.hashCode(), TopItemsFragment.MENU_SCROBBLES_OF_TRACK, 1, R.string.scrobbles_of_track)
+        menu?.add(mPeriod.hashCode(), TopItemsFragment.MENU_SCROBBLES_OF_ARTIST, 0, R.string.scrobbles_of_artist)
+        menu?.add(mPeriod.hashCode(), TopItemsFragment.MENU_SCROBBLES_OF_TRACK, 1, R.string.scrobbles_of_track)
     }
 
     override fun onContextItemSelected(item: MenuItem?): Boolean {

diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.2.0'
         classpath 'com.google.gms:google-services:4.0.2'
         classpath 'com.google.firebase:firebase-plugins:1.1.5'
         classpath 'io.fabric.tools:gradle:1.25.4'