Merge pull request #1 from matrix-org/android_dev

Support getting android dev apks
matrix-org · Feb 4, 2015 · e767d87 · e767d87
2 parents d8e660d + 312365a
commit e767d87
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/console/download/fetchbuild.inc.php b/console/download/fetchbuild.inc.php
@@ -75,10 +75,17 @@ function fetch_ios_build($stream) {
 }
 
 // XXX: c+p tastic but probably not worth factoring out for this
-function fetch_android_build() {
+function fetch_android_build($stream) {
+    $streams = array(
+        'master' => 'MatrixAndroidSDK',
+        'develop' => 'MatrixAndroidSDKDevelop'
+    );
+
+    $jenkinsjob = $streams[$stream];
+
     $context = _get_jenkins_stream_context();
 
-    $resp = json_decode(file_get_contents('http://matrix.org/jenkins/job/MatrixAndroidSDK/lastSuccessfulBuild/api/json', false, $context), true);
+    $resp = json_decode(file_get_contents("http://matrix.org/jenkins/job/$jenkinsjob/lastSuccessfulBuild/api/json", false, $context), true);
 
     $build = $resp['number'];
 

diff --git a/console/download/index.php b/console/download/index.php
@@ -10,7 +10,11 @@
     echo '<meta http-equiv="refresh" content="0; url='.$url.'">';
 }
 else if (ereg('Android|android',$_SERVER['HTTP_USER_AGENT'])) {
-    $buildinfo = fetch_android_build();
+    $stream = 'master';
+    if (isset($_GET['dev'])) {
+        $stream = 'develop';
+    }
+    $buildinfo = fetch_android_build($stream);
 
     //$latest = trim(file_get_contents('LATEST-android'));
     $url = "http://matrix.org/console/download/{$buildinfo['apkPath']}";