v0.2.0a

gsantner · Nov 7, 2016 · fff3c7a · fff3c7a
1 parent bea3529
commit fff3c7a
Show file tree

Hide file tree

Showing 17 changed files with 1,043 additions and 28 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,7 @@ app/src/main/res/raw/contributors.md
 app/src/main/res/raw/license.md
 app/src/main/res/raw/readme.md
 app/src/main/res/raw/contributors.txt
-app/src/main/res/raw/podlist.json
+#app/src/main/res/raw/podlist.json
 
 ##############
 ### Common ###

diff --git a/app/build.gradle b/app/build.gradle
@@ -10,7 +10,7 @@ android {
         minSdkVersion 17
         targetSdkVersion 24
         versionCode 10
-        versionName "0.2.0-next"
+        versionName "0.2.0a"
         setProperty("archivesBaseName", "diasporaAndroid__${versionName}__")
 
         vectorDrawables.useSupportLibrary = true
@@ -61,8 +61,6 @@ dependencies {
 //  #####################
 final String RAW_DIR = "app/src/main/res/raw"
 final String[] ROOT_TO_RAW_COPYFILES = ["README.md", "LICENSE.md", "CHANGELOG.md", "CONTRIBUTORS.txt"]
-final String PODLIST_URL = 'https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/podList/podlist.json'
-final String PODLIST_PATH = "${RAW_DIR}/podlist.json"
 
 // Called before building
 task copyRepoFiles(type: Copy) {
@@ -84,26 +82,6 @@ task copyRepoFiles(type: Copy) {
             (line.toString().matches("..l>>.*") || line.toString().startsWith("## 99l CONTRIBUTORS")) ? null : line.toString().trim().replaceAll(" \\(.*\\)", "")
         }
     }
-
-    // Download PodList
-    downloadFile(PODLIST_PATH, PODLIST_URL, false)
-
-    // Application variants
-    android.applicationVariants.all { v ->
-        // Do if we build in release (signed apk) mode
-        if (v.buildType.name == "release") {
-            downloadFile(PODLIST_PATH, PODLIST_URL, true)
-        }
-    }
-}
-
-// Downloads a file
-def downloadFile(filePath, url, downloadIfExists) {
-    def f = new File(filePath)
-    f.exists() && downloadIfExists && f.delete();
-    if (!f.exists()) {
-        new URL(url).withInputStream { i -> f.withOutputStream { it << i } }
-    }
 }
 
 tasks.copyRepoFiles.execute()
diff --git a/app/src/main/java/com/github/dfa/diaspora_android/service/FetchPodsService.java b/app/src/main/java/com/github/dfa/diaspora_android/service/FetchPodsService.java
@@ -41,7 +41,7 @@
 public class FetchPodsService extends Service {
     public static final String EXTRA_PODLIST = "pods";
     public static final String MESSAGE_PODS_RECEIVED = "com.github.dfa.diaspora.podsreceived";
-    public static final String PODDY_PODLIST_URL = "https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android-extras/master/podList/podlist.json";
+    public static final String PODDY_PODLIST_URL = "https://raw.githubusercontent.com/Diaspora-for-Android/diaspora-android/master/app/src/main/res/raw/podlist.json";
 
     public FetchPodsService() {
     }