Merge branch 'master' into new-swap

Fixed lots of (minor) conflicts. Some due to earlier rebasing of
material stuff that was subsequently merged into master with a
different commit hash (I guess, that's what it looked like anyway).

Android.mk

@@ -8,9 +8,14 @@ LOCAL_PACKAGE_NAME := F-Droid
 
 fdroid_root  := $(LOCAL_PATH)
 fdroid_dir   := F-Droid
+fdroid_out   := $(OUT_DIR)/target/common/obj/APPS/$(LOCAL_MODULE)_intermediates
+fdroid_build := $(fdroid_root)/$(fdroid_dir)/build
 fdroid_apk   := build/outputs/apk/F-Droid-release-unsigned.apk
 
 $(fdroid_root)/$(fdroid_dir)/$(fdroid_apk):
+	rm -Rf $(fdroid_build)
+	mkdir -p $(fdroid_out)
+	ln -s $(fdroid_out) $(fdroid_build)
 	cd $(fdroid_root)/$(fdroid_dir) && gradle assembleRelease
 
 LOCAL_CERTIFICATE := platform

CHANGELOG.md

@@ -1,3 +1,34 @@
+### Upcoming release
+
+* Adapt UI to use Material Design
+
+* Redesign the App Details view with larger icons, expandable description and
+  links with icons
+
+* Add ability to make F-Droid install itself as a privileged app on /system
+  via root, allowing the use of the system installer
+
+* Remove the root installer, since the system installer is safer, more stable
+  and now easy to set up with root privileges
+
+* Can now manually add swap repo via "Repositories" screen
+
+* Using NFC during swap now initiates a proper swap, rather than redirecting to
+  the "Repositories" screen
+
+### 0.92 (2015-06-08)
+
+* Make swap only in portrait mode to prevent crashes and issues where UI elements are obscured
+
+* Update Universal-Image-Loader to 1.9.4
+
+* Make Apk downloads progress be measured in kilobytes instead of bytes
+
+* Add missing Sardinian language to the preferences
+
+* Fix minimum SDK to be 8 (2.2) instead of 7 (2.1) since support for version 7
+  was dropped long ago
+
 ### 0.91 (2015-05-18)
 
 * Don't request the "Write to external storage" permission on 4.4 and later

F-Droid/.classpath

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="src" path="src"/>
-    <classpathentry kind="src" path="../extern/symlinks-for-ant-and-eclipse">
-		<attributes>
-			<attribute name="ignore_optional_problems" value="true"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/AndroidPinning"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/MemorizingActivity"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/library"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>

F-Droid/.project

@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>fdroid</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

F-Droid/AndroidManifest.xml

@@ -3,8 +3,8 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="org.fdroid.fdroid"
     android:installLocation="auto"
-    android:versionCode="910"
+    android:versionCode="940"
-    android:versionName="0.91"
+    android:versionName="0.94-test"
     >
 
     <uses-sdk
@@ -56,9 +56,6 @@
     <uses-permission android:name="android.permission.DELETE_PACKAGES"
         tools:ignore="ProtectedPermissions"/>
 
-    <!-- Indicate that F-Droid may request root access (introduced by Koush's Superuser app) -->
-    <uses-permission android:name="android.permission.ACCESS_SUPERUSER"/>
-
     <application
         android:name="FDroidApp"
         android:icon="@drawable/ic_launcher"
@@ -298,6 +295,14 @@
                 android:name="android.app.default_searchable"
                 android:value=".SearchResults" />
         </activity>
+        <activity
+            android:name=".installer.InstallConfirmActivity"
+            android:label="@string/menu_install"
+            android:parentActivityName=".FDroid">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".FDroid" />
+        </activity>
         <activity
             android:name=".views.ManageReposActivity"
             android:label="@string/app_name"
@@ -385,6 +390,16 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value=".FDroid" />
         </activity>
+        <!-- Note: Theme.NoDisplay, this activity shows dialogs only -->
+        <activity
+            android:name=".installer.InstallIntoSystemDialogActivity"
+            android:theme="@android:style/Theme.NoDisplay" />
+        <receiver
+            android:name=".installer.InstallIntoSystemBootReceiver" >
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
         <activity
             android:name=".SearchResults"
             android:label="@string/search_results"

F-Droid/ant-prepare.sh

@@ -1,53 +0,0 @@
-#!/bin/bash -ex
-
-if ! which android > /dev/null; then
-    if [ -z $ANDROID_HOME ]; then
-        if [ -e ~/.android/bashrc ]; then
-            . ~/.android/bashrc
-        else
-            echo "'android' not found, ANDROID_HOME must be set!"
-            exit
-        fi
-    else
-        export PATH="${ANDROID_HOME}/tools:$PATH"
-    fi
-fi
-
-# set up test signing keys for any `ant release` runs
-if [ -e ~/.android/ant.properties ]; then
-    cp ~/.android/ant.properties ./
-else
-    echo "skipping release ant.properties"
-fi
-
-
-EXTERN=../extern
-
-place_support_v4() {
-    mkdir -p $1/libs
-    cp libs/android-support-v4.jar $1/libs/
-}
-
-android update lib-project --path $EXTERN/UniversalImageLoader/library
-
-android update lib-project --path $EXTERN/AndroidPinning
-
-android update lib-project --path $EXTERN/libsuperuser/libsuperuser
-
-android update lib-project --path $EXTERN/zxing-core
-
-android update lib-project --path $EXTERN/support-v4-preferencefragment
-place_support_v4 $EXTERN/support-v4-preferencefragment
-
-android update lib-project --path $EXTERN/Support/v7/appcompat --target android-19
-place_support_v4 $EXTERN/Support/v7/appcompat
-
-android update project --path . --name F-Droid
-
-{ echo -e "\nSuccessfully updated the main project.\n"; } 2>/dev/null
-
-# technically optional, needed for the tests
-cd test
-android update test-project --path . --main ..
-
-{ echo -e "\nSuccessfully updated the test project.\n"; } 2>/dev/null

F-Droid/build.gradle

@@ -21,7 +21,7 @@ if ( !hasProperty( 'sourceDeps' ) ) {
                 'com.android.support:support-annotations:22.1.0',
 
                 'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0',
-                'com.nostra13.universalimageloader:universal-image-loader:1.9.3',
+                'com.nostra13.universalimageloader:universal-image-loader:1.9.4',
                 'com.google.zxing:core:3.2.0',
                 'eu.chainfire:libsuperuser:1.0.0.201504231659',
 
@@ -156,6 +156,11 @@ android {
         release {
             minifyEnabled false
         }
+        buildTypes {
+            debug {
+                debuggable true
+            }
+        }
     }
 
     compileOptions {

F-Droid/project.properties

@@ -1,18 +0,0 @@
-target=android-21
-
-android.library.reference.1=../extern/UniversalImageLoader/library
-android.library.reference.2=../extern/AndroidPinning
-android.library.reference.3=../extern/libsuperuser/libsuperuser
-android.library.reference.4=../extern/zxing-core
-android.library.reference.5=../extern/support-v4-preferencefragment
-android.library.reference.6=../extern/Support/v7/appcompat
-
-# For java libraries, place symlinks in ../extern/symlinks-for-ant-and-eclipse/
-source.dir=src;../extern/symlinks-for-ant-and-eclipse
-
-# With a target SDK of android-21 (5.0/Lollipop) and a Java 1.7 compiler, you
-# can use Java 1.7 features like the <> diamond operator, multi-catch, strings
-# in switches, etc. zxing uses the <> operator, so Java 1.7 is required.
-java.encoding=UTF-8
-java.source=1.7
-java.target=1.7

F-Droid/res/drawable/ic_text_dot.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<inset xmlns:android="http://schemas.android.com/apk/res/android"
+    android:inset="10dp">
+    <shape android:shape="oval">
+        <solid android:color="?android:attr/textColorSecondary" />
+        <size android:width="4dp" android:height="4dp" />
+    </shape>
+</inset>