3.0.0 nonfatal fixes

Author: MartinStyk

app/src/main/java/sk/styk/martin/apkanalyzer/dependencyinjection/ActivityCommonModule.kt

@@ -20,6 +20,7 @@ import sk.styk.martin.apkanalyzer.manager.permission.PermissionsManagerImpl
 import sk.styk.martin.apkanalyzer.manager.promo.UserReviewManager
 import sk.styk.martin.apkanalyzer.manager.resources.ActivityColorThemeManager
 import sk.styk.martin.apkanalyzer.manager.resources.ColorThemeManager
+import sk.styk.martin.apkanalyzer.util.coroutines.DispatcherProvider
 
 @InstallIn(ActivityComponent::class)
 @Module
@@ -59,10 +60,10 @@ class ActivityCommonModule {
 
     @Provides
     @ActivityScoped
-    fun provideFragmentScreenTracker(activity: AppCompatActivity, analyticsTracker: AnalyticsTracker, foregroundWatcher: ForegroundFragmentWatcher): FragmentScreenTracker {
+    fun provideFragmentScreenTracker(activity: AppCompatActivity, analyticsTracker: AnalyticsTracker, foregroundWatcher: ForegroundFragmentWatcher, dispatcherProvider: DispatcherProvider): FragmentScreenTracker {
         return ViewModelProvider(activity, object : ViewModelProvider.Factory {
             override fun <T : ViewModel?> create(modelClass: Class<T>): T {
-                return FragmentScreenTracker(foregroundWatcher, analyticsTracker) as T
+                return FragmentScreenTracker(foregroundWatcher, analyticsTracker, dispatcherProvider) as T
             }
         }).get(FragmentScreenTracker::class.java)
     }

app/src/main/java/sk/styk/martin/apkanalyzer/manager/analytics/FragmentScreenTracker.kt

@@ -4,19 +4,31 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.scopes.ActivityScoped
 import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.flow.filter
+import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import sk.styk.martin.apkanalyzer.manager.navigationdrawer.ForegroundFragmentWatcher
+import sk.styk.martin.apkanalyzer.util.FragmentTag
+import sk.styk.martin.apkanalyzer.util.coroutines.DispatcherProvider
 import javax.inject.Inject
 
 @ActivityScoped
 class FragmentScreenTracker @Inject constructor(private val foregroundFragmentWatcher: ForegroundFragmentWatcher,
-                                                private val analyticsTracker: AnalyticsTracker) : ViewModel() {
+                                                private val analyticsTracker: AnalyticsTracker,
+                                                private val dispatcherProvider: DispatcherProvider) : ViewModel() {
+
+    private var lastTrackedTag: FragmentTag? = null
 
     init {
-        viewModelScope.launch {
-            foregroundFragmentWatcher.foregroundFragment.collect {
-                analyticsTracker.trackScreenView(it.tag)
-            }
+        viewModelScope.launch(dispatcherProvider.default()) {
+            foregroundFragmentWatcher.foregroundFragment
+                    .filter {
+                        it != lastTrackedTag
+                    }.onEach {
+                        lastTrackedTag = it
+                    }.collect {
+                        analyticsTracker.trackScreenView(it.tag)
+                    }
         }
     }
 

app/src/main/java/sk/styk/martin/apkanalyzer/manager/file/DrawableSaveManager.kt

@@ -47,7 +47,11 @@ class DrawableSaveManager @Inject constructor(
             }
         } else {
             val imagePath = Environment.getExternalStoragePublicDirectory(directory).absolutePath
-            val imageFile = File(imagePath, "$SUBDIRECTORY/fileName")
+            val subdirectory = File(imagePath, SUBDIRECTORY)
+            if (!subdirectory.exists()) {
+                subdirectory.mkdirs()
+            }
+            val imageFile = File(imagePath, "$SUBDIRECTORY/$fileName")
             save(FileOutputStream(imageFile), bitmap)
             mediaManager.addMediaRecord(imageFile)
             imageFile.toUri()

app/src/main/java/sk/styk/martin/apkanalyzer/model/detail/ContentProviderData.kt

@@ -8,7 +8,7 @@ import kotlinx.android.parcel.Parcelize
 @Parcelize
 data class ContentProviderData(
         val name: String,
-        val authority: String, //the name provider is published under this content
+        val authority: String? = null, //the name provider is published under this content
         val readPermission: String? = null, //Optional permission required for read-only access this content provider
         val writePermission: String? = null, //Optional permission required for read/write access this content provider
         val isExported: Boolean = false //May be called by another activity

app/src/main/java/sk/styk/martin/apkanalyzer/ui/appdetail/AppDetailFragment.kt

@@ -128,8 +128,8 @@ class AppDetailFragment : Fragment(), BackPressedListener {
         reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
 
         parentFragmentManager.beginTransaction()
-                .replace(R.id.container, AndroidManifestFragment.create(manifestRequest), AndroidManifestFragment.TAG)
-                .addToBackStack(AndroidManifestFragment.TAG)
+                .replace(R.id.container, AndroidManifestFragment.create(manifestRequest), FragmentTag.Manifest.tag)
+                .addToBackStack(FragmentTag.Manifest.tag)
                 .setReorderingAllowed(true)
                 .commit()
     }

app/src/main/java/sk/styk/martin/apkanalyzer/ui/appdetail/AppDetailFragmentViewModel.kt

@@ -140,6 +140,7 @@ class AppDetailFragmentViewModel @AssistedInject constructor(
     }
 
     init {
+        Timber.tag(TAG_APP_DETAIL).i("Open app detail for request $appDetailRequest")
         loadDetail()
         observeApkActions()
     }

app/src/main/java/sk/styk/martin/apkanalyzer/ui/appdetail/page/provider/AppProviderDetailListAdapter.kt

@@ -49,7 +49,7 @@ class AppProviderDetailListAdapter @Inject constructor() : DetailInfoDescription
 
         val authority = DetailInfoAdapter.DetailInfo(
                 name = TextInfo.from(R.string.provider_authority),
-                value = TextInfo.from(expandedProviderData.contentProviderData.authority),
+                value = if (expandedProviderData.contentProviderData.authority != null) TextInfo.from(expandedProviderData.contentProviderData.authority) else TextInfo.from(R.string.none),
                 description = TextInfo.from(R.string.provider_authority_description)
         )
         val readPermission = DetailInfoAdapter.DetailInfo(

app/src/main/java/sk/styk/martin/apkanalyzer/ui/manifest/AndroidManifestFragment.kt

@@ -99,7 +99,6 @@ class AndroidManifestFragment : Fragment() {
 
     companion object {
         private const val MANIFEST_REQUEST = "manifest_request"
-        const val TAG = "AndroidManifestFragment"
 
         fun create(manifestRequest: ManifestRequest) = AndroidManifestFragment().apply {
             arguments = Bundle().apply {

app/src/main/java/sk/styk/martin/apkanalyzer/util/FragmentTag.kt

@@ -8,7 +8,8 @@ enum class FragmentTag(val tag: String) {
     Settings("Settings"),
     Premium("Premium"),
     AppDetailParent("AppDetailParent"),
-    PermissionDetail("PermissionDetail");
+    PermissionDetail("PermissionDetail"),
+    Manifest("Manifest");
 
     fun isTag(stringTag: String?) = tag == stringTag
 

app/src/main/res/layout/list_item_activity_detail.xml

@@ -22,8 +22,8 @@
             android:id="@+id/headerContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:onLongClick="@{() -> viewModel.onTitleLongClick()}"
             android:background="?android:selectableItemBackground"
+            android:onLongClick="@{() -> viewModel.onTitleLongClick()}"
             android:padding="@dimen/padding_default_medium">
 
             <TextView
@@ -33,7 +33,7 @@
                 android:layout_height="wrap_content"
                 android:text="@{viewModel.packageName}"
                 app:layout_constraintBottom_toTopOf="@id/activity_name"
-                app:layout_constraintEnd_toStartOf="@id/toggleArrow"
+                app:layout_constraintEnd_toStartOf="@id/playArrow"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 tools:text="sk.styk.martin.apkanalyzer" />
@@ -55,13 +55,14 @@
                 android:id="@+id/playArrow"
                 android:layout_width="20dp"
                 android:layout_height="20dp"
-                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
                 android:background="?android:selectableItemBackgroundBorderless"
                 android:onClick="@{() -> viewModel.onRunClick()}"
                 android:visibility="@{viewModel.runButtonVisible ? View.VISIBLE : View.GONE}"
-                app:layout_constraintBottom_toBottomOf="@id/activity_name"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toStartOf="@id/toggleArrow"
-                app:layout_constraintTop_toTopOf="@id/activity_name"
+                app:layout_constraintStart_toEndOf="@id/activity_package_name"
+                app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/ic_play"
                 app:tint="?android:textColorSecondary" />
 
@@ -72,7 +73,7 @@
                 android:layout_weight="0"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/activity_package_name"
+                app:layout_constraintStart_toEndOf="@+id/playArrow"
                 app:layout_constraintTop_toTopOf="parent"
                 app:srcCompat="@drawable/ic_arrow_expandable"
                 app:tint="?android:textColorSecondary" />