Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed error snack message that can happen when resuming fragment that was in background for a while

Browse source
This commit is contained in:
Sylvain Berfini 2021-06-17 10:05:58 +02:00
parent 032e9fe8ec
commit 4ec271a85a
13 changed files with 13 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
View file

@ -130,7 +130,7 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
val chatRoom = sharedViewModel.selectedChatRoom.value val chatRoom = sharedViewModel.selectedChatRoom.value
if (chatRoom == null) { if (chatRoom == null) {
Log.e("[Chat Room] Chat room is null, aborting!") Log.e("[Chat Room] Chat room is null, aborting!")
(activity as MainActivity).showSnackBar(R.string.error) // (activity as MainActivity).showSnackBar(R.string.error)
findNavController().navigateUp() findNavController().navigateUp()
return return
} }

3
app/src/main/java/org/linphone/activities/main/chat/fragments/DevicesFragment.kt
View file

@ -24,7 +24,6 @@ import android.view.View
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import org.linphone.R import org.linphone.R
import org.linphone.activities.main.MainActivity
import org.linphone.activities.main.chat.viewmodels.DevicesListViewModel import org.linphone.activities.main.chat.viewmodels.DevicesListViewModel
import org.linphone.activities.main.chat.viewmodels.DevicesListViewModelFactory import org.linphone.activities.main.chat.viewmodels.DevicesListViewModelFactory
import org.linphone.activities.main.fragments.SecureFragment import org.linphone.activities.main.fragments.SecureFragment
@ -50,7 +49,7 @@ class DevicesFragment : SecureFragment<ChatRoomDevicesFragmentBinding>() {
val chatRoom = sharedViewModel.selectedChatRoom.value val chatRoom = sharedViewModel.selectedChatRoom.value
if (chatRoom == null) { if (chatRoom == null) {
Log.e("[Devices] Chat room is null, aborting!") Log.e("[Devices] Chat room is null, aborting!")
(activity as MainActivity).showSnackBar(R.string.error) // (activity as MainActivity).showSnackBar(R.string.error)
findNavController().navigateUp() findNavController().navigateUp()
return return
} }

3
app/src/main/java/org/linphone/activities/main/chat/fragments/EphemeralFragment.kt
View file

@ -24,7 +24,6 @@ import android.view.View
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import org.linphone.R import org.linphone.R
import org.linphone.activities.main.MainActivity
import org.linphone.activities.main.chat.viewmodels.EphemeralViewModel import org.linphone.activities.main.chat.viewmodels.EphemeralViewModel
import org.linphone.activities.main.chat.viewmodels.EphemeralViewModelFactory import org.linphone.activities.main.chat.viewmodels.EphemeralViewModelFactory
import org.linphone.activities.main.fragments.SecureFragment import org.linphone.activities.main.fragments.SecureFragment
@ -53,7 +52,7 @@ class EphemeralFragment : SecureFragment<ChatRoomEphemeralFragmentBinding>() {
val chatRoom = sharedViewModel.selectedChatRoom.value val chatRoom = sharedViewModel.selectedChatRoom.value
if (chatRoom == null) { if (chatRoom == null) {
Log.e("[Ephemeral] Chat room is null, aborting!") Log.e("[Ephemeral] Chat room is null, aborting!")
(activity as MainActivity).showSnackBar(R.string.error) // (activity as MainActivity).showSnackBar(R.string.error)
findNavController().navigateUp() findNavController().navigateUp()
return return
} }

3
app/src/main/java/org/linphone/activities/main/chat/fragments/ImdnFragment.kt
View file

@ -25,7 +25,6 @@ import androidx.lifecycle.ViewModelProvider
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import org.linphone.R import org.linphone.R
import org.linphone.activities.main.MainActivity
import org.linphone.activities.main.chat.adapters.ImdnAdapter import org.linphone.activities.main.chat.adapters.ImdnAdapter
import org.linphone.activities.main.chat.viewmodels.ImdnViewModel import org.linphone.activities.main.chat.viewmodels.ImdnViewModel
import org.linphone.activities.main.chat.viewmodels.ImdnViewModelFactory import org.linphone.activities.main.chat.viewmodels.ImdnViewModelFactory
@ -57,7 +56,7 @@ class ImdnFragment : SecureFragment<ChatRoomImdnFragmentBinding>() {
val chatRoom = sharedViewModel.selectedChatRoom.value val chatRoom = sharedViewModel.selectedChatRoom.value
if (chatRoom == null) { if (chatRoom == null) {
Log.e("[IMDN] Chat room is null, aborting!") Log.e("[IMDN] Chat room is null, aborting!")
(activity as MainActivity).showSnackBar(R.string.error) // (activity as MainActivity).showSnackBar(R.string.error)
findNavController().navigateUp() findNavController().navigateUp()
return return
} }

2
app/src/main/java/org/linphone/activities/main/contact/fragments/DetailContactFragment.kt
View file

@ -66,7 +66,7 @@ class DetailContactFragment : GenericFragment<ContactDetailFragmentBinding>() {
val contact = sharedViewModel.selectedContact.value val contact = sharedViewModel.selectedContact.value
if (contact == null) { if (contact == null) {
Log.e("[Contact] Contact is null, aborting!") Log.e("[Contact] Contact is null, aborting!")
(activity as MainActivity).showSnackBar(R.string.error) // (activity as MainActivity).showSnackBar(R.string.error)
findNavController().navigateUp() findNavController().navigateUp()
return return
} }

3
app/src/main/java/org/linphone/activities/main/files/fragments/AudioViewerFragment.kt
View file

@ -27,7 +27,6 @@ import android.widget.MediaController
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import org.linphone.R import org.linphone.R
import org.linphone.activities.main.MainActivity
import org.linphone.activities.main.files.viewmodels.AudioFileViewModel import org.linphone.activities.main.files.viewmodels.AudioFileViewModel
import org.linphone.activities.main.files.viewmodels.AudioFileViewModelFactory import org.linphone.activities.main.files.viewmodels.AudioFileViewModelFactory
import org.linphone.core.tools.Log import org.linphone.core.tools.Log
@ -49,7 +48,7 @@ class AudioViewerFragment : GenericViewerFragment<FileAudioViewerFragmentBinding
val content = sharedViewModel.contentToOpen.value val content = sharedViewModel.contentToOpen.value
if (content == null) { if (content == null) {
Log.e("[Audio Viewer] Content is null, aborting!") Log.e("[Audio Viewer] Content is null, aborting!")
(activity as MainActivity).showSnackBar(R.string.error) // (activity as MainActivity).showSnackBar(R.string.error)
findNavController().navigateUp() findNavController().navigateUp()
return return
} }

3
app/src/main/java/org/linphone/activities/main/files/fragments/GenericViewerFragment.kt
View file

@ -25,7 +25,6 @@ import androidx.databinding.ViewDataBinding
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import org.linphone.R import org.linphone.R
import org.linphone.activities.main.MainActivity
import org.linphone.activities.main.fragments.SecureFragment import org.linphone.activities.main.fragments.SecureFragment
import org.linphone.activities.main.viewmodels.SharedMainViewModel import org.linphone.activities.main.viewmodels.SharedMainViewModel
import org.linphone.core.tools.Log import org.linphone.core.tools.Log
@ -49,7 +48,7 @@ abstract class GenericViewerFragment<T : ViewDataBinding> : SecureFragment<T>()
val content = sharedViewModel.contentToOpen.value val content = sharedViewModel.contentToOpen.value
if (content == null) { if (content == null) {
Log.e("[Generic Viewer] Content is null, aborting!") Log.e("[Generic Viewer] Content is null, aborting!")
(activity as MainActivity).showSnackBar(R.string.error) // (activity as MainActivity).showSnackBar(R.string.error)
findNavController().navigateUp() findNavController().navigateUp()
return return
} }

3
app/src/main/java/org/linphone/activities/main/files/fragments/ImageViewerFragment.kt
View file

@ -25,7 +25,6 @@ import android.view.View
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import org.linphone.R import org.linphone.R
import org.linphone.activities.main.MainActivity
import org.linphone.activities.main.files.viewmodels.ImageFileViewModel import org.linphone.activities.main.files.viewmodels.ImageFileViewModel
import org.linphone.activities.main.files.viewmodels.ImageFileViewModelFactory import org.linphone.activities.main.files.viewmodels.ImageFileViewModelFactory
import org.linphone.core.tools.Log import org.linphone.core.tools.Log
@ -45,7 +44,7 @@ class ImageViewerFragment : GenericViewerFragment<FileImageViewerFragmentBinding
val content = sharedViewModel.contentToOpen.value val content = sharedViewModel.contentToOpen.value
if (content == null) { if (content == null) {
Log.e("[Image Viewer] Content is null, aborting!") Log.e("[Image Viewer] Content is null, aborting!")
(activity as MainActivity).showSnackBar(R.string.error) // (activity as MainActivity).showSnackBar(R.string.error)
findNavController().navigateUp() findNavController().navigateUp()
return return
} }

3
app/src/main/java/org/linphone/activities/main/files/fragments/PdfViewerFragment.kt
View file

@ -24,7 +24,6 @@ import android.view.View
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import org.linphone.R import org.linphone.R
import org.linphone.activities.main.MainActivity
import org.linphone.activities.main.files.adapters.PdfPagesListAdapter import org.linphone.activities.main.files.adapters.PdfPagesListAdapter
import org.linphone.activities.main.files.viewmodels.PdfFileViewModel import org.linphone.activities.main.files.viewmodels.PdfFileViewModel
import org.linphone.activities.main.files.viewmodels.PdfFileViewModelFactory import org.linphone.activities.main.files.viewmodels.PdfFileViewModelFactory
@ -45,7 +44,7 @@ class PdfViewerFragment : GenericViewerFragment<FilePdfViewerFragmentBinding>()
val content = sharedViewModel.contentToOpen.value val content = sharedViewModel.contentToOpen.value
if (content == null) { if (content == null) {
Log.e("[PDF Viewer] Content is null, aborting!") Log.e("[PDF Viewer] Content is null, aborting!")
(activity as MainActivity).showSnackBar(R.string.error) // (activity as MainActivity).showSnackBar(R.string.error)
findNavController().navigateUp() findNavController().navigateUp()
return return
} }

3
app/src/main/java/org/linphone/activities/main/files/fragments/TextViewerFragment.kt
View file

@ -24,7 +24,6 @@ import android.view.View
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import org.linphone.R import org.linphone.R
import org.linphone.activities.main.MainActivity
import org.linphone.activities.main.files.viewmodels.TextFileViewModel import org.linphone.activities.main.files.viewmodels.TextFileViewModel
import org.linphone.activities.main.files.viewmodels.TextFileViewModelFactory import org.linphone.activities.main.files.viewmodels.TextFileViewModelFactory
import org.linphone.core.tools.Log import org.linphone.core.tools.Log
@ -43,7 +42,7 @@ class TextViewerFragment : GenericViewerFragment<FileTextViewerFragmentBinding>(
val content = sharedViewModel.contentToOpen.value val content = sharedViewModel.contentToOpen.value
if (content == null) { if (content == null) {
Log.e("[Text Viewer] Content is null, aborting!") Log.e("[Text Viewer] Content is null, aborting!")
(activity as MainActivity).showSnackBar(R.string.error) // (activity as MainActivity).showSnackBar(R.string.error)
findNavController().navigateUp() findNavController().navigateUp()
return return
} }

3
app/src/main/java/org/linphone/activities/main/files/fragments/VideoViewerFragment.kt
View file

@ -26,7 +26,6 @@ import android.widget.MediaController
import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.ViewModelProvider
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import org.linphone.R import org.linphone.R
import org.linphone.activities.main.MainActivity
import org.linphone.activities.main.files.viewmodels.VideoFileViewModel import org.linphone.activities.main.files.viewmodels.VideoFileViewModel
import org.linphone.activities.main.files.viewmodels.VideoFileViewModelFactory import org.linphone.activities.main.files.viewmodels.VideoFileViewModelFactory
import org.linphone.core.tools.Log import org.linphone.core.tools.Log
@ -47,7 +46,7 @@ class VideoViewerFragment : GenericViewerFragment<FileVideoViewerFragmentBinding
val content = sharedViewModel.contentToOpen.value val content = sharedViewModel.contentToOpen.value
if (content == null) { if (content == null) {
Log.e("[Video Viewer] Content is null, aborting!") Log.e("[Video Viewer] Content is null, aborting!")
(activity as MainActivity).showSnackBar(R.string.error) // (activity as MainActivity).showSnackBar(R.string.error)
findNavController().navigateUp() findNavController().navigateUp()
return return
} }

2
app/src/main/java/org/linphone/activities/main/history/fragments/DetailCallLogFragment.kt
View file

@ -55,7 +55,7 @@ class DetailCallLogFragment : GenericFragment<HistoryDetailFragmentBinding>() {
val callLogGroup = sharedViewModel.selectedCallLogGroup.value val callLogGroup = sharedViewModel.selectedCallLogGroup.value
if (callLogGroup == null) { if (callLogGroup == null) {
Log.e("[History] Call log group is null, aborting!") Log.e("[History] Call log group is null, aborting!")
(activity as MainActivity).showSnackBar(R.string.error) // (activity as MainActivity).showSnackBar(R.string.error)
findNavController().navigateUp() findNavController().navigateUp()
return return
} }

3
app/src/main/java/org/linphone/activities/main/settings/fragments/AccountSettingsFragment.kt
View file

@ -25,7 +25,6 @@ import androidx.lifecycle.ViewModelProvider
import androidx.navigation.fragment.findNavController import androidx.navigation.fragment.findNavController
import org.linphone.R import org.linphone.R
import org.linphone.activities.GenericFragment import org.linphone.activities.GenericFragment
import org.linphone.activities.main.MainActivity
import org.linphone.activities.main.settings.viewmodels.AccountSettingsViewModel import org.linphone.activities.main.settings.viewmodels.AccountSettingsViewModel
import org.linphone.activities.main.settings.viewmodels.AccountSettingsViewModelFactory import org.linphone.activities.main.settings.viewmodels.AccountSettingsViewModelFactory
import org.linphone.activities.main.viewmodels.SharedMainViewModel import org.linphone.activities.main.viewmodels.SharedMainViewModel
@ -51,7 +50,7 @@ class AccountSettingsFragment : GenericFragment<SettingsAccountFragmentBinding>(
val identity = arguments?.getString("Identity") val identity = arguments?.getString("Identity")
if (identity == null) { if (identity == null) {
Log.e("[Account Settings] Identity is null, aborting!") Log.e("[Account Settings] Identity is null, aborting!")
(activity as MainActivity).showSnackBar(R.string.error) // (activity as MainActivity).showSnackBar(R.string.error)
findNavController().navigateUp() findNavController().navigateUp()
return return
} }