Commit 7fbb1640 authored by mcarare's avatar mcarare Committed by Mihai Adrian
Browse files

For #8759 Use activityName instead of packageName as app identification

parent f23b9fcb

app/src/main/java/org/mozilla/fenix/share/ShareController.kt

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ class DefaultShareController( 


    override fun handleShareToApp(app: AppShareOption) {

        lifecycleScope.launch(Dispatchers.IO) {

            recentAppsStorage.updateRecentApp(app.packageName)

            recentAppsStorage.updateRecentApp(app.activityName)

        }



        val intent = Intent(ACTION_SEND).apply {

app/src/main/java/org/mozilla/fenix/share/ShareViewModel.kt

+2 −2
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ class ShareViewModel(application: Application) : AndroidViewModel(application) { 
            }

            val shareAppsActivities = getIntentActivities(shareIntent, getApplication())

            var apps = buildAppsList(shareAppsActivities, getApplication())

            recentAppsStorage.updateDatabaseWithNewApps(apps.map { app -> app.packageName })

            recentAppsStorage.updateDatabaseWithNewApps(apps.map { app -> app.activityName })

            val recentApps = buildRecentAppsList(apps)

            apps = filterOutRecentApps(apps, recentApps)
@@ -117,7 +117,7 @@ class ShareViewModel(application: Application) : AndroidViewModel(application) { 
        val result: MutableList<AppShareOption> = ArrayList()

        for (recentApp in recentAppsDatabase) {

            for (app in apps) {

                if (recentApp.packageName == app.packageName) {

                if (recentApp.activityName == app.activityName) {

                    result.add(app)

                }

            }

app/src/main/java/org/mozilla/fenix/share/listadapters/AppShareAdapter.kt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ class AppShareAdapter( 


    private object DiffCallback : DiffUtil.ItemCallback<AppShareOption>() {

        override fun areItemsTheSame(oldItem: AppShareOption, newItem: AppShareOption) =

            oldItem.packageName == newItem.packageName

            oldItem.activityName == newItem.activityName



        override fun areContentsTheSame(oldItem: AppShareOption, newItem: AppShareOption) =

            oldItem == newItem