diff --git a/app/build.gradle b/app/build.gradle index e1289b41..28124af3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,8 +28,8 @@ android { applicationId "org.pixeldroid.app" minSdkVersion 23 targetSdkVersion 31 - versionCode 8 - versionName "1.0.beta8" + versionCode 9 + versionName "1.0.beta$versionCode" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunnerArguments clearPackageData: 'true' @@ -117,7 +117,7 @@ dependencies { implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0" implementation 'androidx.navigation:navigation-fragment-ktx:2.4.1' implementation 'androidx.navigation:navigation-ui-ktx:2.4.1' - implementation 'androidx.paging:paging-runtime-ktx:3.1.0' + implementation 'androidx.paging:paging-runtime-ktx:3.1.1' implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-savedstate:2.4.1' @@ -133,7 +133,7 @@ dependencies { // Use the most recent version of CameraX - def cameraX_version = '1.1.0-beta01' + def cameraX_version = '1.1.0-beta02' implementation "androidx.camera:camera-core:$cameraX_version" implementation "androidx.camera:camera-camera2:$cameraX_version" // CameraX Lifecycle library @@ -142,7 +142,7 @@ dependencies { // CameraX View class implementation "androidx.camera:camera-view:$cameraX_version" - def room_version = "2.4.1" + def room_version = "2.4.2" implementation "androidx.room:room-runtime:$room_version" kapt "androidx.room:room-compiler:$room_version" implementation "androidx.room:room-ktx:$room_version" diff --git a/app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/notifications/NotificationsRemoteMediator.kt b/app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/notifications/NotificationsRemoteMediator.kt index 609c5a1c..a4799e5c 100644 --- a/app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/notifications/NotificationsRemoteMediator.kt +++ b/app/src/main/java/org/pixeldroid/app/posts/feeds/cachedFeeds/notifications/NotificationsRemoteMediator.kt @@ -23,6 +23,7 @@ import org.pixeldroid.app.utils.di.PixelfedAPIHolder import org.pixeldroid.app.utils.api.objects.Notification import retrofit2.HttpException import java.io.IOException +import java.lang.Exception import java.lang.NullPointerException import javax.inject.Inject @@ -77,6 +78,8 @@ class NotificationsRemoteMediator @Inject constructor( return MediatorResult.Error(exception) } catch (exception: HttpException) { return MediatorResult.Error(exception) + } catch (exception: Exception){ + return MediatorResult.Error(exception) } } } \ No newline at end of file diff --git a/app/src/main/java/org/pixeldroid/app/profile/ProfileActivity.kt b/app/src/main/java/org/pixeldroid/app/profile/ProfileActivity.kt index 6148356f..1ceedf52 100644 --- a/app/src/main/java/org/pixeldroid/app/profile/ProfileActivity.kt +++ b/app/src/main/java/org/pixeldroid/app/profile/ProfileActivity.kt @@ -72,12 +72,12 @@ class ProfileActivity : BaseActivity() { // get the view model @Suppress("UNCHECKED_CAST") viewModel = ViewModelProvider(this, ProfileViewModelFactory( - ProfileContentRepository( - apiHolder.setToCurrentUser(), - accountId - ) + ProfileContentRepository( + apiHolder.setToCurrentUser(), + accountId ) - ).get(FeedViewModel::class.java) as FeedViewModel + ) + )[FeedViewModel::class.java] as FeedViewModel profileAdapter = ProfilePostsAdapter() initAdapter(binding.profileProgressBar, binding.profileRefreshLayout, diff --git a/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt b/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt index baea9c0e..3ad822a1 100644 --- a/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt +++ b/app/src/main/java/org/pixeldroid/app/settings/SettingsActivity.kt @@ -84,9 +84,8 @@ class SettingsActivity : BaseActivity(), SharedPreferences.OnSharedPreferenceCha //Hide Notification setting for Android versions where it doesn't work if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { - preferenceManager.findPreference("notification")?.let { - preferenceScreen.removePreference(it) - } + preferenceManager.findPreference("notification") + ?.let { preferenceScreen.removePreference(it) } } } } diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml index 2ebc9cac..8d529b8c 100644 --- a/app/src/main/res/layout/activity_profile.xml +++ b/app/src/main/res/layout/activity_profile.xml @@ -1,167 +1,180 @@ - - - - - - - - - - - - - - - - - -