Skip to content

Add Javascript bookmarklets support + viewing local files #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ShadowKyogre wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add Javascript bookmarklets support + viewing local files #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
<uses-permission android:name="org.tint.permissions.services.ADDONS" />

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>

Expand All @@ -69,6 +70,12 @@
<data android:scheme="http" />
<data android:scheme="https" />
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:mimeType="text/html" />
</intent-filter>
</activity>

<activity android:name=".ui.preferences.PreferencesActivity" android:label="@string/PreferencesActivityTitle"></activity>
Expand Down
7 changes: 6 additions & 1 deletion src/org/tint/utils/UrlUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@ public class UrlUtils {
*/
public static boolean isUrl(String url) {
return
url.contains(".") ||
(url.contains(".") && !url.contains(" ")) || /* actually check if it begins with the proper protocol */
url.startsWith("http://") ||
url.startsWith("https://") ||
url.startsWith("file://") ||
url.startsWith("javascript:") ||
url.equals(Constants.URL_ABOUT_BLANK) ||
url.equals(Constants.URL_ABOUT_START) ||
url.equals(Constants.URL_ABOUT_TUTORIAL);
Expand Down Expand Up @@ -76,6 +80,7 @@ public static String checkUrl(String url) {
if ((!url.startsWith("http://")) &&
(!url.startsWith("https://")) &&
(!url.startsWith("file://")) &&
(!url.startsWith("javascript:")) && //add bookmarklet support
(!url.startsWith(Constants.URL_ABOUT_BLANK)) &&
(!url.startsWith(Constants.URL_ABOUT_START)) &&
(!url.startsWith(Constants.URL_ABOUT_TUTORIAL))) {
Expand Down