Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/stefan-niedermann/nextcloud-deck.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordesperateCoder <echotodevnull@gmail.com>2019-12-07 02:10:45 +0300
committerdesperateCoder <echotodevnull@gmail.com>2019-12-07 02:10:45 +0300
commit1ba35b1a98dabb148a9f596e1e00428ce1bfc9eb (patch)
tree19900e92bfa2bc4b56469231f85c0d20abf39e67 /app/src/main
parent980d790b05fd1df8e2dd9529aab8989bb8cfe404 (diff)
cleanup testcode
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/api/GsonUTCDateAdapter.java3
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java3
-rw-r--r--app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/ServerAdapter.java4
3 files changed, 1 insertions, 9 deletions
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<Date>, 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<Attachment> 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);
}