From a87ec4ffa53a2e3db7753d711a57cb8082801893 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 15 Sep 2020 16:07:05 +0200 Subject: [PATCH] Some fixes --- .../java/app/fedilab/fedilabtube/LoginActivity.java | 6 +++--- .../fedilabtube/PeertubeEditUploadActivity.java | 9 ++++----- .../app/fedilab/fedilabtube/client/PeertubeAPI.java | 12 ++++++++++-- .../fedilab/fedilabtube/client/entities/Status.java | 1 - .../java/app/fedilab/fedilabtube/helper/Helper.java | 4 ++-- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/app/fedilab/fedilabtube/LoginActivity.java b/app/src/main/java/app/fedilab/fedilabtube/LoginActivity.java index b1575e1..f9ea8c9 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/LoginActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/LoginActivity.java @@ -83,7 +83,7 @@ public class LoginActivity extends AppCompatActivity { SpannableString content_create = new SpannableString(getString(R.string.join_peertube)); content_create.setSpan(new UnderlineSpan(), 0, content_create.length(), 0); - content_create.setSpan(new ForegroundColorSpan(ContextCompat.getColor(LoginActivity.this, Helper.getColorAccent())), 0, content_create.length(), + content_create.setSpan(new ForegroundColorSpan(ContextCompat.getColor(LoginActivity.this, Helper.getColorAccent())), 0, content_create.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE); create_an_account_peertube.setText(content_create); @@ -155,11 +155,11 @@ public class LoginActivity extends AppCompatActivity { Toasty.error(LoginActivity.this, getString(R.string.not_valide_instance)).show(); return; } - instance = host = login_instance.getText().toString(); + instance = host = login_instance.getText().toString().trim().toLowerCase(); } - if (Arrays.asList(Helper.openid).contains(host) || !BuildConfig.full_instances) { + if (Arrays.asList(Helper.openid).contains(host) && !BuildConfig.full_instances) { new Thread(() -> { try { actionToken = "/api/v1/oauth-clients/local"; diff --git a/app/src/main/java/app/fedilab/fedilabtube/PeertubeEditUploadActivity.java b/app/src/main/java/app/fedilab/fedilabtube/PeertubeEditUploadActivity.java index e739ce1..e135638 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/PeertubeEditUploadActivity.java +++ b/app/src/main/java/app/fedilab/fedilabtube/PeertubeEditUploadActivity.java @@ -319,9 +319,8 @@ public class PeertubeEditUploadActivity extends AppCompatActivity { Map.Entry entryInt = privacyToSend.entrySet().iterator().next(); privacy = entryInt.getValue(); } - String category = null; - if (categoryToSend != null) { + if (categoryToSend != null && categoryToSend.entrySet().iterator().hasNext()) { Map.Entry entryInt = categoryToSend.entrySet().iterator().next(); category = entryInt.getValue(); } @@ -358,7 +357,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity { Iterator> it = privacies.entrySet().iterator(); while (it.hasNext()) { Map.Entry pair = it.next(); - if (pair.getValue().equals(privacy)) + if (pair.getValue().compareTo(privacy) == 0) break; it.remove(); privacyPosition++; @@ -369,7 +368,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity { Iterator> it = licences.entrySet().iterator(); while (it.hasNext()) { Map.Entry pair = it.next(); - if (pair.getValue().equals(license)) + if (pair.getValue().compareTo(license) == 0) break; it.remove(); licensePosition++; @@ -380,7 +379,7 @@ public class PeertubeEditUploadActivity extends AppCompatActivity { Iterator> it = categories.entrySet().iterator(); while (it.hasNext()) { Map.Entry pair = it.next(); - if (pair.getValue().equals(category)) + if (pair.getValue().compareTo(category) == 0) break; it.remove(); categoryPosition++; diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/PeertubeAPI.java b/app/src/main/java/app/fedilab/fedilabtube/client/PeertubeAPI.java index 0d009f3..9631719 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/client/PeertubeAPI.java +++ b/app/src/main/java/app/fedilab/fedilabtube/client/PeertubeAPI.java @@ -377,8 +377,16 @@ public class PeertubeAPI { LinkedHashMap category = new LinkedHashMap<>(); LinkedHashMap license = new LinkedHashMap<>(); LinkedHashMap privacy = new LinkedHashMap<>(); - category.put(resobj.getJSONObject("category").getInt("id"), resobj.getJSONObject("category").getString("label")); - license.put(resobj.getJSONObject("licence").getInt("id"), resobj.getJSONObject("licence").getString("label")); + if (!resobj.getJSONObject("category").isNull("id")) { + license.put(resobj.getJSONObject("category").getInt("id"), resobj.getJSONObject("category").getString("label")); + } else { + license.put(1, resobj.getJSONObject("category").getString("label")); + } + if (!resobj.getJSONObject("licence").isNull("id")) { + license.put(resobj.getJSONObject("licence").getInt("id"), resobj.getJSONObject("licence").getString("label")); + } else { + license.put(1, resobj.getJSONObject("licence").getString("label")); + } privacy.put(resobj.getJSONObject("privacy").getInt("id"), resobj.getJSONObject("privacy").getString("label")); langue.put(resobj.getJSONObject("language").getString("id"), resobj.getJSONObject("language").get("label").toString()); diff --git a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Status.java b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Status.java index 8f92af3..d5ef2dd 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/client/entities/Status.java +++ b/app/src/main/java/app/fedilab/fedilabtube/client/entities/Status.java @@ -48,7 +48,6 @@ import java.util.Objects; import java.util.regex.Matcher; import java.util.regex.Pattern; -import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.helper.CustomQuoteSpan; import app.fedilab.fedilabtube.helper.Helper; import app.fedilab.fedilabtube.viewmodel.FeedsVM; diff --git a/app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java b/app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java index 6f8c5e0..9922918 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java +++ b/app/src/main/java/app/fedilab/fedilabtube/helper/Helper.java @@ -692,10 +692,10 @@ public class Helper { } public static int getColorAccent() { - return BuildConfig.full_instances?R.color.colorAccent_full:R.color.colorAccent; + return BuildConfig.full_instances ? R.color.colorAccent_full : R.color.colorAccent; } public static int getColorPrimary() { - return BuildConfig.full_instances?R.color.colorPrimary_full:R.color.colorPrimary; + return BuildConfig.full_instances ? R.color.colorPrimary_full : R.color.colorPrimary; } }