Merge pull request ONLYOFFICE#22 from ONLYOFFICE/develop

Release/v1.1.2

Author: LinneyS

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 1.1.2
+## Changed
+- fixed load properties in ConfigurationUtils
+- improving DefaultConfigService
+
 ## 1.1.1
 ## Changed
 - default conversion format (from docxf to pdf instead oform)

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.onlyoffice</groupId>
     <artifactId>docs-integration-sdk</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <packaging>jar</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>

src/main/java/com/onlyoffice/service/documenteditor/config/DefaultConfigService.java

@@ -133,7 +133,14 @@ public EditorConfig getEditorConfig(final String fileId, final Mode mode, final
                 .plugins(getPlugins(null))
                 .build();
 
-        if (permissions != null && permissions.getEdit() && mode.equals(Mode.EDIT)) {
+        if (permissions != null
+                && (
+                        Boolean.TRUE.equals(permissions.getEdit())
+                                || Boolean.TRUE.equals(permissions.getFillForms())
+                                || Boolean.TRUE.equals(permissions.getComment())
+                                || Boolean.TRUE.equals(permissions.getReview())
+                )
+                && mode.equals(Mode.EDIT)) {
             editorConfig.setCallbackUrl(urlManager.getCallbackUrl(fileId));
         }
 

src/main/java/com/onlyoffice/utils/ConfigurationUtils.java

@@ -95,7 +95,8 @@ public static Integer getDemoTrialPeriod() {
     private static void init() {
         Properties properties = new Properties();
         try {
-            InputStream stream = Thread.currentThread().getContextClassLoader()
+            InputStream stream = ConfigurationUtils.class
+                    .getClassLoader()
                     .getResourceAsStream(PROPERTIES_PREFIX + ".properties");
             properties.load(stream);
         } catch (Exception e) {