Bläddra i källkod

Merge pull request #10650 from nextcloud/dependabot/gradle/org.mnode.ical4j-ical4j-3.2.5

Bump ical4j from 1.0.8 to 3.2.5
Tobias Kaminsky 2 år sedan
förälder
incheckning
2980f1fe7d

+ 1 - 1
app/build.gradle

@@ -288,7 +288,7 @@ dependencies {
     implementation "io.noties:prism4j:$prismVersion"
     kapt "io.noties:prism4j-bundler:$prismVersion"
 
-    implementation ('org.mnode.ical4j:ical4j:1.0.8') {
+    implementation ('org.mnode.ical4j:ical4j:3.0.0') {
         ['org.apache.commons','commons-logging'].each {
             exclude group: "$it"
         }

+ 2 - 2
app/src/main/java/third_parties/sufficientlysecure/SaveCalendar.java

@@ -42,7 +42,6 @@ import android.view.WindowManager;
 import android.widget.EditText;
 
 import com.nextcloud.client.account.User;
-import com.nextcloud.client.di.Injectable;
 import com.nextcloud.client.files.downloader.PostUploadAction;
 import com.nextcloud.client.files.downloader.Request;
 import com.nextcloud.client.files.downloader.TransferManagerConnection;
@@ -62,6 +61,7 @@ import net.fortuna.ical4j.model.Dur;
 import net.fortuna.ical4j.model.Period;
 import net.fortuna.ical4j.model.Property;
 import net.fortuna.ical4j.model.PropertyFactoryImpl;
+import net.fortuna.ical4j.model.PropertyFactoryRegistry;
 import net.fortuna.ical4j.model.PropertyList;
 import net.fortuna.ical4j.model.TimeZone;
 import net.fortuna.ical4j.model.TimeZoneRegistry;
@@ -104,7 +104,7 @@ import java.util.UUID;
 public class SaveCalendar {
     private static final String TAG = "ICS_SaveCalendar";
 
-    private final PropertyFactoryImpl mPropertyFactory = PropertyFactoryImpl.getInstance();
+    private final PropertyFactoryImpl mPropertyFactory = new PropertyFactoryRegistry();
     private TimeZoneRegistry mTzRegistry;
     private final Set<TimeZone> mInsertedTimeZones = new HashSet<>();
     private final Set<String> mFailedOrganisers = new HashSet<>();

+ 2 - 0
app/src/main/resources/ical4j.properties

@@ -0,0 +1,2 @@
+# suppress inspection "UnusedProperty"
+net.fortuna.ical4j.timezone.cache.impl=net.fortuna.ical4j.util.MapTimeZoneCache