mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 21:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

account possible can be null

Browse source
This commit is contained in:
tobiasKaminsky 2018-01-03 08:38:54 +01:00
parent d5f0aa7db1
commit c3a0a38db1
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
2 changed files with 36 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
/**
/*
* Nextcloud Android client application
*
* @author Andy Scherzinger
@ -127,21 +127,15 @@ public class NotificationsActivity extends FileActivity {
setupDrawer(R.id.nav_notifications);
ThemeUtils.setColoredTitle(getSupportActionBar(), getString(R.string.drawer_item_notifications));
swipeListRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
setLoadingMessage();
fetchAndSetData();
}
swipeListRefreshLayout.setOnRefreshListener(() -> {
setLoadingMessage();
fetchAndSetData();
});
swipeEmptyListRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
@Override
public void onRefresh() {
setLoadingMessage();
fetchAndSetData();
swipeEmptyListRefreshLayout.setOnRefreshListener(() -> {
setLoadingMessage();
fetchAndSetData();
}
});
setupPushWarning();
@ -256,11 +250,10 @@ public class NotificationsActivity extends FileActivity {
final Account currentAccount = AccountUtils.getCurrentOwnCloudAccount(MainApp.getAppContext());
final Context context = MainApp.getAppContext();
Thread t = new Thread(new Runnable() {
public void run() {
OwnCloudAccount ocAccount;
try {
ocAccount = new OwnCloudAccount(currentAccount, context);
Thread t = new Thread(() -> {
try {
if (currentAccount != null) {
OwnCloudAccount ocAccount = new OwnCloudAccount(currentAccount, context);
OwnCloudClient mClient = OwnCloudClientManagerFactory.getDefaultSingleton().
getClientFor(ocAccount, MainApp.getAppContext());
mClient.setOwnCloudVersion(AccountUtils.getServerVersion(currentAccount));
@ -271,41 +264,36 @@ public class NotificationsActivity extends FileActivity {
if (result.isSuccess() && result.getNotificationData() != null) {
final List<Notification> notifications = result.getNotificationData();
runOnUiThread(new Runnable() {
@Override
public void run() {
populateList(notifications);
if (notifications.size() > 0) {
swipeEmptyListRefreshLayout.setVisibility(View.GONE);
swipeListRefreshLayout.setVisibility(View.VISIBLE);
} else {
setEmptyContent(noResultsHeadline, noResultsMessage);
swipeListRefreshLayout.setVisibility(View.GONE);
swipeEmptyListRefreshLayout.setVisibility(View.VISIBLE);
}
runOnUiThread(() -> {
populateList(notifications);
if (notifications.size() > 0) {
swipeEmptyListRefreshLayout.setVisibility(View.GONE);
swipeListRefreshLayout.setVisibility(View.VISIBLE);
} else {
setEmptyContent(noResultsHeadline, noResultsMessage);
swipeListRefreshLayout.setVisibility(View.GONE);
swipeEmptyListRefreshLayout.setVisibility(View.VISIBLE);
}
});
} else {
Log_OC.d(TAG, result.getLogMessage());
// show error
runOnUiThread(new Runnable() {
@Override
public void run() {
setEmptyContent(noResultsHeadline, result.getLogMessage());
}
});
runOnUiThread(() -> setEmptyContent(noResultsHeadline, result.getLogMessage()));
}
hideRefreshLayoutLoader();
} catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException e) {
Log_OC.e(TAG, "Account not found", e);
} catch (IOException e) {
Log_OC.e(TAG, "IO error", e);
} catch (OperationCanceledException e) {
Log_OC.e(TAG, "Operation has been canceled", e);
} catch (AuthenticatorException e) {
Log_OC.e(TAG, "Authentication Exception", e);
} else {
// show error
runOnUiThread(() -> setEmptyContent(noResultsHeadline, getString(R.string.account_not_found)));
}
} catch (com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException e) {
Log_OC.e(TAG, "Account not found", e);
} catch (IOException e) {
Log_OC.e(TAG, "IO error", e);
} catch (OperationCanceledException e) {
Log_OC.e(TAG, "Operation has been canceled", e);
} catch (AuthenticatorException e) {
Log_OC.e(TAG, "Authentication Exception", e);
}
});
@ -314,12 +302,9 @@ public class NotificationsActivity extends FileActivity {
}
private void hideRefreshLayoutLoader() {
runOnUiThread(new Runnable() {
@Override
public void run() {
swipeListRefreshLayout.setRefreshing(false);
swipeEmptyListRefreshLayout.setRefreshing(false);
}
runOnUiThread(() -> {
swipeListRefreshLayout.setRefreshing(false);
swipeEmptyListRefreshLayout.setRefreshing(false);
});
}

1
src/main/res/values/strings.xml
View file

@ -727,4 +727,5 @@
<string name="send">Send</string>
<string name="share">Share</string>
<string name="link">Link</string>
<string name="account_not_found">Account not found!</string>
</resources>