Upgrade to gradle 6

.circleci/config.yml

@@ -26,12 +26,12 @@ commands:
     steps:
       - run:
           name: Setup gradle.properties
-          command: cp gradle.properties-example gradle.properties
+          command: cp gradle.properties-example gradle.properties && cp libs/utils/WordPressUtils/gradle.properties-example libs/utils/WordPressUtils/gradle.properties
   update-gradle-memory:
       steps:
         - run:
             name: Update memory setting
-            command: sed -i "s/org.gradle.jvmargs=.*/org.gradle.jvmargs=-Xmx1537m -XX:+HeapDumpOnOutOfMemoryError -Dkotlin.compiler.execution.strategy=in-process -Dkotlin.incremental=false /" gradle.properties
+            command: sed -i "s/org.gradle.jvmargs=.*/org.gradle.jvmargs=-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError -Dkotlin.compiler.execution.strategy=in-process -Dkotlin.incremental=false /" gradle.properties
   npm-install:
     steps:
       - restore_cache:

WordPress/build.gradle

@@ -45,7 +45,6 @@ android {
     }
 
     compileSdkVersion rootProject.compileSdkVersion
-    buildToolsVersion rootProject.buildToolVersion
 
     defaultConfig {
         applicationId "org.wordpress.android"

WordPress/src/main/java/org/wordpress/android/ui/mediapicker/MediaPickerViewModel.kt

@@ -1,7 +1,6 @@
 package org.wordpress.android.ui.mediapicker
 
 import android.Manifest.permission
-import android.content.Context
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import kotlinx.coroutines.CoroutineDispatcher
@@ -63,7 +62,6 @@ class MediaPickerViewModel @Inject constructor(
     private val analyticsUtilsWrapper: AnalyticsUtilsWrapper,
     private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
     private val permissionsHandler: PermissionsHandler,
-    private val context: Context,
     private val localeManagerWrapper: LocaleManagerWrapper,
     private val mediaUtilsWrapper: MediaUtilsWrapper,
     private val resourceProvider: ResourceProvider
@@ -394,7 +392,7 @@ class MediaPickerViewModel @Inject constructor(
             val label = if (softAskRequest.isAlwaysDenied) {
                 val permissionName = ("<strong>${
                     WPPermissionUtils.getPermissionName(
-                            context,
+                            resourceProvider,
                             permission.WRITE_EXTERNAL_STORAGE
                     )
                 }</strong>")

WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerViewModel.kt

@@ -1,7 +1,6 @@
 package org.wordpress.android.ui.photopicker
 
 import android.Manifest.permission
-import android.content.Context
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import kotlinx.coroutines.CoroutineDispatcher
@@ -69,7 +68,6 @@ class PhotoPickerViewModel @Inject constructor(
     private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
     private val permissionsHandler: PermissionsHandler,
     private val tenorFeatureConfig: TenorFeatureConfig,
-    private val context: Context,
     private val resourceProvider: ResourceProvider
 ) : ScopedViewModel(mainDispatcher) {
     private val _navigateToPreview = MutableLiveData<Event<UriWrapper>>()
@@ -443,7 +441,7 @@ class PhotoPickerViewModel @Inject constructor(
             val appName = "<strong>${resourceProvider.getString(R.string.app_name)}</strong>"
             val label = if (softAskRequest.isAlwaysDenied) {
                 val permissionName = ("<strong>${WPPermissionUtils.getPermissionName(
-                        context,
+                        resourceProvider,
                         permission.WRITE_EXTERNAL_STORAGE
                 )}</strong>")
                 String.format(

WordPress/src/main/java/org/wordpress/android/ui/posts/PostListMainViewModel.kt

@@ -88,9 +88,13 @@ class PostListMainViewModel @Inject constructor(
     @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher,
     @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
     private val uploadStarter: UploadStarter
-) : ViewModel(), LifecycleOwner, CoroutineScope {
-    private val lifecycleRegistry = LifecycleRegistry(this)
-    override fun getLifecycle(): Lifecycle = lifecycleRegistry
+) : ViewModel(), CoroutineScope {
+    private val lifecycleOwner = object : LifecycleOwner {
+        val lifecycleRegistry = LifecycleRegistry(this)
+        override fun getLifecycle(): Lifecycle {
+            return lifecycleRegistry
+        }
+    }
 
     private val scrollToTargetPostJob: Job = Job()
     override val coroutineContext: CoroutineContext
@@ -161,7 +165,7 @@ class PostListMainViewModel @Inject constructor(
     private val featuredImageTracker = PostListFeaturedImageTracker(dispatcher = dispatcher, mediaStore = mediaStore)
 
     private val postFetcher by lazy {
-        PostFetcher(lifecycle, dispatcher)
+        PostFetcher(lifecycleOwner.lifecycle, dispatcher)
     }
 
     private val postListDialogHelper: PostListDialogHelper by lazy {
@@ -217,7 +221,7 @@ class PostListMainViewModel @Inject constructor(
     }
 
     init {
-        lifecycleRegistry.markState(Lifecycle.State.CREATED)
+        lifecycleOwner.lifecycleRegistry.currentState = Lifecycle.State.CREATED
     }
 
     fun start(
@@ -243,7 +247,7 @@ class PostListMainViewModel @Inject constructor(
         }
 
         postListEventListenerFactory.createAndStartListening(
-                lifecycle = lifecycle,
+                lifecycle = lifecycleOwner.lifecycle,
                 dispatcher = dispatcher,
                 bgDispatcher = bgDispatcher,
                 postStore = postStore,
@@ -283,19 +287,19 @@ class PostListMainViewModel @Inject constructor(
             }
         }
 
-        lifecycleRegistry.markState(Lifecycle.State.STARTED)
+        lifecycleOwner.lifecycleRegistry.currentState = Lifecycle.State.STARTED
 
         uploadStarter.queueUploadFromSite(site)
 
         editPostRepository.run {
-            postChanged.observe(this@PostListMainViewModel, Observer {
+            postChanged.observe(lifecycleOwner, Observer {
                 savePostToDbUseCase.savePostToDb(editPostRepository, site)
             })
         }
     }
 
     override fun onCleared() {
-        lifecycleRegistry.markState(Lifecycle.State.DESTROYED)
+        lifecycleOwner.lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
         scrollToTargetPostJob.cancel() // cancels all coroutines with the default coroutineContext
         super.onCleared()
     }

WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerViewModel.kt

@@ -35,9 +35,11 @@ class StoryComposerViewModel @Inject constructor(
     private val setUntitledStoryTitleIfTitleEmptyUseCase: SetUntitledStoryTitleIfTitleEmptyUseCase,
     private val postEditorAnalyticsSessionWrapper: PostEditorAnalyticsSessionWrapper,
     private val dispatcher: Dispatcher
-) : ViewModel(), LifecycleOwner {
-    private val lifecycleRegistry = LifecycleRegistry(this)
-    override fun getLifecycle(): Lifecycle = lifecycleRegistry
+) : ViewModel() {
+    private val lifecycleOwner = object : LifecycleOwner {
+        val lifecycleRegistry = LifecycleRegistry(this)
+        override fun getLifecycle(): Lifecycle = lifecycleRegistry
+    }
 
     private lateinit var editPostRepository: EditPostRepository
     private lateinit var site: SiteModel
@@ -53,7 +55,7 @@ class StoryComposerViewModel @Inject constructor(
     val submitButtonClicked: LiveData<Event<Unit>> = _submitButtonClicked
 
     init {
-        lifecycleRegistry.currentState = Lifecycle.State.CREATED
+        lifecycleOwner.lifecycleRegistry.currentState = Lifecycle.State.CREATED
     }
 
     private val _trackEditorCreatedPost = MutableLiveData<Event<Unit>>()
@@ -84,7 +86,7 @@ class StoryComposerViewModel @Inject constructor(
             systemNotificationsTracker.trackTappedNotification(it)
         }
 
-        lifecycleRegistry.currentState = Lifecycle.State.STARTED
+        lifecycleOwner.lifecycleRegistry.currentState = Lifecycle.State.STARTED
         updateStoryPostWithChanges()
     }
 
@@ -119,7 +121,7 @@ class StoryComposerViewModel @Inject constructor(
     }
 
     private fun updateStoryPostWithChanges() {
-        editPostRepository.postChanged.observe(this, Observer {
+        editPostRepository.postChanged.observe(lifecycleOwner, Observer {
             savePostToDbUseCase.savePostToDb(editPostRepository, site)
         })
     }
@@ -149,7 +151,7 @@ class StoryComposerViewModel @Inject constructor(
 
     override fun onCleared() {
         super.onCleared()
-        lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
+        lifecycleOwner.lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
         postEditorAnalyticsSession.end()
     }
 }

WordPress/src/main/java/org/wordpress/android/util/WPPermissionUtils.java

@@ -1,7 +1,6 @@
 package org.wordpress.android.util;
 
 import android.Manifest;
-import android.Manifest.permission;
 import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -21,6 +20,7 @@
 import org.wordpress.android.R;
 import org.wordpress.android.analytics.AnalyticsTracker;
 import org.wordpress.android.ui.prefs.AppPrefs;
+import org.wordpress.android.viewmodel.ResourceProvider;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -170,6 +170,24 @@ public static String getPermissionName(@NonNull Context context, @NonNull String
         }
     }
 
+    /*
+     * returns the name to display for a permission, ex: "permission.WRITE_EXTERNAL_STORAGE" > "Storage"
+     */
+    public static String getPermissionName(@NonNull ResourceProvider resourceProvider, @NonNull String permission) {
+        switch (permission) {
+            case android.Manifest.permission.WRITE_EXTERNAL_STORAGE:
+            case android.Manifest.permission.READ_EXTERNAL_STORAGE:
+                return resourceProvider.getString(R.string.permission_storage);
+            case android.Manifest.permission.CAMERA:
+                return resourceProvider.getString(R.string.permission_camera);
+            case Manifest.permission.RECORD_AUDIO:
+                return resourceProvider.getString(R.string.permission_microphone);
+            default:
+                AppLog.w(AppLog.T.UTILS, "No name for requested permission");
+                return resourceProvider.getString(R.string.unknown);
+        }
+    }
+
     /*
      * called when the app detects that the user has permanently denied a permission, shows a dialog
      * alerting them to this fact and enabling them to visit the app settings to edit permissions

WordPress/src/main/java/org/wordpress/android/viewmodel/history/HistoryViewModel.kt

@@ -47,7 +47,7 @@ class HistoryViewModel @Inject constructor(
     @Named(UI_THREAD) uiDispatcher: CoroutineDispatcher,
     @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
     private val connectionStatus: LiveData<ConnectionStatus>
-) : ScopedViewModel(uiDispatcher), LifecycleOwner {
+) : ScopedViewModel(uiDispatcher) {
     enum class HistoryListStatus {
         DONE,
         ERROR,
@@ -75,11 +75,15 @@ class HistoryViewModel @Inject constructor(
     private val _post = MutableLiveData<PostModel?>()
     val post: LiveData<PostModel?> = _post
 
-    private val lifecycleRegistry = LifecycleRegistry(this)
-    override fun getLifecycle(): Lifecycle = lifecycleRegistry
+    private val lifecycleOwner = object : LifecycleOwner {
+        val lifecycleRegistry = LifecycleRegistry(this)
+        override fun getLifecycle(): Lifecycle {
+            return lifecycleRegistry
+        }
+    }
 
     init {
-        lifecycleRegistry.markState(Lifecycle.State.CREATED)
+        lifecycleOwner.lifecycleRegistry.currentState = Lifecycle.State.CREATED
         dispatcher.register(this)
     }
 
@@ -89,7 +93,7 @@ class HistoryViewModel @Inject constructor(
         }
         isStarted = true
         this.site = site
-        connectionStatus.observe(this, Observer {
+        connectionStatus.observe(lifecycleOwner, Observer {
             if (it == AVAILABLE) {
                 fetchRevisions()
             }
@@ -106,7 +110,7 @@ class HistoryViewModel @Inject constructor(
 
             fetchRevisions()
 
-            lifecycleRegistry.markState(Lifecycle.State.STARTED)
+            lifecycleOwner.lifecycleRegistry.currentState = Lifecycle.State.STARTED
         }
     }
 
@@ -205,7 +209,7 @@ class HistoryViewModel @Inject constructor(
 
     override fun onCleared() {
         dispatcher.unregister(this)
-        lifecycleRegistry.markState(Lifecycle.State.DESTROYED)
+        lifecycleOwner.lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
         super.onCleared()
     }
 

WordPress/src/main/java/org/wordpress/android/viewmodel/posts/PostListViewModel.kt

@@ -70,7 +70,7 @@ class PostListViewModel @Inject constructor(
     @Named(UI_THREAD) private val uiDispatcher: CoroutineDispatcher,
     @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher,
     connectionStatus: LiveData<ConnectionStatus>
-) : ScopedViewModel(uiDispatcher), LifecycleOwner {
+) : ScopedViewModel(uiDispatcher) {
     private val isStatsSupported: Boolean by lazy {
         SiteUtils.isAccessedViaWPComRest(connector.site) && connector.site.hasCapabilityViewStats
     }
@@ -119,8 +119,10 @@ class PostListViewModel @Inject constructor(
     private var searchProgressJob: Job? = null
     private lateinit var authorFilterSelection: AuthorFilterSelection
 
-    private val lifecycleRegistry = LifecycleRegistry(this)
-    override fun getLifecycle(): Lifecycle = lifecycleRegistry
+    private val lifecycleOwner = object : LifecycleOwner {
+        val lifecycleRegistry = LifecycleRegistry(this)
+        override fun getLifecycle(): Lifecycle = lifecycleRegistry
+    }
 
     fun start(
         postListViewModelConnector: PostListViewModelConnector,
@@ -136,7 +138,7 @@ class PostListViewModel @Inject constructor(
         connector = postListViewModelConnector
 
         isStarted = true
-        lifecycleRegistry.markState(Lifecycle.State.STARTED)
+        lifecycleOwner.lifecycleRegistry.currentState = Lifecycle.State.STARTED
 
         if (connector.postListType == SEARCH) {
             this.authorFilterSelection = EVERYONE
@@ -146,7 +148,7 @@ class PostListViewModel @Inject constructor(
              * We don't want to initialize the list with empty search query in search mode as it'd send an unnecessary
              * request to fetch ids of all posts on the site.
              */
-            initList(dataSource, lifecycle)
+            initList(dataSource, lifecycleOwner.lifecycle)
         }
     }
 
@@ -261,10 +263,10 @@ class PostListViewModel @Inject constructor(
     }
 
     init {
-        connectionStatus.observe(this, Observer {
+        connectionStatus.observe(lifecycleOwner, Observer {
             retryOnConnectionAvailableAfterRefreshError()
         })
-        lifecycleRegistry.markState(Lifecycle.State.CREATED)
+        lifecycleOwner.lifecycleRegistry.markState(Lifecycle.State.CREATED)
     }
 
     fun search(query: String?, delay: Long = SEARCH_DELAY_MS) {
@@ -284,7 +286,7 @@ class PostListViewModel @Inject constructor(
                 delay(delay)
                 searchJob = null
                 if (isActive) {
-                    initList(dataSource, lifecycle)
+                    initList(dataSource, lifecycleOwner.lifecycle)
                 }
             }
         }
@@ -304,7 +306,7 @@ class PostListViewModel @Inject constructor(
     }
 
     override fun onCleared() {
-        lifecycleRegistry.markState(Lifecycle.State.DESTROYED)
+        lifecycleOwner.lifecycleRegistry.currentState = Lifecycle.State.DESTROYED
         super.onCleared()
     }
 
@@ -400,7 +402,7 @@ class PostListViewModel @Inject constructor(
     fun updateAuthorFilterIfNotSearch(authorFilterSelection: AuthorFilterSelection): Boolean {
         if (connector.postListType != SEARCH && this.authorFilterSelection != authorFilterSelection) {
             this.authorFilterSelection = authorFilterSelection
-            initList(dataSource, lifecycle)
+            initList(dataSource, lifecycleOwner.lifecycle)
             return true
         }
         return false