[WIP] Release 6

.github/workflows/release.yml

@@ -6,6 +6,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+      - uses: nttld/setup-ndk@v1
+        id: setup-ndk
+        with:
+          ndk-version: r23c
+          link-to-sdk: true
       - uses: actions/setup-java@v3
         with:
           distribution: "zulu"
@@ -57,6 +62,14 @@ jobs:
         if: always()
         run: ./scripts/release/clean-secrets.sh
 
+#      - name: Upload artifacts
+#        uses: actions/upload-artifact@master
+#        with:
+#          name: APK + BUNDLE
+#          path: |
+#            app/build/outputs/apk/release/
+#            app/build/outputs/bundle/release/
+
       - name: Prepare artefacts
         run: ./scripts/release/prepare-release-artefacts.sh
 

analytics/src/main/java/com/anytypeio/anytype/analytics/base/EventsDictionary.kt

@@ -45,10 +45,7 @@ object EventsDictionary {
     const val deletionWarningShow = "ShowDeletionWarning"
     const val keychainPhraseScreenShow = "ScreenKeychain"
     const val relationsScreenShow = "ScreenObjectRelation"
-    const val personalisationSettingsShow = "ScreenSettingsPersonal"
     const val wallpaperScreenShow = "ScreenSettingsWallpaper"
-    const val accountDataSettingsShow = "ScreenSettingsAccount"
-    const val appearanceScreenShow = "ScreenSettingsAppearance"
     const val screenSettingsStorage = "ScreenSettingsStorageIndex"
     const val screenSettingsStorageManage = "ScreenSettingsStorageManager"
     const val screenSettingsSpaceStorageManager = "ScreenSettingsSpaceStorageManager"
@@ -191,7 +188,6 @@ object EventsDictionary {
     // Sharing spaces
     const val shareSpace = "ShareSpace"
     const val screenSettingsSpaceShare = "ScreenSettingsSpaceShare"
-    const val clickShareSpaceCopyLink = "ClickShareSpaceCopyLink"
     const val screenStopShare = "ScreenStopShare"
     const val stopSpaceShare = "StopSpaceShare"
     const val clickSettingsSpaceShare = "ClickSettingsSpaceShare"
@@ -204,12 +200,13 @@ object EventsDictionary {
     const val removeSpaceMember = "RemoveSpaceMember"
     const val screenInviteRequest = "ScreenInviteRequest"
     const val screenRequestSent = "ScreenRequestSent"
-    const val screenSettingsSpaceList = "ScreenSettingsSpaceList"
     const val screenSettingsSpaceMembers = "ScreenSettingsSpaceMembers"
     const val screenLeaveSpace = "ScreenLeaveSpace"
     const val leaveSpace = "LeaveSpace"
     const val approveLeaveRequest = "ApproveLeaveRequest"
 
+    const val searchBacklink = "SearchBacklink"
+
     object SharingSpacesTypes {
         const val shareTypeQR = "Qr"
         const val shareTypeMoreInfo = "MoreInfo"
@@ -250,7 +247,8 @@ object EventsDictionary {
     }
 
     enum class ScreenOnboardingStep(val value: String) {
-        VOID("Void"),
+        VAULT("Vault"),
+        SOUL("Soul"),
         PHRASE("Phrase")
     }
 

app/build.gradle

@@ -47,7 +47,7 @@ android {
         buildConfigField "boolean", "USE_NEW_WINDOW_INSET_API", "true"
         buildConfigField "boolean", "USE_EDGE_TO_EDGE", "true"
         buildConfigField "boolean", "LOG_FROM_MW_LIBRARY", localProperties.getProperty("LOG_FROM_MW_LIBRARY", "false")
-        buildConfigField "boolean", "LOG_MW_INTERACTION", localProperties.getProperty("LOG_MW_INTERACTION", "false")
+        buildConfigField "boolean", "LOG_MW_INTERACTION", localProperties.getProperty("LOG_MW_INTERACTION", "true")
         buildConfigField "boolean", "LOG_DASHBOARD_REDUCER", localProperties.getProperty("LOG_DASHBOARD_REDUCER", "false")
         buildConfigField "boolean", "LOG_EDITOR_VIEWMODEL_EVENTS", localProperties.getProperty("LOG_EDITOR_VIEWMODEL_EVENTS", "false")
         buildConfigField "boolean", "LOG_EDITOR_CONTROL_PANEL", localProperties.getProperty("LOG_EDITOR_CONTROL_PANEL", "false")
@@ -180,6 +180,7 @@ dependencies {
     implementation libs.constraintLayout
     implementation libs.composeConstraintLayout
     implementation libs.glide
+    implementation libs.glideCompose
     implementation libs.coilCompose
     implementation libs.dagger
     implementation libs.timber

app/gradle.properties

@@ -1,4 +1,4 @@
 version.versionMajor=0
 version.versionMinor=32
-version.versionPatch=0
+version.versionPatch=41
 version.useDatedVersionName=false

app/src/androidTest/java/com/anytypeio/anytype/features/editor/base/EditorTestSetup.kt

@@ -15,6 +15,7 @@ import com.anytypeio.anytype.core_models.Payload
 import com.anytypeio.anytype.core_models.Relation
 import com.anytypeio.anytype.core_models.primitives.SpaceId
 import com.anytypeio.anytype.core_utils.tools.FeatureToggles
+import com.anytypeio.anytype.domain.auth.interactor.ClearLastOpenedObject
 import com.anytypeio.anytype.domain.base.AppCoroutineDispatchers
 import com.anytypeio.anytype.domain.base.Either
 import com.anytypeio.anytype.domain.base.Result
@@ -233,6 +234,9 @@ open class EditorTestSetup {
     @Mock
     lateinit var updateDivider: UpdateDivider
 
+    @Mock
+    lateinit var clearLastOpenedObject: ClearLastOpenedObject
+
     @Mock
     lateinit var uriMatcher: Clipboard.UriMatcher
 
@@ -508,7 +512,8 @@ open class EditorTestSetup {
                 space = SpaceId(defaultSpace)
             ),
             permissions = permissions,
-            analyticSpaceHelperDelegate = analyticSpaceHelperDelegate
+            analyticSpaceHelperDelegate = analyticSpaceHelperDelegate,
+            clearLastOpenedObject = clearLastOpenedObject
         )
     }
 

app/src/androidTest/java/com/anytypeio/anytype/features/sets/dv/TestObjectSetSetup.kt

@@ -13,6 +13,7 @@ import com.anytypeio.anytype.core_models.Relation
 import com.anytypeio.anytype.core_models.SearchResult
 import com.anytypeio.anytype.core_models.SubscriptionEvent
 import com.anytypeio.anytype.core_models.primitives.SpaceId
+import com.anytypeio.anytype.domain.auth.interactor.ClearLastOpenedObject
 import com.anytypeio.anytype.domain.auth.repo.AuthRepository
 import com.anytypeio.anytype.domain.base.AppCoroutineDispatchers
 import com.anytypeio.anytype.domain.base.Result
@@ -182,6 +183,9 @@ abstract class TestObjectSetSetup {
     @Mock
     lateinit var analyticSpaceHelperDelegate: AnalyticSpaceHelperDelegate
 
+    @Mock
+    lateinit var clearLastOpenedObject: ClearLastOpenedObject
+
     private lateinit var getTemplates: GetTemplates
     private lateinit var getDefaultObjectType: GetDefaultObjectType
 
@@ -311,7 +315,8 @@ abstract class TestObjectSetSetup {
                 space = SpaceId(defaultSpace)
             ),
             permissions = permissions,
-            analyticSpaceHelperDelegate = analyticSpaceHelperDelegate
+            analyticSpaceHelperDelegate = analyticSpaceHelperDelegate,
+            clearLastOpenedObject = clearLastOpenedObject
         )
     }
 

app/src/main/AndroidManifest.xml

@@ -31,8 +31,8 @@
             android:name="com.anytypeio.anytype.ui.main.MainActivity"
             android:exported="true"
             android:launchMode="singleTask"
-            android:windowSoftInputMode="adjustResize">
-            <!-- DO NOT FORGET TO ADD android:screenOrientation="portrait" FOR RELEASE BUILDS! -->
+            android:windowSoftInputMode="adjustResize"
+            android:screenOrientation="portrait">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

app/src/main/java/com/anytypeio/anytype/app/Notifications.kt

@@ -5,9 +5,7 @@ import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
 import android.graphics.BitmapFactory
-import android.os.Build
 import androidx.core.app.NotificationCompat
-import androidx.core.os.BundleCompat
 import com.anytypeio.anytype.R
 import com.anytypeio.anytype.core_models.Id
 import com.anytypeio.anytype.core_models.Notification
@@ -122,7 +120,7 @@ class AnytypeNotificationService @Inject constructor(
 
                 val activity = PendingIntent.getActivity(
                     context,
-                    0,
+                    notification.hashCode(),
                     intent,
                     getDefaultFlags()
                 )
@@ -171,7 +169,7 @@ class AnytypeNotificationService @Inject constructor(
 
                 val activity = PendingIntent.getActivity(
                     context,
-                    0,
+                    notification.hashCode(),
                     intent,
                     getDefaultFlags()
                 )
@@ -204,7 +202,7 @@ class AnytypeNotificationService @Inject constructor(
                 }
                 val activity = PendingIntent.getActivity(
                     context,
-                    0,
+                    notification.hashCode(),
                     intent,
                     getDefaultFlags()
                 )
@@ -257,10 +255,7 @@ class AnytypeNotificationService @Inject constructor(
     }
 
     private fun getDefaultFlags(): Int {
-        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
-            PendingIntent.FLAG_IMMUTABLE
-        else
-            0
+        return PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
     }
 
     companion object {

app/src/main/java/com/anytypeio/anytype/di/common/ComponentManager.kt

@@ -1124,7 +1124,7 @@ class ComponentManager(
             .build()
     }
 
-    val spaceJoinRequestComponent = ComponentWithParams { params: SpaceJoinRequestViewModel.VmParams ->
+    val spaceJoinRequestComponent = ComponentMapWithParam { params: SpaceJoinRequestViewModel.VmParams ->
         DaggerSpaceJoinRequestComponent
             .builder()
             .withDependencies(findComponentDependencies())

app/src/main/java/com/anytypeio/anytype/di/feature/EditorDI.kt

@@ -11,6 +11,7 @@ import com.anytypeio.anytype.di.feature.cover.UnsplashSubComponent
 import com.anytypeio.anytype.di.feature.relations.RelationAddToObjectSubComponent
 import com.anytypeio.anytype.di.feature.relations.RelationCreateFromScratchForObjectBlockSubComponent
 import com.anytypeio.anytype.di.feature.relations.RelationCreateFromScratchForObjectSubComponent
+import com.anytypeio.anytype.domain.auth.interactor.ClearLastOpenedObject
 import com.anytypeio.anytype.domain.base.AppCoroutineDispatchers
 import com.anytypeio.anytype.domain.block.UpdateDivider
 import com.anytypeio.anytype.domain.block.interactor.ClearBlockContent
@@ -290,7 +291,8 @@ object EditorSessionModule {
         storelessSubscriptionContainer: StorelessSubscriptionContainer,
         dispatchers: AppCoroutineDispatchers,
         getNetworkMode: GetNetworkMode,
-        analyticSpaceHelperDelegate: AnalyticSpaceHelperDelegate
+        analyticSpaceHelperDelegate: AnalyticSpaceHelperDelegate,
+        clearLastOpenedObject: ClearLastOpenedObject
     ): EditorViewModelFactory = EditorViewModelFactory(
         params = params,
         permissions = permissions,
@@ -335,7 +337,8 @@ object EditorSessionModule {
         dispatchers = dispatchers,
         storelessSubscriptionContainer = storelessSubscriptionContainer,
         getNetworkMode = getNetworkMode,
-        analyticSpaceHelperDelegate = analyticSpaceHelperDelegate
+        analyticSpaceHelperDelegate = analyticSpaceHelperDelegate,
+        clearLastOpenedObject = clearLastOpenedObject
     )
 
     @JvmStatic

app/src/main/java/com/anytypeio/anytype/di/feature/ObjectSetDI.kt

@@ -15,6 +15,7 @@ import com.anytypeio.anytype.di.feature.relations.RelationCreateFromScratchForOb
 import com.anytypeio.anytype.di.feature.sets.CreateFilterSubComponent
 import com.anytypeio.anytype.di.feature.sets.ModifyFilterSubComponent
 import com.anytypeio.anytype.di.feature.sets.SelectFilterRelationSubComponent
+import com.anytypeio.anytype.domain.auth.interactor.ClearLastOpenedObject
 import com.anytypeio.anytype.domain.base.AppCoroutineDispatchers
 import com.anytypeio.anytype.domain.block.interactor.UpdateText
 import com.anytypeio.anytype.domain.block.interactor.sets.GetObjectTypes
@@ -254,7 +255,8 @@ object ObjectSetModule {
         getNetworkMode: GetNetworkMode,
         dateProvider: DateProvider,
         permissions: UserPermissionProvider,
-        analyticSpaceHelperDelegate: AnalyticSpaceHelperDelegate
+        analyticSpaceHelperDelegate: AnalyticSpaceHelperDelegate,
+        clearLastOpenedObject: ClearLastOpenedObject
     ): ObjectSetViewModelFactory = ObjectSetViewModelFactory(
         params = params,
         openObjectSet = openObjectSet,
@@ -297,7 +299,8 @@ object ObjectSetModule {
         getNetworkMode = getNetworkMode,
         dateProvider = dateProvider,
         permissions = permissions,
-        analyticSpaceHelperDelegate = analyticSpaceHelperDelegate
+        analyticSpaceHelperDelegate = analyticSpaceHelperDelegate,
+        clearLastOpenedObject = clearLastOpenedObject
     )
 
     @JvmStatic

app/src/main/java/com/anytypeio/anytype/di/feature/home/HomescreenDI.kt

@@ -22,13 +22,15 @@ import com.anytypeio.anytype.domain.library.StorelessSubscriptionContainer
 import com.anytypeio.anytype.domain.misc.AppActionManager
 import com.anytypeio.anytype.domain.misc.UrlBuilder
 import com.anytypeio.anytype.domain.multiplayer.ActiveSpaceMemberSubscriptionContainer
+import com.anytypeio.anytype.domain.multiplayer.SpaceViewSubscriptionContainer
 import com.anytypeio.anytype.domain.multiplayer.UserPermissionProvider
 import com.anytypeio.anytype.domain.`object`.GetObject
 import com.anytypeio.anytype.domain.`object`.OpenObject
 import com.anytypeio.anytype.domain.`object`.SetObjectDetails
 import com.anytypeio.anytype.domain.objects.ObjectStore
 import com.anytypeio.anytype.domain.objects.ObjectWatcher
 import com.anytypeio.anytype.domain.objects.StoreOfObjectTypes
+import com.anytypeio.anytype.domain.objects.StoreOfRelations
 import com.anytypeio.anytype.domain.page.CloseBlock
 import com.anytypeio.anytype.domain.page.CreateObject
 import com.anytypeio.anytype.domain.search.SubscriptionEventChannel
@@ -287,4 +289,6 @@ interface HomeScreenDependencies : ComponentDependencies {
     fun notificationChannel(): NotificationsChannel
     fun activeSpaceMembers() : ActiveSpaceMemberSubscriptionContainer
     fun analyticSpaceHelperDelegate(): AnalyticSpaceHelperDelegate
+    fun storeOfRelations(): StoreOfRelations
+    fun spaceViewSubscriptionContainer(): SpaceViewSubscriptionContainer
 }

app/src/main/java/com/anytypeio/anytype/di/feature/search/GlobalSearchComponent.kt

@@ -1,6 +1,7 @@
 package com.anytypeio.anytype.di.feature.search
 
 import androidx.lifecycle.ViewModelProvider
+import com.anytypeio.anytype.analytics.base.Analytics
 import com.anytypeio.anytype.core_utils.di.scope.PerScreen
 import com.anytypeio.anytype.di.common.ComponentDependencies
 import com.anytypeio.anytype.domain.base.AppCoroutineDispatchers
@@ -9,6 +10,7 @@ import com.anytypeio.anytype.domain.misc.UrlBuilder
 import com.anytypeio.anytype.domain.objects.StoreOfObjectTypes
 import com.anytypeio.anytype.domain.objects.StoreOfRelations
 import com.anytypeio.anytype.domain.workspace.SpaceManager
+import com.anytypeio.anytype.presentation.analytics.AnalyticSpaceHelperDelegate
 import com.anytypeio.anytype.presentation.search.GlobalSearchViewModel
 import com.anytypeio.anytype.ui.search.GlobalSearchFragment
 import dagger.Binds
@@ -48,4 +50,6 @@ interface GlobalSearchDependencies : ComponentDependencies {
     fun storeOfObjectTypes(): StoreOfObjectTypes
     fun storeOfRelations(): StoreOfRelations
     fun spaceManager(): SpaceManager
+    fun analytics(): Analytics
+    fun analyticsHelper() : AnalyticSpaceHelperDelegate
 }

app/src/main/java/com/anytypeio/anytype/di/main/DataModule.kt

@@ -56,6 +56,7 @@ import com.anytypeio.anytype.persistence.repo.DefaultUserSettingsCache
 import dagger.Binds
 import dagger.Module
 import dagger.Provides
+import java.security.GeneralSecurityException
 import javax.inject.Named
 import javax.inject.Singleton
 import timber.log.Timber
@@ -168,16 +169,25 @@ object DataModule {
         context: Context
     ): SharedPreferences = try {
         initializeEncryptedPrefs(context)
+    } catch (e: GeneralSecurityException) {
+        // https://issuetracker.google.com/issues/164901843
+        Timber.e(e, "Security error while initializing encrypted prefs")
+        // Clearing pre-existing prefs
+        retryInstantiatingEncryptedPrefs(context)
     } catch (e: Exception) {
         // https://issuetracker.google.com/issues/164901843
-        Timber.e(e, "Error while initializing encrypted prefs")
+        Timber.e(e, "Unknown error while initializing encrypted prefs")
         // Clearing pre-existing prefs
+        retryInstantiatingEncryptedPrefs(context)
+    }
+
+    private fun retryInstantiatingEncryptedPrefs(context: Context): SharedPreferences {
         context
             .getSharedPreferences(ENCRYPTED_PREFS_NAME, Context.MODE_PRIVATE)
             .edit()
             .clear()
             .commit()
-        initializeEncryptedPrefs(context)
+        return initializeEncryptedPrefs(context)
     }
 
     private fun initializeEncryptedPrefs(context: Context) = EncryptedSharedPreferences.create(