apply to master

app/proguard-rules.pro

@@ -94,4 +94,17 @@
 # databinding
 -dontwarn androidx.databinding.**
 -keep class androidx.databinding.** { *; }
--keep class * extends androidx.databinding.DataBinderMapper
+-keep class * extends androidx.databinding.DataBinderMapper
+
+# glide
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep class * extends com.bumptech.glide.module.AppGlideModule {
+ <init>(...);
+}
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+ **[] $VALUES;
+ public *;
+}
+-keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
+ *** rewind();
+}

app/src/main/AndroidManifest.xml

@@ -128,7 +128,10 @@
  <activity android:name="net.pantasystem.milktea.userlist.ListListActivity" />
  <activity android:name="net.pantasystem.milktea.favorite.FavoriteActivity" />
  <activity android:name="net.pantasystem.milktea.user.activity.FollowFollowerActivity" />
- <activity android:name="net.pantasystem.milktea.search.SearchActivity" />
+ <activity
+ android:name="net.pantasystem.milktea.search.SearchActivity"
+ android:windowSoftInputMode="adjustResize"
+ />
  <activity
  android:name="net.pantasystem.milktea.search.SearchResultActivity"
  android:exported="true">

app/src/main/java/jp/panta/misskeyandroidclient/MiApplication.kt

@@ -25,9 +25,8 @@ import net.pantasystem.milktea.model.account.ClientIdRepository
 import net.pantasystem.milktea.model.notes.NoteDataSource
 import net.pantasystem.milktea.worker.SyncNodeInfoCacheWorker
 import net.pantasystem.milktea.worker.drive.CleanupUnusedDriveCacheWorker
+import net.pantasystem.milktea.worker.emoji.cache.CacheCustomEmojiImageWorker
 import net.pantasystem.milktea.worker.filter.SyncMastodonFilterWorker
-import net.pantasystem.milktea.worker.instance.ScheduleAuthInstancesPostWorker
-import net.pantasystem.milktea.worker.instance.SyncInstanceInfoWorker
 import net.pantasystem.milktea.worker.meta.SyncMetaWorker
 import net.pantasystem.milktea.worker.sw.RegisterAllSubscriptionRegistration
 import net.pantasystem.milktea.worker.user.SyncLoggedInUserInfoWorker
@@ -142,12 +141,6 @@ class MiApplication : Application(), Configuration.Provider {
  }
  }
 
- applicationScope.launch {
- noteDataSource.clear().onFailure {
- logger.error("NoteDataSourceの初期化に失敗", it)
- }
- }
-
  FirebaseAnalytics.getInstance(this).setUserId(
  clientIdRepository.getOrCreate().clientId
  )
@@ -198,21 +191,27 @@ class MiApplication : Application(), Configuration.Provider {
  ExistingPeriodicWorkPolicy.REPLACE,
  SyncLoggedInUserInfoWorker.createPeriodicWorkRequest(),
  )
+// enqueueUniquePeriodicWork(
+// "scheduleAuthInstancePostWorker",
+// ExistingPeriodicWorkPolicy.REPLACE,
+// ScheduleAuthInstancesPostWorker.createPeriodicWorkRequest(),
+// )
+// enqueueUniquePeriodicWork(
+// "syncInstanceInfoWorker",
+// ExistingPeriodicWorkPolicy.REPLACE,
+// SyncInstanceInfoWorker.createPeriodicWorkRequest(),
+// )
  enqueueUniquePeriodicWork(
- "scheduleAuthInstancePostWorker",
- ExistingPeriodicWorkPolicy.REPLACE,
- ScheduleAuthInstancesPostWorker.createPeriodicWorkRequest(),
- )
- enqueueUniquePeriodicWork(
- "syncInstanceInfoWorker",
+ "syncMastodonWordFilter",
  ExistingPeriodicWorkPolicy.REPLACE,
- SyncInstanceInfoWorker.createPeriodicWorkRequest(),
+ SyncMastodonFilterWorker.createPeriodicWorkerRequest(),
  )
  enqueueUniquePeriodicWork(
- "syncMastodonWordFilter",
+ "cacheEmojiImages",
  ExistingPeriodicWorkPolicy.REPLACE,
- SyncMastodonFilterWorker.createPeriodicWorkerRequest(),
+ CacheCustomEmojiImageWorker.createPeriodicWorkRequest(),
  )
+
  enqueue(
  SyncRenoteMutesWorker.createOneTimeWorkRequest()
  )

app/src/main/java/jp/panta/misskeyandroidclient/ThemeUtil.kt

@@ -29,6 +29,7 @@ fun Activity.setTheme() {
  Theme.Black -> setTheme(R.style.AppThemeBlack)
  Theme.Bread -> setTheme(R.style.AppThemeBread)
  Theme.White -> setTheme(R.style.AppTheme)
+ Theme.ElephantDark -> setTheme(R.style.AppThemeMastodonDark)
  }
 
 }

app/src/main/java/jp/panta/misskeyandroidclient/di/module/EmojiModule.kt

@@ -5,12 +5,8 @@ import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import jp.panta.misskeyandroidclient.impl.CheckEmojiAndroidImpl
-import kotlinx.coroutines.CoroutineScope
-import net.pantasystem.milktea.common.Logger
 import net.pantasystem.milktea.data.infrastructure.DataBase
-import net.pantasystem.milktea.data.infrastructure.emoji.Utf8EmojiRepositoryImpl
 import net.pantasystem.milktea.data.infrastructure.emoji.Utf8EmojisDAO
-import net.pantasystem.milktea.model.emoji.UtfEmojiRepository
 import net.pantasystem.milktea.model.notes.reaction.CheckEmoji
 import javax.inject.Singleton
 
@@ -21,24 +17,23 @@ object EmojiModule {
  @Singleton
  @Provides
  fun provideCheckEmoji(
- utfEmojiRepository: UtfEmojiRepository
  ): CheckEmoji {
- return CheckEmojiAndroidImpl(utfEmojiRepository)
+ return CheckEmojiAndroidImpl()
  }
 
- @Singleton
- @Provides
- fun provideUtf8EmojiRepository(
- coroutineScope: CoroutineScope,
- loggerFactory: Logger.Factory,
- emojisDAO: Utf8EmojisDAO,
- ): UtfEmojiRepository {
- return Utf8EmojiRepositoryImpl(
- coroutineScope = coroutineScope,
- loggerFactory = loggerFactory,
- utf8EmojisDAO = emojisDAO
- )
- }
+// @Singleton
+// @Provides
+// fun provideUtf8EmojiRepository(
+// coroutineScope: CoroutineScope,
+// loggerFactory: Logger.Factory,
+// emojisDAO: Utf8EmojisDAO,
+// ): UtfEmojiRepository {
+// return Utf8EmojiRepositoryImpl(
+// coroutineScope = coroutineScope,
+// loggerFactory = loggerFactory,
+// utf8EmojisDAO = emojisDAO
+// )
+// }
 
  @Singleton
  @Provides

app/src/main/java/jp/panta/misskeyandroidclient/di/module/ObjectBoxModule.kt

@@ -7,7 +7,7 @@ import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import io.objectbox.BoxStore
-import net.pantasystem.milktea.data.infrastructure.notes.impl.db.MyObjectBox
+import net.pantasystem.milktea.data.infrastructure.emoji.MyObjectBox
 import javax.inject.Singleton
 
 @Module

app/src/main/java/jp/panta/misskeyandroidclient/impl/CheckEmojiAndroidImpl.kt

@@ -1,11 +1,9 @@
 package jp.panta.misskeyandroidclient.impl
 
-import net.pantasystem.milktea.model.emoji.UtfEmojiRepository
 import net.pantasystem.milktea.model.notes.reaction.CheckEmoji
 import javax.inject.Inject
 
 class CheckEmojiAndroidImpl @Inject constructor(
- private val utf8EmojiRepository: UtfEmojiRepository
 ) : CheckEmoji {
  override suspend fun checkEmoji(char: CharSequence): Boolean {
 // return (EmojiCompat.get()?.hasEmojiGlyph(char) ?: false) || utf8EmojiRepository.exists(char)

app/src/main/java/jp/panta/misskeyandroidclient/ui/PageableFragmentFactoryImpl.kt

@@ -19,10 +19,10 @@ class PageableFragmentFactoryImpl @Inject constructor(): PageableFragmentFactory
  NoteDetailFragment.newInstance(page)
  }
  is Pageable.Notification ->{
- NotificationFragment()
+ NotificationFragment.newInstance(page.attachedAccountId ?: page.accountId)
  }
  is Pageable.Gallery -> {
- return GalleryPostsFragment.newInstance(pageable, page.accountId)
+ return GalleryPostsFragment.newInstance(pageable, page.attachedAccountId ?: page.accountId)
  }
  else ->{
  TimelineFragment.newInstance(page)
@@ -57,10 +57,10 @@ class PageableFragmentFactoryImpl @Inject constructor(): PageableFragmentFactory
  NoteDetailFragment.newInstance(pageable.noteId, accountId)
  }
  is Pageable.Notification ->{
- NotificationFragment()
+ NotificationFragment.newInstance(accountId)
  }
  is Pageable.Gallery -> {
- return GalleryPostsFragment.newInstance(pageable, null)
+ return GalleryPostsFragment.newInstance(pageable, accountId)
  }
  else ->{
  TimelineFragment.newInstance(pageable, accountId)

app/src/main/java/jp/panta/misskeyandroidclient/ui/main/FabClickHandler.kt

@@ -9,6 +9,7 @@ import net.pantasystem.milktea.common_viewmodel.CurrentPageableTimelineViewModel
 import net.pantasystem.milktea.common_viewmodel.SuitableType
 import net.pantasystem.milktea.common_viewmodel.suitableType
 import net.pantasystem.milktea.gallery.GalleryPostsActivity
+import net.pantasystem.milktea.model.account.page.Pageable
 import net.pantasystem.milktea.model.channel.Channel
 import net.pantasystem.milktea.note.NoteEditorActivity
 
@@ -20,26 +21,40 @@ internal class FabClickHandler(
 
  fun onClicked() {
  activity.apply {
- when(val type = currentPageableTimelineViewModel.currentType.value) {
+ when (val type = currentPageableTimelineViewModel.currentType.value) {
  CurrentPageType.Account -> {
- AccountSwitchingDialog().show(activity.supportFragmentManager, "AccountSwitchingDialog")
+ AccountSwitchingDialog().show(
+ activity.supportFragmentManager,
+ "AccountSwitchingDialog"
+ )
  }
  is CurrentPageType.Page -> {
  when (val suitableType = type.pageable.suitableType()) {
  is SuitableType.Other -> {
- startActivity(Intent(this, NoteEditorActivity::class.java))
+ val text = when (val pageable = type.pageable) {
+ is Pageable.SearchByTag -> "#${pageable.tag}"
+ is Pageable.Mastodon.HashTagTimeline -> "#${pageable.hashtag}"
+ else -> ""
+ }
+ startActivity(
+ NoteEditorActivity.newBundle(
+ this,
+ accountId = type.accountId,
+ text = text
+ )
+ )
  }
  is SuitableType.Gallery -> {
  val intent = Intent(this, GalleryPostsActivity::class.java)
  intent.action = Intent.ACTION_EDIT
  startActivity(intent)
  }
  is SuitableType.Channel -> {
- val accountId = accountStore.currentAccountId!!
+ val accountId = type.accountId ?: accountStore.currentAccountId!!
  startActivity(
  NoteEditorActivity.newBundle(
  this,
- channelId = Channel.Id(accountId, suitableType.channelId)
+ channelId = Channel.Id(accountId, suitableType.channelId),
  )
  )
  }

app/src/main/java/jp/panta/misskeyandroidclient/ui/main/MainActivityEventHandler.kt

@@ -77,7 +77,7 @@ internal class MainActivityEventHandler(
 
  private fun collectCrashlyticsCollectionState() {
  lifecycleScope.launch {
- lifecycleOwner.repeatOnLifecycle(Lifecycle.State.CREATED) {
+ lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
  mainViewModel.isShowFirebaseCrashlytics.collect {
  if (it) {
  ConfirmCrashlyticsDialog().show(
@@ -92,7 +92,7 @@ internal class MainActivityEventHandler(
 
  private fun collectConfirmGoogleAnalyticsState() {
  lifecycleScope.launch {
- lifecycleOwner.repeatOnLifecycle(Lifecycle.State.CREATED) {
+ lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
  mainViewModel.isShowGoogleAnalyticsDialog.collect {
  if (it) {
  ConfirmGoogleAnalyticsDialog().show(
@@ -156,14 +156,14 @@ internal class MainActivityEventHandler(
  lifecycleOwner.whenResumed {
  // NOTE: 通知音を再生する
  mainViewModel.newNotifications.collect {
- if (ringtone.isPlaying) {
+ if (ringtone?.isPlaying == true) {
  ringtone.stop()
  }
  if (
  configStore.configState.value.isEnableNotificationSound
  && audioManager.ringerMode == AudioManager.RINGER_MODE_NORMAL
  ) {
- ringtone.play()
+ ringtone?.play()
  }
  }
  }

app/src/test/java/jp/panta/misskeyandroidclient/api/notes/NoteDTOTest.kt

@@ -3,10 +3,10 @@ package jp.panta.misskeyandroidclient.api.notes
 
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
+import net.pantasystem.milktea.api.misskey.emoji.CustomEmojiNetworkDTO
 import net.pantasystem.milktea.api.misskey.emoji.EmojisType
 import net.pantasystem.milktea.api.misskey.emoji.TestNoteObject
 import net.pantasystem.milktea.api.misskey.notes.NoteDTO
-import net.pantasystem.milktea.model.emoji.Emoji
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 
@@ -869,7 +869,7 @@ class NoteDTOTest {
  [{"name": "hoge", "url": "https://example.com"}]
  """.trimIndent()
  val result = builder.decodeFromString<EmojisType>(json1)
- Assertions.assertEquals(EmojisType.TypeArray(listOf(Emoji(name = "hoge", url = "https://example.com"))), result)
+ Assertions.assertEquals(EmojisType.TypeArray(listOf(CustomEmojiNetworkDTO(name = "hoge", url = "https://example.com"))), result)
 
  }
 
@@ -896,7 +896,7 @@ class NoteDTOTest {
  """.trimIndent()
  val result = builder.decodeFromString<TestNoteObject>(json1)
  Assertions.assertEquals(TestNoteObject(EmojisType.TypeArray(
- listOf(Emoji(name = "hoge", url = "https://example.com"))
+ listOf(CustomEmojiNetworkDTO(name = "hoge", url = "https://example.com"))
  )), result)
  }
 

app/src/test/java/jp/panta/misskeyandroidclient/model/account/AccountTest.kt

@@ -282,4 +282,17 @@ class AccountTest {
  )
  Assertions.assertEquals("mk.iaia.moe", account.getHost())
  }
+
+ @Test
+ fun getAcct() {
+ val account = Account(
+ remoteId = "",
+ instanceDomain = "https://calc.panta.systems",
+ userName = "Panta",
+ instanceType = Account.InstanceType.MISSKEY,
+ token = ""
+ )
+ val actual = account.getAcct()
+ Assertions.assertEquals("@Panta@calc.panta.systems", actual)
+ }
 }