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
Revert ArbitraryDataProvider due to a lot of constructor changes 
Signed-off-by: alperozturk <[email protected]>
  • Loading branch information
@alperozturk96 @backportbot
alperozturk96 authored and backportbot[bot] committed Jun 13, 2024
commit a7cbe05c926a73bd9064834d8c23439bc203c9bb
3 changes: 2 additions & 1 deletion app/src/main/java/com/nextcloud/client/account/UserAccountManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.owncloud.android.R;
import com.owncloud.android.authentication.AuthenticatorActivity;
import com.owncloud.android.datamodel.ArbitraryDataProvider;
import com.owncloud.android.datamodel.ArbitraryDataProviderImpl;
import com.owncloud.android.datamodel.OCFile;
import com.owncloud.android.lib.common.OwnCloudAccount;
import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
Expand All @@ -50,7 +51,6 @@ public class UserAccountManagerImpl implements UserAccountManager {

private static final String TAG = UserAccountManagerImpl.class.getSimpleName();
private static final String PREF_SELECT_OC_ACCOUNT = "select_oc_account";
@Inject ArbitraryDataProvider arbitraryDataProvider;

private Context context;
private AccountManager accountManager;
Expand Down Expand Up @@ -136,6 +136,7 @@ public boolean exists(Account account) {
public Account getCurrentAccount() {
Account[] ocAccounts = getAccounts();

ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(context);
SharedPreferences appPreferences = PreferenceManager.getDefaultSharedPreferences(context);
String accountName = appPreferences.getString(PREF_SELECT_OC_ACCOUNT, null);

Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/nextcloud/client/di/AppModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,7 @@ Resources resources(Application application) {
@Provides
UserAccountManager userAccountManager(
Context context,
AccountManager accountManager
) {
AccountManager accountManager) {
return new UserAccountManagerImpl(context, accountManager);
}

Expand Down