lacerta-dev/Lacerta
1
0
Fork 0
mirror of https://github.com/lacerta-doc/Lacerta.git synced 2024-11-23 00:13:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
ろむねこ 2024-01-22 19:28:42 +09:00
parent bc304f8535
commit fe4999384a
No known key found for this signature in database
GPG Key ID: FA1F39A1BA37D168
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
feature/library/src/main/java/one/nem/lacerta/feature/library/LibraryPageFragment.java
View File

@ -115,7 +115,8 @@ public class LibraryPageFragment extends Fragment {
Toast.makeText(getContext(), "Folder selected! folderId: " + folderId + ", folderName: " + folderName, Toast.LENGTH_SHORT).show(); Toast.makeText(getContext(), "Folder selected! folderId: " + folderId + ", folderName: " + folderName, Toast.LENGTH_SHORT).show();
FragmentNavigation fragmentNavigation = (FragmentNavigation) getActivity(); FragmentNavigation fragmentNavigation = (FragmentNavigation) getActivity();
assert fragmentNavigation != null; assert fragmentNavigation != null;
fragmentNavigation.navigateToFragment(LibraryPageFragment.newInstance(folderId, folderName, new PublicPath().parse(publicPath).resolve(folderName).getStringPath())); logger.debug("LibraryTopFragment", "publicPath: " + publicPath);
fragmentNavigation.navigateToFragment(LibraryPageFragment.newInstance(folderId, folderName, publicPath == null ? new PublicPath().parse("/").resolve(folderName).getStringPath() : new PublicPath().parse(publicPath).resolve(folderName).getStringPath()));
} }
@Override @Override

19
model/src/main/java/one/nem/lacerta/model/PublicPath.java
View File

@ -39,14 +39,19 @@ public class PublicPath {
} }
public PublicPath parse(String path) { public PublicPath parse(String path) {
if (path.startsWith("/")) { if (path == null) {
this.path.clear(); this.path.clear();
path = path.substring(1); this.path.add("/");
} } else {
String[] pathArray = path.split("/"); if (path.startsWith("/")) {
for (String p : pathArray) { this.path.clear();
Log.d("PublicPath", "parse: " + p); path = path.substring(1);
resolveInternal(p); }
String[] pathArray = path.split("/");
for (String p : pathArray) {
Log.d("PublicPath", "parse: " + p);
resolveInternal(p);
}
} }
return this; return this;
} }