From fa259112c206c4783a75d4b4dacc3f3f88dcf7f8 Mon Sep 17 00:00:00 2001 From: qwerty287 Date: Wed, 23 Nov 2022 11:34:57 +0000 Subject: [PATCH] Fix missing subpath for assets (#1219) Closes #1218 Co-authored-by: qwerty287 Reviewed-on: https://codeberg.org/gitnex/GitNex/pulls/1219 Reviewed-by: M M Arif Co-authored-by: qwerty287 Co-committed-by: qwerty287 --- .../mian/gitnex/adapters/UserAccountsAdapter.java | 3 ++- .../gitnex/adapters/UserAccountsNavAdapter.java | 6 ++---- .../java/org/mian/gitnex/helpers/UrlHelper.java | 13 +++++++++++++ app/src/main/res/values/strings.xml | 2 +- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java index 6afe4475..110c1396 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsAdapter.java @@ -29,6 +29,7 @@ import org.mian.gitnex.helpers.AppUtil; import org.mian.gitnex.helpers.RoundedTransformation; import org.mian.gitnex.helpers.TinyDB; import org.mian.gitnex.helpers.Toasty; +import org.mian.gitnex.helpers.UrlHelper; import retrofit2.Call; import retrofit2.Callback; @@ -130,7 +131,7 @@ public class UserAccountsAdapter PicassoService.getInstance(context) .get() - .load(url + "assets/img/favicon.png") + .load(UrlHelper.appendPath(currentItem.getInstanceUrl(), "assets/img/favicon.png")) .placeholder(R.drawable.loader_animated) .transform(new RoundedTransformation(imgRadius, 0)) .resize(120, 120) diff --git a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsNavAdapter.java b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsNavAdapter.java index 1e99cc7a..9d27c85d 100644 --- a/app/src/main/java/org/mian/gitnex/adapters/UserAccountsNavAdapter.java +++ b/app/src/main/java/org/mian/gitnex/adapters/UserAccountsNavAdapter.java @@ -15,7 +15,6 @@ import androidx.annotation.NonNull; import androidx.drawerlayout.widget.DrawerLayout; import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; -import io.mikael.urlbuilder.UrlBuilder; import java.util.List; import org.mian.gitnex.R; import org.mian.gitnex.activities.AddNewAccountActivity; @@ -23,6 +22,7 @@ import org.mian.gitnex.clients.PicassoService; import org.mian.gitnex.database.models.UserAccount; import org.mian.gitnex.helpers.AppUtil; import org.mian.gitnex.helpers.RoundedTransformation; +import org.mian.gitnex.helpers.UrlHelper; /** * @author M M Arif @@ -59,13 +59,11 @@ public class UserAccountsNavAdapter UserAccount currentItem = userAccountsList.get(position); - String url = UrlBuilder.fromString(currentItem.getInstanceUrl()).withPath("/").toString(); - int imageSize = AppUtil.getPixelsFromDensity(context, 36); PicassoService.getInstance(context) .get() - .load(url + "assets/img/favicon.png") + .load(UrlHelper.appendPath(currentItem.getInstanceUrl(), "assets/img/favicon.png")) .placeholder(R.drawable.loader_animated) .transform(new RoundedTransformation(18, 0)) .resize(imageSize, imageSize) diff --git a/app/src/main/java/org/mian/gitnex/helpers/UrlHelper.java b/app/src/main/java/org/mian/gitnex/helpers/UrlHelper.java index 926b6c25..bfe73391 100644 --- a/app/src/main/java/org/mian/gitnex/helpers/UrlHelper.java +++ b/app/src/main/java/org/mian/gitnex/helpers/UrlHelper.java @@ -38,4 +38,17 @@ public class UrlHelper { return !url.matches("^(http|https)://.+$") ? scheme + "://" + url : url; } + + public static String appendPath(String url, String path) { + if (url.endsWith("/")) { + // remove it + url = url.substring(0, url.length() - 1); + } + if (!path.startsWith("/")) { + // add it + path = "/" + path; + } + + return url + path; + } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a1f2b1b5..6b41a8d3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -771,7 +771,7 @@ Adopt Adopted repository %s Unadopted Repositories - - Adopt will add repository %s to organization/user %s.\n- Delete will remove it from the system. + - Adopt will add repository %1$s to organization/user %2$s.\n- Delete will remove it from the system. Commits