Skip to content

Commit

Permalink
1. FIX: Shortcuts were not packed with the appropriate URL
Browse files Browse the repository at this point in the history
2. Do not abort build on lint errors (required for Travis-CI)
  • Loading branch information
sazid committed Oct 2, 2016
1 parent 3907aaa commit d05123c
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 23 additions & 44 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,60 +1,39 @@
#language: android
#jdk: oraclejdk8
#sudo: required
#
#android:
# components:
# # Uncomment the lines below if you want to
# # use the latest revision of Android SDK Tools
# - platform-tools
# - tools
#
# # The BuildTools version used by your project
# - build-tools-24.0.2
#
# # The SDK version used to compile your project
# - android-24
# # - android-21
#
# # Additional components
# # - extra-google-google_play_services
# # - extra-google-m2repository
# - extra-android-m2repository
# - extra-android-support
# # - extra-android-design
# # - addon-google_apis-google-19
#
# # Specify at least one system image,
# # if you need to run emulator(s) during your tests
# # - sys-img-armeabi-v7a-android-24
# # - sys-img-x86-android-17
#
#script:
# - ./gradlew clean build -i --continue

language: android
jdk: oraclejdk8
sudo: false
sudo: required

android:
components:
# Uncomment the lines below if you want to
# use the latest revision of Android SDK Tools
- platform-tools
- tools

# The BuildTools version used by your project
- build-tools-24.0.2
- android-22

# The SDK version used to compile your project
- android-24
# - sys-img-armeabi-v7a-android-22
# - android-21

# Additional components
# - extra-google-google_play_services
# - extra-google-m2repository
- extra-android-m2repository
- extra-android-support
# - extra-android-design
# - addon-google_apis-google-19

# Specify at least one system image,
# if you need to run emulator(s) during your tests
# - sys-img-armeabi-v7a-android-24
# - sys-img-x86-android-17

script:
- ./gradlew clean build -i --continue

before_script:
- chmod +x gradlew
# Create and start emulator
# - echo no | android create avd --force -n test -t android-22 --abi armeabi-v7a
# - emulator -avd test -no-skin -no-audio -no-window &
# - android-wait-for-emulator
# - adb shell input keyevent 82 &

#script: ./gradlew connectedAndroidTest

before_install:
# Make the gradlew wrapper executable before installing anything
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Browse
<!-- [![Build Status](https://travis-ci.org/sazid/Browse.svg?branch=master)](https://travis-ci.org/sazid/Browse) -->
[![Build Status](https://travis-ci.org/sazid/Browse.svg?branch=master)](https://travis-ci.org/sazid/Browse)

A fast, simple and open source light-weight web browser for Android

Expand Down
4 changes: 4 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
// This is important, it will run lint checks but won't abort build
lintOptions {
abortOnError false
}
}

dependencies {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -554,8 +554,9 @@ public boolean onMenuItemClick(MenuItem item) {
}

private void addCurrentSiteToHomeScreen() {
final Intent shortcutIntent = new Intent(this, MainActivity.class);
shortcutIntent.setAction(Intent.ACTION_VIEW);
final Intent shortcutIntent = new Intent(Intent.ACTION_VIEW);
shortcutIntent.setComponent(new ComponentName(this, MainActivity.class));
shortcutIntent.setData(Uri.parse(webView.getUrl()));

new MaterialDialog.Builder(this)
.title("Add to Home screen")
Expand Down

0 comments on commit d05123c

Please sign in to comment.