Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 34aa8e8e authored by Andy Scherzinger's avatar Andy Scherzinger Committed by GitHub
Browse files

Merge pull request #1289 from nextcloud/fix/Check-Nullability-OCSRemoteOperation

Check Nullability of OCS Remote Operation
parents 40c50e8f 32370726
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -33,8 +33,9 @@ class DashboardGetWidgetItemsRemoteOperation(val id: String, private val limitSi
                        get,
                        object :
                            TypeToken<ServerResponse<HashMap<String, List<DashboardWidgetItem>>>>() {}
                    ).ocs.data
                    )?.ocs?.data

                if (list != null) {
                    result =
                        RemoteOperationResult<HashMap<String, List<DashboardWidgetItem>>>(true, get)
                    result.resultData = list
@@ -42,6 +43,10 @@ class DashboardGetWidgetItemsRemoteOperation(val id: String, private val limitSi
                    result =
                        RemoteOperationResult<HashMap<String, List<DashboardWidgetItem>>>(false, get)
                }
            } else {
                result =
                    RemoteOperationResult<HashMap<String, List<DashboardWidgetItem>>>(false, get)
            }
        } catch (e: IOException) {
            result = RemoteOperationResult<HashMap<String, List<DashboardWidgetItem>>>(e)
        }
+7 −3
Original line number Diff line number Diff line
@@ -30,13 +30,17 @@ class DashboardListWidgetsRemoteOperation : OCSRemoteOperation<Map<String, Dashb
                    getServerResponse(
                        get,
                        object : TypeToken<ServerResponse<HashMap<String, DashboardWidget>>>() {}
                    ).ocs.data
                    )?.ocs?.data

                if (list != null) {
                    result = RemoteOperationResult<Map<String, DashboardWidget>>(true, get)
                    result.resultData = list
                } else {
                    result = RemoteOperationResult<Map<String, DashboardWidget>>(false, get)
                }
            } else {
                result = RemoteOperationResult<Map<String, DashboardWidget>>(false, get)
            }
        } catch (e: IOException) {
            result = RemoteOperationResult<Map<String, DashboardWidget>>(e)
        }
+9 −6
Original line number Diff line number Diff line
@@ -49,13 +49,15 @@ public class DirectEditingObtainListOfTemplatesRemoteOperation extends OCSRemote
            int status = client.executeMethod(getMethod, SYNC_READ_TIMEOUT, SYNC_CONNECTION_TIMEOUT);

            if (status == HttpStatus.SC_OK) {
                TemplateList templateList = getServerResponse(getMethod,
                                                              new TypeToken<ServerResponse<TemplateList>>() {
                                                              })
                        .getOcs().getData();
                ServerResponse<TemplateList> serverResponse = getServerResponse(getMethod, new TypeToken<>() {});

                if (serverResponse != null) {
                    TemplateList templateList = serverResponse.getOcs().getData();
                    result = new RemoteOperationResult<>(true, getMethod);
                    result.setResultData(templateList);
                } else {
                    result = new RemoteOperationResult<>(false, getMethod);
                }
            } else {
                result = new RemoteOperationResult<>(false, getMethod);
                client.exhaustResponse(getMethod.getResponseBodyAsStream());
@@ -69,6 +71,7 @@ public class DirectEditingObtainListOfTemplatesRemoteOperation extends OCSRemote
                getMethod.releaseConnection();
            }
        }

        return result;
    }
}
+12 −6
Original line number Diff line number Diff line
@@ -41,13 +41,18 @@ public class DirectEditingObtainRemoteOperation extends OCSRemoteOperation<Direc
            int status = client.executeMethod(getMethod, SYNC_READ_TIMEOUT, SYNC_CONNECTION_TIMEOUT);

            if (status == HttpStatus.SC_OK) {
                DirectEditing directEditing = getServerResponse(getMethod,
                        new TypeToken<ServerResponse<DirectEditing>>() {
                        })
                        .getOcs().getData();
                ServerResponse<DirectEditing> serverResponse = getServerResponse(getMethod,
                        new TypeToken<>() {
                        });

                if (serverResponse != null) {
                    DirectEditing directEditing = serverResponse.getOcs().getData();
                    result = new RemoteOperationResult<>(true, getMethod);
                    result.setResultData(directEditing);
                } else {
                    result = new RemoteOperationResult<>(false, getMethod);
                }

            } else {
                result = new RemoteOperationResult<>(false, getMethod);
                client.exhaustResponse(getMethod.getResponseBodyAsStream());
@@ -61,6 +66,7 @@ public class DirectEditingObtainRemoteOperation extends OCSRemoteOperation<Direc
                getMethod.releaseConnection();
            }
        }

        return result;
    }
}
+8 −4
Original line number Diff line number Diff line
@@ -37,13 +37,17 @@ class GetGroupfoldersRemoteOperation :
                    getServerResponse(
                        getMethod,
                        object : TypeToken<ServerResponse<Map<String, Groupfolder>>>() {}
                    )
                        .ocs.data
                    )?.ocs?.data

                if (map != null) {
                    result = RemoteOperationResult(true, getMethod)
                    result.setResultData(map)
                } else {
                    result = RemoteOperationResult(false, getMethod)
                }
            } else {
                result = RemoteOperationResult(false, getMethod)
            }
        } catch (e: Exception) {
            result = RemoteOperationResult(e)
            Log_OC.e(
Loading