make some activity variables nonstatic

This commit is contained in:
tibbi 2017-01-14 12:26:32 +01:00
parent c2f268d004
commit a259a0240c
2 changed files with 20 additions and 24 deletions

View file

@ -32,22 +32,20 @@ import java.io.File
import java.util.* import java.util.*
class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener { class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
companion object { private val STORAGE_PERMISSION = 1
private val STORAGE_PERMISSION = 1 private val PICK_MEDIA = 2
private val PICK_MEDIA = 2 private val PICK_WALLPAPER = 3
private val PICK_WALLPAPER = 3
lateinit var mDirs: ArrayList<Directory> lateinit var mDirs: ArrayList<Directory>
private var mIsPickImageIntent = false private var mIsPickImageIntent = false
private var mIsPickVideoIntent = false private var mIsPickVideoIntent = false
private var mIsGetImageContentIntent = false private var mIsGetImageContentIntent = false
private var mIsGetVideoContentIntent = false private var mIsGetVideoContentIntent = false
private var mIsGetAnyContentIntent = false private var mIsGetAnyContentIntent = false
private var mIsSetWallpaperIntent = false private var mIsSetWallpaperIntent = false
private var mIsThirdPartyIntent = false private var mIsThirdPartyIntent = false
private var mIsGettingDirs = false private var mIsGettingDirs = false
}
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)

View file

@ -28,18 +28,16 @@ import java.io.IOException
import java.util.* import java.util.*
class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener { class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
companion object { private val TAG = MediaActivity::class.java.simpleName
private val TAG = MediaActivity::class.java.simpleName
private var mMedia = ArrayList<Medium>() private var mMedia = ArrayList<Medium>()
private var mPath = "" private var mPath = ""
private var mIsGetImageIntent = false private var mIsGetImageIntent = false
private var mIsGetVideoIntent = false private var mIsGetVideoIntent = false
private var mIsGetAnyIntent = false private var mIsGetAnyIntent = false
private var mIsGettingMedia = false private var mIsGettingMedia = false
private var mShowAll = false private var mShowAll = false
}
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)