From 1ba35b1a98dabb148a9f596e1e00428ce1bfc9eb Mon Sep 17 00:00:00 2001 From: desperateCoder Date: Sat, 7 Dec 2019 00:10:45 +0100 Subject: cleanup testcode --- .../java/it/niedermann/nextcloud/deck/api/GsonUTCDateAdapter.java | 3 --- .../java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java | 3 --- .../nextcloud/deck/persistence/sync/adapters/ServerAdapter.java | 4 +--- 3 files changed, 1 insertion(+), 9 deletions(-) (limited to 'app/src/main') diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonUTCDateAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonUTCDateAdapter.java index 40f6c8f8d..f6baa7864 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonUTCDateAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/GsonUTCDateAdapter.java @@ -30,9 +30,6 @@ public class GsonUTCDateAdapter implements JsonSerializer, JsonDeserialize } @Override public synchronized JsonElement serialize(Date date, Type type, JsonSerializationContext jsonSerializationContext) { - if (dateFormat.format(date).contains("31")){ - DeckLog.log("date-handling: (serialize) Input: \""+date+"\" | output: "+dateFormat.format(date)); - } return new JsonPrimitive(dateFormat.format(date)); } diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java index 2090007f0..d95e9bfc8 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java @@ -367,9 +367,6 @@ public class JsonToEntityParser { return null; } else { try { - if (jsonElement.getAsString().contains("31")){ - DeckLog.log("date-handling: (deserialize) Input: \""+jsonElement.getAsString()+"\" | output: "+formatter.parse(jsonElement.getAsString())); - } return formatter.parse(jsonElement.getAsString()); } catch (ParseException e) { return null; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java index 148f333c9..150662988 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java @@ -1,7 +1,6 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters; import android.app.Activity; -import android.content.ContentResolver; import android.content.Context; import android.content.SharedPreferences; import android.net.ConnectivityManager; @@ -10,7 +9,6 @@ import android.net.NetworkCapabilities; import android.net.NetworkInfo; import android.net.Uri; import android.preference.PreferenceManager; -import android.webkit.MimeTypeMap; import androidx.annotation.Nullable; @@ -274,7 +272,7 @@ public class ServerAdapter { public void uploadAttachment(Long remoteBoardId, long remoteStackId, long remoteCardId, String contentType, Uri attachmentUri, IResponseCallback responseCallback) { ensureInternetConnection(); File attachment = new File(attachmentUri.getPath()); - MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", attachment.getName(), RequestBody.create(MediaType.parse("image/*"), attachment)); + MultipartBody.Part filePart = MultipartBody.Part.createFormData("file", attachment.getName(), RequestBody.create(MediaType.parse(contentType), attachment)); MultipartBody.Part typePart = MultipartBody.Part.createFormData("type", attachment.getName(), RequestBody.create(MediaType.parse("text/plain"), "deck_file")); RequestHelper.request(sourceActivity, provider, () -> provider.getDeckAPI().uploadAttachment(remoteBoardId, remoteStackId, remoteCardId, typePart, filePart), responseCallback); } -- cgit v1.2.3