10
10
import android .util .Patterns ;
11
11
import android .webkit .URLUtil ;
12
12
13
- import androidx .annotation .NonNull ;
14
13
import androidx .annotation .Nullable ;
15
14
16
15
import org .mozilla .vrbrowser .R ;
@@ -76,12 +75,15 @@ public static boolean isDomain(String text) {
76
75
77
76
private static Pattern ipPattern = Pattern .compile ("^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\ .){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])(:[0-9]+)?(/[^ ]*)?" );
78
77
private static Pattern localhostPattern = Pattern .compile ("^(localhost)(:[0-9]+)?(/[^ ]*)?" , Pattern .CASE_INSENSITIVE );
79
- public static boolean isIPUri (@ NonNull String aUri ) {
78
+ public static boolean isIPUri (@ Nullable String aUri ) {
79
+ if (aUri == null ) {
80
+ return false ;
81
+ }
80
82
String uri = stripProtocol (aUri ).trim ();
81
83
return localhostPattern .matcher (uri ).find () || ipPattern .matcher (uri ).find ();
82
84
}
83
85
84
- public static boolean isLocalIP (@ NonNull String aUri ) {
86
+ public static boolean isLocalIP (@ Nullable String aUri ) {
85
87
if (!isIPUri (aUri )) {
86
88
return false ;
87
89
}
@@ -92,24 +94,24 @@ public static boolean isLocalIP(@NonNull String aUri) {
92
94
localhostPattern .matcher (uri ).find ();
93
95
}
94
96
95
- public static boolean isPrivateAboutPage (@ NonNull Context context , @ NonNull String uri ) {
97
+ public static boolean isPrivateAboutPage (@ Nullable Context context , @ Nullable String uri ) {
96
98
InternalPages .PageResources pageResources = InternalPages .PageResources .create (R .raw .private_mode , R .raw .private_style );
97
99
byte [] privatePageBytes = InternalPages .createAboutPage (context , pageResources );
98
- return uri .equals ("data:text/html;base64," + Base64 .encodeToString (privatePageBytes , Base64 .NO_WRAP ));
100
+ return uri != null && uri .equals ("data:text/html;base64," + Base64 .encodeToString (privatePageBytes , Base64 .NO_WRAP ));
99
101
}
100
102
101
- public static Boolean isHomeUri (@ NonNull Context context , @ Nullable String aUri ) {
102
- return aUri != null && aUri .toLowerCase ().startsWith (
103
+ public static Boolean isHomeUri (@ Nullable Context context , @ Nullable String aUri ) {
104
+ return aUri != null && context != null && aUri .toLowerCase ().startsWith (
103
105
SettingsStore .getInstance (context ).getHomepage ()
104
106
);
105
107
}
106
108
107
- public static Boolean isDataUri (@ NonNull String aUri ) {
108
- return aUri .startsWith ("data" );
109
+ public static Boolean isDataUri (@ Nullable String aUri ) {
110
+ return aUri != null && aUri .startsWith ("data" );
109
111
}
110
112
111
- public static Boolean isBlankUri (@ NonNull Context context , @ NonNull String aUri ) {
112
- return aUri .equals (context .getString (R .string .about_blank ));
113
+ public static Boolean isBlankUri (@ Nullable Context context , @ Nullable String aUri ) {
114
+ return aUri != null && context != null && aUri .equals (context .getString (R .string .about_blank ));
113
115
}
114
116
115
117
public static String titleBarUrl (@ Nullable String aUri ) {
@@ -138,31 +140,19 @@ public static String titleBarUrl(@Nullable String aUri) {
138
140
public static final String ABOUT_HISTORY = "about://history" ;
139
141
140
142
public static boolean isHistoryUrl (@ Nullable String url ) {
141
- if (url == null ) {
142
- return false ;
143
- }
144
-
145
- return url .equalsIgnoreCase (ABOUT_HISTORY );
143
+ return url != null && url .equalsIgnoreCase (ABOUT_HISTORY );
146
144
}
147
145
148
146
public static final String ABOUT_BOOKMARKS = "about://bookmarks" ;
149
147
150
148
public static boolean isBookmarksUrl (@ Nullable String url ) {
151
- if (url == null ) {
152
- return false ;
153
- }
154
-
155
- return url .equalsIgnoreCase (ABOUT_BOOKMARKS );
149
+ return url != null && url .equalsIgnoreCase (ABOUT_BOOKMARKS );
156
150
}
157
151
158
152
public static final String ABOUT_PRIVATE = "about://privatebrowsing" ;
159
153
160
154
public static boolean isPrivateUrl (@ Nullable String url ) {
161
- if (url == null ) {
162
- return false ;
163
- }
164
-
165
- return url .equalsIgnoreCase (ABOUT_PRIVATE );
155
+ return url != null && url .equalsIgnoreCase (ABOUT_PRIVATE );
166
156
}
167
157
168
158
public static boolean isAboutPage (@ Nullable String url ) {
0 commit comments