- Repair bugs

DesarrolloAntonio · Apr 5, 2024 · 708a116 · 708a116
1 parent 0fde30b
commit 708a116
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/network/src/main/java/com/desarrollodroide/network/retrofit/NetworkBoundResource.kt b/network/src/main/java/com/desarrollodroide/network/retrofit/NetworkBoundResource.kt
@@ -73,16 +73,19 @@ abstract class NetworkNoCacheResource<RequestType, ResultType>(
 ) {
     fun asFlow() = flow {
         emit(Result.Loading(null)) // start loading state immediately
-
         try {
             val apiResponse = fetchFromRemote()
             val remoteResponse = apiResponse.body()
             if (apiResponse.isSuccessful && remoteResponse != null) {
                 emitAll(fetchResult(remoteResponse).map { Result.Success(it) })
             } else {
-                emit(Result.Error(errorHandler.getApiError(apiResponse.code()), null))
+                emit(Result.Error(errorHandler.getApiError(
+                    statusCode = apiResponse.code(),
+                    throwable = null,
+                    message = apiResponse.errorBody()?.string())))
             }
         } catch (e: Exception) {
+            Log.v("NetworkNoCacheResource", "Error: ${e.message}")
             emit(Result.Error(errorHandler.getError(e), null))
         }
     }

diff --git a/presentation/src/main/AndroidManifest.xml b/presentation/src/main/AndroidManifest.xml
@@ -33,7 +33,6 @@
         </activity>
         <activity android:name=".ui.bookmarkeditor.BookmarkEditorActivity"
             android:label="Save in PageKeeper"
-            android:launchMode="singleTask"
             android:screenOrientation="portrait"
             android:exported="true"
             tools:ignore="DiscouragedApi,LockedOrientationActivity">

diff --git a/...tion/src/main/java/com/desarrollodroide/pagekeeper/ui/bookmarkeditor/BookmarkViewModel.kt b/...tion/src/main/java/com/desarrollodroide/pagekeeper/ui/bookmarkeditor/BookmarkViewModel.kt
@@ -61,7 +61,7 @@ class BookmarkViewModel(
         makeArchivePublic: Boolean,
         createEbook: Boolean
     ) = viewModelScope.launch {
-        Log.v("Add BookmarkViewModel", "createArchive: ${createArchive} makeArchivePublic: ${makeArchivePublic}")
+        Log.v("Add BookmarkViewModel", "createArchive: $createArchive makeArchivePublic: $makeArchivePublic")
 
         viewModelScope.launch {
             bookmarkAdditionUseCase.invoke(
@@ -79,7 +79,7 @@ class BookmarkViewModel(
                     when (result) {
                         is Result.Error -> {
                             Log.v("Add BookmarkViewModel", result.error?.message ?: "")
-                            _bookmarkUiState.error(errorMessage = result.error?.message ?: "" )
+                            _bookmarkUiState.error(errorMessage = result.error?.message ?: "Unknown error" )
                         }
 
                         is Result.Loading -> {

diff --git a/presentation/src/main/java/com/desarrollodroide/pagekeeper/ui/feed/SearchBar.kt b/presentation/src/main/java/com/desarrollodroide/pagekeeper/ui/feed/SearchBar.kt
@@ -83,6 +83,7 @@ fun DockedSearchBarWithCategories(
     Box(Modifier.fillMaxHeight()) {
         LazyColumn(
             modifier = Modifier
+                .fillMaxHeight()
                 .padding(horizontal = 10.dp)
                 .pullRefresh(state = refreshState)
                 .animateContentSize(),