Fix notifications

src/main/java/com/owncloud/android/operations/GetServerInfoOperation.java

@@ -21,7 +21,7 @@
 
 package com.owncloud.android.operations;
 
-import java.util.ArrayList;
+import android.content.Context;
 
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.lib.common.OwnCloudClient;
@@ -33,7 +33,7 @@ import com.owncloud.android.lib.resources.status.GetRemoteStatusOperation;
 import com.owncloud.android.lib.resources.status.OwnCloudVersion;
 import com.owncloud.android.operations.DetectAuthenticationMethodOperation.AuthenticationMethod;
 
-import android.content.Context;
+import java.util.ArrayList;
 
 /**
  * Get basic information from an ownCloud server given its URL.
@@ -78,6 +78,7 @@ public class GetServerInfoOperation extends RemoteOperation {
 	    
 	    // first: check the status of the server (including its version)
 	    GetRemoteStatusOperation getStatus = new GetRemoteStatusOperation(mContext);
+
 	    RemoteOperationResult result = getStatus.execute(client);
 	    
         if (result.isSuccess()) {

src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.java

@@ -118,10 +118,10 @@ public class NotificationsActivity extends FileActivity {
             public void run() {
                 Account account = AccountUtils.getCurrentOwnCloudAccount(NotificationsActivity.this);
                 RemoteOperation getRemoteNotificationOperation = new GetRemoteNotificationsOperation();
-                RemoteOperationResult result =
+                final RemoteOperationResult result =
                         getRemoteNotificationOperation.execute(account, NotificationsActivity.this);
 
-                if (result.isSuccess() && result.getData() != null) {
+                if (result.isSuccess() && result.getNotificationData() != null) {
                     final List<Notification> notifications = result.getNotificationData();
 
                     runOnUiThread(new Runnable() {
@@ -134,9 +134,14 @@ public class NotificationsActivity extends FileActivity {
                         }
                     });
                 } else {
-                    // show error
-                    setEmptyContent(noResultsHeadline, result.getLogMessage());
                     Log_OC.d(TAG, result.getLogMessage());
+                    // show error
+                    runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            setEmptyContent(noResultsHeadline, result.getLogMessage());
+                        }
+                    });
                 }
             }
         });