Skip to content

Commit 3d447e4

Browse files
committed
fix(AbstractFlowrDeepLinkHandler): fix issue on Lolipop
1 parent d786856 commit 3d447e4

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

flowr/src/main/java/com/fueled/flowr/internal/AbstractFlowrDeepLinkHandler.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
public class AbstractFlowrDeepLinkHandler<T extends Fragment & FlowrFragment>
2727
implements FlowrDeepLinkHandler {
2828

29-
private static final String NAMED_PARAM_REGEX = "\\(\\?<([a-zA-Z][a-zA-Z0-9]*)>";
29+
private static final String NAMED_PARAM_REGEX = "\\{([a-zA-Z][a-zA-Z0-9]*)\\}";
3030
private static final Pattern NAMED_PARAM_PATTERN = Pattern.compile(NAMED_PARAM_REGEX);
3131

3232
private final Map<String, Class<? extends T>> linkFragmentMap;
@@ -61,13 +61,13 @@ private Bundle bundleUriInfo(Uri uri, String pattern) {
6161
if (m.matches()) {
6262
Bundle data = getNewBundle();
6363
data.putString(Flowr.DEEP_LINK_URL, uri.toString());
64-
Iterator<String> params = getNamedGroupCandidates(regex).iterator();
64+
Iterator<String> params = getNamedGroupCandidates(pattern).iterator();
6565

6666
//start at 1 because 0 is the searched string
6767
int i = 1;
6868
while (params.hasNext()) {
69-
String bip = params.next();
70-
data.putString(bip, m.group(i));
69+
String variableName = params.next();
70+
data.putString(variableName, m.group(i));
7171
i++;
7272
}
7373

@@ -78,7 +78,7 @@ private Bundle bundleUriInfo(Uri uri, String pattern) {
7878
}
7979

8080
private String getRegexPattern(String pattern) {
81-
return pattern.replaceAll("\\{(.+?)\\}", "(?<$1>\\.+?)");
81+
return pattern.replaceAll("\\{(.+?)\\}", "(\\.+?)");
8282
}
8383

8484
private List<String> getNamedGroupCandidates(String regex) {
@@ -87,8 +87,8 @@ private List<String> getNamedGroupCandidates(String regex) {
8787
Matcher m = NAMED_PARAM_PATTERN.matcher(regex);
8888

8989
while (m.find()) {
90-
String test = m.group(1);
91-
namedGroups.add(test);
90+
String variableName = m.group(1);
91+
namedGroups.add(variableName);
9292
}
9393

9494
return namedGroups;

0 commit comments

Comments
 (0)