mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-01 03:43:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3153 from nextcloud/fixNotificationCrash

Browse source 
Notification: move client creation to thread
This commit is contained in:
Andy Scherzinger 2018-10-24 10:12:59 +02:00 committed by GitHub
commit c01061b9df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java
View file

@ -233,20 +233,6 @@ public class NotificationsActivity extends FileActivity {
PorterDuff.Mode.SRC_IN);
setLoadingMessage();
try {
OwnCloudAccount ocAccount = new OwnCloudAccount(currentAccount, this);
client = OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(ocAccount, this);
client.setOwnCloudVersion(AccountUtils.getServerVersion(currentAccount));
hideRefreshLayoutLoader();
} catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException |
IOException | OperationCanceledException | AuthenticatorException e) {
Log_OC.e(TAG, "Error initializing client", e);
}
adapter = new NotificationListAdapter(client, this);
recyclerView.setAdapter(adapter);
LinearLayoutManager layoutManager = new LinearLayoutManager(this);
recyclerView.setLayoutManager(layoutManager);
@ -267,6 +253,22 @@ public class NotificationsActivity extends FileActivity {
private void fetchAndSetData() {
Thread t = new Thread(() -> {
if (client == null) {
try {
OwnCloudAccount ocAccount = new OwnCloudAccount(currentAccount, this);
client = OwnCloudClientManagerFactory.getDefaultSingleton().getClientFor(ocAccount, this);
client.setOwnCloudVersion(AccountUtils.getServerVersion(currentAccount));
} catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException |
IOException | OperationCanceledException | AuthenticatorException e) {
Log_OC.e(TAG, "Error initializing client", e);
}
}
if (adapter == null) {
adapter = new NotificationListAdapter(client, this);
recyclerView.setAdapter(adapter);
}
RemoteOperation getRemoteNotificationOperation = new GetRemoteNotificationsOperation();
final RemoteOperationResult result = getRemoteNotificationOperation.execute(client);