Skip to content

[stable-3.29] Bugfix Fix NPE FileDataStorageManager #13113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobiasKaminsky merged 10 commits into from
Jun 14, 2024
Merged

[stable-3.29] Bugfix Fix NPE FileDataStorageManager #13113

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5780ad7
Use DI if getStorageManager is null
alperozturk96 Jun 6, 2024
24ea539
Remove unnecessary FileDataStorageManager initialization in SessionMixin
alperozturk96 Jun 10, 2024
3cd41cd
Remove unnecessary FileDataStorageManager initialization in SessionMixin
alperozturk96 Jun 10, 2024
1744c54
Use non nullable account in session mix
alperozturk96 Jun 10, 2024
35b208a
Use non nullable account in session mix
alperozturk96 Jun 10, 2024
a7cbe05
Revert ArbitraryDataProvider due to a lot of constructor changes
alperozturk96 Jun 10, 2024
1e3344f
Make getDefaultAccount inline
alperozturk96 Jun 11, 2024
a71f24e
Add AnonymousAccount for fresh install
alperozturk96 Jun 11, 2024
e0e981c
Account cannot be null so test is removed
alperozturk96 Jun 12, 2024
859521d
Fix build error
alperozturk96 Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove unnecessary FileDataStorageManager initialization in SessionMixin 
Signed-off-by: alperozturk <[email protected]>
  • Loading branch information
@alperozturk96 @backportbot
alperozturk96 authored and backportbot[bot] committed Jun 13, 2024
commit 3cd41cd70512275706525a90fca46141a57623c6
2 changes: 0 additions & 2 deletions app/src/main/java/com/nextcloud/client/mixins/SessionMixin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ package com.nextcloud.client.mixins

import android.accounts.Account
import android.app.Activity
import android.content.ContentResolver
import android.content.Intent
import android.os.Bundle
import com.nextcloud.client.account.User
Expand All @@ -27,7 +26,6 @@ import java.util.Optional
*/
class SessionMixin(
private val activity: Activity,
private val contentResolver: ContentResolver,
private val accountManager: UserAccountManager
) : ActivityMixin {
var currentAccount: Account? = null
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/java/com/owncloud/android/ui/activity/BaseActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ public UserAccountManager getUserAccountManager() {
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
sessionMixin = new SessionMixin(this,
getContentResolver(),
accountManager);
sessionMixin = new SessionMixin(this, accountManager);
mixinRegistry.add(sessionMixin);

if (enableAccountHandling) {
Expand Down
5 changes: 0 additions & 5 deletions app/src/test/java/com/nextcloud/client/mixins/SessionMixinTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
package com.nextcloud.client.mixins

import android.app.Activity
import android.content.ContentResolver
import com.nextcloud.client.account.UserAccountManager
import junit.framework.Assert.assertNull
import org.junit.Before
Expand All @@ -24,9 +23,6 @@ class SessionMixinTest {
@Mock
private lateinit var activity: Activity

@Mock
private lateinit var contentResolver: ContentResolver

@Mock
private lateinit var userAccountManager: UserAccountManager

Expand All @@ -38,7 +34,6 @@ class SessionMixinTest {
session = spy(
SessionMixin(
activity,
contentResolver,
userAccountManager
)
)
Expand Down