Merge pull request #1 from spacedockapp/master

update

android/app/build.gradle

@@ -1,8 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 20
-    buildToolsVersion "20.0.0"
+    compileSdkVersion 21
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "com.funnyhatsoftware.spacedock"

android/app/manifest-merger-release-report.txt

@@ -27,121 +27,125 @@ uses-permission#android.permission.WRITE_EXTERNAL_STORAGE
 ADDED from AndroidManifest.xml:11:5
 	android:name
 		ADDED from AndroidManifest.xml:11:22
+uses-permission#android.permission.INTERNET
+ADDED from AndroidManifest.xml:12:5
+	android:name
+		ADDED from AndroidManifest.xml:12:22
 application
-ADDED from AndroidManifest.xml:13:5
+ADDED from AndroidManifest.xml:14:5
 	android:label
-		ADDED from AndroidManifest.xml:17:9
+		ADDED from AndroidManifest.xml:18:9
 	android:allowBackup
-		ADDED from AndroidManifest.xml:15:9
-	android:icon
 		ADDED from AndroidManifest.xml:16:9
+	android:icon
+		ADDED from AndroidManifest.xml:17:9
 	android:theme
-		ADDED from AndroidManifest.xml:18:9
+		ADDED from AndroidManifest.xml:19:9
 	android:name
-		ADDED from AndroidManifest.xml:14:9
+		ADDED from AndroidManifest.xml:15:9
 activity#com.funnyhatsoftware.spacedock.activity.RootTabActivity
-ADDED from AndroidManifest.xml:19:9
+ADDED from AndroidManifest.xml:20:9
 	android:label
-		ADDED from AndroidManifest.xml:21:13
-	android:launchMode
 		ADDED from AndroidManifest.xml:22:13
+	android:launchMode
+		ADDED from AndroidManifest.xml:23:13
 	android:name
-		ADDED from AndroidManifest.xml:20:13
+		ADDED from AndroidManifest.xml:21:13
 intent-filter#android.intent.action.MAIN+android.intent.category.LAUNCHER
-ADDED from AndroidManifest.xml:23:13
+ADDED from AndroidManifest.xml:24:13
 action#android.intent.action.MAIN
-ADDED from AndroidManifest.xml:24:17
+ADDED from AndroidManifest.xml:25:17
 	android:name
-		ADDED from AndroidManifest.xml:24:25
+		ADDED from AndroidManifest.xml:25:25
 category#android.intent.category.LAUNCHER
-ADDED from AndroidManifest.xml:26:17
+ADDED from AndroidManifest.xml:27:17
 	android:name
-		ADDED from AndroidManifest.xml:26:27
+		ADDED from AndroidManifest.xml:27:27
 intent-filter#android.intent.action.EDIT+android.intent.action.VIEW+android.intent.category.DEFAULT
-ADDED from AndroidManifest.xml:28:13
+ADDED from AndroidManifest.xml:29:13
 action#android.intent.action.VIEW
-ADDED from AndroidManifest.xml:29:17
-	android:name
-		ADDED from AndroidManifest.xml:29:25
-action#android.intent.action.EDIT
 ADDED from AndroidManifest.xml:30:17
 	android:name
 		ADDED from AndroidManifest.xml:30:25
+action#android.intent.action.EDIT
+ADDED from AndroidManifest.xml:31:17
+	android:name
+		ADDED from AndroidManifest.xml:31:25
 category#android.intent.category.DEFAULT
-ADDED from AndroidManifest.xml:32:17
+ADDED from AndroidManifest.xml:33:17
 	android:name
-		ADDED from AndroidManifest.xml:32:27
+		ADDED from AndroidManifest.xml:33:27
 data
-ADDED from AndroidManifest.xml:34:17
+ADDED from AndroidManifest.xml:35:17
 	android:host
-		ADDED from AndroidManifest.xml:35:21
+		ADDED from AndroidManifest.xml:36:21
 	android:pathPattern
-		ADDED from AndroidManifest.xml:37:21
+		ADDED from AndroidManifest.xml:38:21
 	android:mimeType
-		ADDED from AndroidManifest.xml:36:21
+		ADDED from AndroidManifest.xml:37:21
 activity#com.funnyhatsoftware.spacedock.activity.SquadTabActivity
-ADDED from AndroidManifest.xml:51:9
+ADDED from AndroidManifest.xml:52:9
 	android:parentActivityName
-		ADDED from AndroidManifest.xml:54:13
+		ADDED from AndroidManifest.xml:55:13
 	android:launchMode
-		ADDED from AndroidManifest.xml:53:13
+		ADDED from AndroidManifest.xml:54:13
 	android:name
-		ADDED from AndroidManifest.xml:52:13
+		ADDED from AndroidManifest.xml:53:13
 meta-data#android.support.PARENT_ACTIVITY
-ADDED from AndroidManifest.xml:57:13
+ADDED from AndroidManifest.xml:58:13
 	android:value
-		ADDED from AndroidManifest.xml:59:17
+		ADDED from AndroidManifest.xml:60:17
 	android:name
-		ADDED from AndroidManifest.xml:58:17
+		ADDED from AndroidManifest.xml:59:17
 activity#com.funnyhatsoftware.spacedock.activity.SetItemListActivity$BrowseActivity
-ADDED from AndroidManifest.xml:63:9
+ADDED from AndroidManifest.xml:64:9
 	android:parentActivityName
-		ADDED from AndroidManifest.xml:66:13
+		ADDED from AndroidManifest.xml:67:13
 	android:launchMode
-		ADDED from AndroidManifest.xml:65:13
+		ADDED from AndroidManifest.xml:66:13
 	android:name
-		ADDED from AndroidManifest.xml:64:13
+		ADDED from AndroidManifest.xml:65:13
 activity#com.funnyhatsoftware.spacedock.activity.DetailsActivity
-ADDED from AndroidManifest.xml:74:9
+ADDED from AndroidManifest.xml:75:9
 	android:parentActivityName
-		ADDED from AndroidManifest.xml:76:13
+		ADDED from AndroidManifest.xml:77:13
 	android:name
-		ADDED from AndroidManifest.xml:75:13
+		ADDED from AndroidManifest.xml:76:13
 activity#com.funnyhatsoftware.spacedock.activity.ExpansionDetailsActivity
-ADDED from AndroidManifest.xml:84:9
+ADDED from AndroidManifest.xml:85:9
 	android:parentActivityName
-		ADDED from AndroidManifest.xml:86:13
+		ADDED from AndroidManifest.xml:87:13
 	android:name
-		ADDED from AndroidManifest.xml:85:13
+		ADDED from AndroidManifest.xml:86:13
 activity#com.funnyhatsoftware.spacedock.activity.SetItemListActivity$SelectActivity
-ADDED from AndroidManifest.xml:95:9
+ADDED from AndroidManifest.xml:96:9
 	android:parentActivityName
-		ADDED from AndroidManifest.xml:98:13
+		ADDED from AndroidManifest.xml:99:13
 	android:launchMode
-		ADDED from AndroidManifest.xml:97:13
+		ADDED from AndroidManifest.xml:98:13
 	android:name
-		ADDED from AndroidManifest.xml:96:13
+		ADDED from AndroidManifest.xml:97:13
 activity#com.funnyhatsoftware.spacedock.activity.SettingsActivity
-ADDED from AndroidManifest.xml:107:9
+ADDED from AndroidManifest.xml:108:9
 	android:label
-		ADDED from AndroidManifest.xml:109:13
-	android:parentActivityName
 		ADDED from AndroidManifest.xml:110:13
+	android:parentActivityName
+		ADDED from AndroidManifest.xml:111:13
 	android:name
-		ADDED from AndroidManifest.xml:108:13
+		ADDED from AndroidManifest.xml:109:13
 provider#android.support.v4.content.FileProvider
-ADDED from AndroidManifest.xml:118:9
+ADDED from AndroidManifest.xml:119:9
 	android:authorities
-		ADDED from AndroidManifest.xml:120:13
+		ADDED from AndroidManifest.xml:121:13
 	android:grantUriPermissions
-		ADDED from AndroidManifest.xml:122:13
+		ADDED from AndroidManifest.xml:123:13
 	android:exported
-		ADDED from AndroidManifest.xml:121:13
+		ADDED from AndroidManifest.xml:122:13
 	android:name
-		ADDED from AndroidManifest.xml:119:13
+		ADDED from AndroidManifest.xml:120:13
 meta-data#android.support.FILE_PROVIDER_PATHS
-ADDED from AndroidManifest.xml:123:13
+ADDED from AndroidManifest.xml:124:13
 	android:resource
-		ADDED from AndroidManifest.xml:125:17
+		ADDED from AndroidManifest.xml:126:17
 	android:name
-		ADDED from AndroidManifest.xml:124:17
+		ADDED from AndroidManifest.xml:125:17

android/app/src/main/AndroidManifest.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.funnyhatsoftware.spacedock"
-    android:versionCode="54"
-    android:versionName="1.1.16 (54)" >
+    android:versionCode="65"
+    android:versionName="1.1.25 (65)" >
 
     <uses-sdk
         android:minSdkVersion="14"
         android:targetSdkVersion="19" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:name="com.funnyhatsoftware.spacedock.SpaceDockApplication"