Skip to content

Commit

Permalink
Merge pull request #5 from ManoloBrn/arm64-v8a_issue
Browse files Browse the repository at this point in the history
Issue #4 Android compatibility with arm64-v8
  • Loading branch information
team-pct authored Dec 20, 2018
2 parents a275f12 + 45c80b2 commit ffaa90c
Show file tree
Hide file tree
Showing 2 changed files with 79 additions and 0 deletions.
71 changes: 71 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@

# Created by https://www.gitignore.io/api/node

### Node ###
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Typescript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# Yarn Lock file
yarn.lock

# package.json Lock file
package-lock.json

# dotenv environment variables file
.env


# End of https://www.gitignore.io/api/node
8 changes: 8 additions & 0 deletions public/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,21 @@ var popcorn = {
},
getAndroidVersion: function () {
$.get('https://ci.popcorntime.sh/android', function(resp) {
console.log(resp.mobile);
var version = resp.mobile.release["armeabi-v7a"].versionName;
var newUrl = 'https://get.popcorntime.sh/android/' + version + '/mobile-armeabi-v7a-release-' + version + '.apk';
if(version.indexOf("0") == 0) {
version = version.substring(2, version.length);
}
$('a[data-os="Android"]').attr('href', newUrl).html(i18n.t("download.text", { defaultValue: "Download Beta %s", postProcess: 'sprintf', sprintf: [version] }));

version = resp.mobile.release["arm64-v8a"].versionName;
var newUrl64v8Url = 'https://get.popcorntime.sh/android/' + version + '/mobile-arm64-v8a-release' + version + '.apk';
if(version.indexOf("0") == 0) {
version = version.substring(2, version.length);
}
$('a[data-os="Android"]').attr('href', newUrl64v8Url).html(i18n.t("download.text", { defaultValue: "Download Beta %s", postProcess: 'sprintf', sprintf: [version] }));

version = resp.tv.release["armeabi-v7a"].versionName;
var newArmUrl = 'https://get.popcorntime.sh/android/' + version + '/tv-armeabi-v7a-release-' + version + '.apk';
var newX86Url = 'https://get.popcorntime.sh/android/' + version + '/tv-x86-release-' + version + '.apk';
Expand Down

0 comments on commit ffaa90c

Please sign in to comment.