Skip to content

Commit 37f3b68

Browse files
committed
Glimpse: Handle not found and empty albums again
Change-Id: I21ad32034710f65ce6ed22502b733893b0e36b86
1 parent 4797054 commit 37f3b68

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

app/src/main/java/org/lineageos/glimpse/ViewActivity.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import com.google.android.material.button.MaterialButton
3636
import kotlinx.coroutines.coroutineScope
3737
import kotlinx.coroutines.flow.collectLatest
3838
import kotlinx.coroutines.launch
39+
import org.lineageos.glimpse.datasources.MediaError
3940
import org.lineageos.glimpse.ext.buildEditIntent
4041
import org.lineageos.glimpse.ext.buildShareIntent
4142
import org.lineageos.glimpse.ext.buildUseAsIntent
@@ -356,12 +357,22 @@ class ViewActivity : AppCompatActivity(R.layout.activity_view) {
356357

357358
viewModel.setMediaPosition(position)
358359
}
360+
361+
if (medias.isEmpty()) {
362+
// Get out of here
363+
finish()
364+
}
359365
}
360366

361367
is RequestStatus.Error -> {
362368
Log.e(LOG_TAG, "Failed to load medias, error: ${it.error}")
363369

364370
mediaViewerAdapter.submitList(listOf())
371+
372+
if (it.error == MediaError.NOT_FOUND) {
373+
// Get out of here
374+
finish()
375+
}
365376
}
366377
}
367378
}

app/src/main/java/org/lineageos/glimpse/fragments/AlbumFragment.kt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import kotlinx.coroutines.flow.collectLatest
4848
import kotlinx.coroutines.launch
4949
import org.lineageos.glimpse.R
5050
import org.lineageos.glimpse.ViewActivity
51+
import org.lineageos.glimpse.datasources.MediaError
5152
import org.lineageos.glimpse.ext.buildShareIntent
5253
import org.lineageos.glimpse.ext.createDeleteRequest
5354
import org.lineageos.glimpse.ext.createTrashRequest
@@ -473,6 +474,11 @@ class AlbumFragment : Fragment(R.layout.fragment_album) {
473474
recyclerView.isVisible = false
474475
toolbar.menu.findItem(R.id.emptyTrash)?.isVisible = false
475476
noMediaLinearLayout.isVisible = true
477+
478+
if (it.error == MediaError.NOT_FOUND) {
479+
// Get out of here
480+
findNavController().navigateUp()
481+
}
476482
}
477483
}
478484
}

0 commit comments

Comments
 (0)