From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Sat, 28 Nov 2015 10:48:57 +0000 (+0100)
Subject: Merge branch 'target_marshmallow' of https://github.com/owncloud/android into beta
X-Git-Tag: beta-20151129~2^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c94b5314b750083451bfc2587c5a492a057a88c4?ds=inline;hp=-c

Merge branch 'target_marshmallow' of https://github.com/owncloud/android into beta

Conflicts:
	build.gradle
---

c94b5314b750083451bfc2587c5a492a057a88c4
diff --combined .travis.yml
index 1d648630,f50da95f..11e5f40f
--- a/.travis.yml
+++ b/.travis.yml
@@@ -2,12 -2,14 +2,14 @@@ sudo: fals
  language: android
  android:
    components:
-     - build-tools-22.0.1
+     - build-tools-23.0.2
+     - android-23
      - android-22
+     - android-19
  before_install:
    - rm pom.xml
  script:
    - ./setup_env.sh ant
 -  - ant clean
 -  - ant debug
 +  - ant clean -Djava.source=7 -Djava.target=7
 +  - ant debug -Djava.source=7 -Djava.target=7
    
diff --combined AndroidManifest.xml
index 3c106d1c,260cb116..a1fb0745
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -16,14 -16,15 +16,14 @@@
  
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 --->
 -<manifest xmlns:android="http://schemas.android.com/apk/res/android"
 -    package="com.owncloud.android"
 -    android:versionCode="10800000"
 -    android:versionName="1.8.0" >
 + -->
 +<manifest package="com.owncloud.android"
 +    android:versionCode="20151128"
 +    android:versionName="ownCloud beta" xmlns:android="http://schemas.android.com/apk/res/android">
  
      <uses-sdk
          android:minSdkVersion="14"
-         android:targetSdkVersion="22" />
+         android:targetSdkVersion="23" />
  
      <uses-permission android:name="android.permission.GET_ACCOUNTS" />
      <uses-permission android:name="android.permission.USE_CREDENTIALS" />
@@@ -58,11 -59,7 +58,11 @@@
              </intent-filter>
          </activity>
          <activity android:name=".ui.activity.UploadFilesActivity" />
 -        <activity android:name=".ui.activity.Uploader" >
 +        <activity android:name=".ui.activity.LocalDirectorySelectorActivity" />
 +        <activity android:name=".ui.activity.StorageMigrationActivity" />
 +        <activity android:name=".ui.activity.Uploader"
 +            android:label="@string/uploader_top_message"
 +            android:theme="@style/Theme.ownCloud">
              <intent-filter>
                  <action android:name="android.intent.action.SEND" />
  
@@@ -117,7 -114,7 +117,7 @@@
              android:name=".providers.FileContentProvider"
              android:authorities="@string/authority"
              android:enabled="true"
 -            android:exported="false"
 +            android:exported="true"
              android:label="@string/sync_string_files"
              android:syncable="true" />
  
@@@ -128,12 -125,6 +128,12 @@@
              android:exported="false"
              android:label="@string/search_users_and_groups_hint" />
  
 +        <provider
 +            android:name=".ui.adapter.DiskLruImageCacheFileProvider"
 +            android:authorities="@string/authorityCache"
 +            android:exported="true">
 +        </provider>
 +
          <activity
              android:name=".authentication.AuthenticatorActivity"
              android:exported="true"
@@@ -160,14 -151,12 +160,14 @@@
          <service android:name=".media.MediaService" />
  
          <activity android:name=".ui.activity.PassCodeActivity" />
 -        <activity android:name=".ui.activity.ConflictsResolveActivity" />
 -        <activity android:name=".ui.activity.GenericExplanationActivity" />
 -        <activity android:name=".ui.activity.ErrorsWhileCopyingHandlerActivity" />
 -        <activity android:name=".ui.activity.LogHistoryActivity" />
 -
 -        <receiver android:name=".files.InstantUploadBroadcastReceiver" >
 +        <activity android:name=".ui.activity.ConflictsResolveActivity"/>
 +        <activity android:name=".ui.activity.GenericExplanationActivity"/>
 +        <activity android:name=".ui.activity.ErrorsWhileCopyingHandlerActivity"/>
 +        
 +        <activity android:name=".ui.activity.LogHistoryActivity"/>
 +        <activity android:name=".ui.activity.ErrorReportActivity"/>
 +
 +        <receiver android:name=".files.InstantUploadBroadcastReceiver">
              <intent-filter>
  
                  <!-- unofficially supported by many Android phones but not by HTC devices: -->
@@@ -185,10 -174,6 +185,10 @@@
              <intent-filter>
                  <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
              </intent-filter>
 +            <intent-filter>
 +				<action android:name="android.intent.action.ACTION_POWER_CONNECTED"/>
 +			    <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED"/>
 +			</intent-filter>
          </receiver>
          <receiver android:name=".files.BootupBroadcastReceiver" >
              <intent-filter>
diff --combined build.gradle
index ccfce0d9,2a397999..8c68fa73
--- a/build.gradle
+++ b/build.gradle
@@@ -3,12 -3,13 +3,13 @@@ buildscript 
          mavenCentral()
      }
      dependencies {
-         classpath 'com.android.tools.build:gradle:1.3.0'
+         classpath 'com.android.tools.build:gradle:1.5.0'
      }
  }
  
  apply plugin: 'com.android.application'
  
+ 
  repositories {
      mavenCentral()
  
@@@ -20,22 -21,19 +21,25 @@@
  dependencies {
      compile name: 'touch-image-view'
      compile project(':owncloud-android-library')
-     compile 'com.android.support:support-v4:22.2.1'
+     compile 'com.android.support:support-v4:23.1.1'
      compile 'com.jakewharton:disklrucache:2.0.2'
-     compile 'com.android.support:appcompat-v7:22.2.1'
+     compile 'com.android.support:appcompat-v7:23.1.1'
      compile 'com.getbase:floatingactionbutton:1.10.1'
  }
  
  android {
-     compileSdkVersion 22
-     buildToolsVersion "22.0.1"
+     compileSdkVersion 23
+     buildToolsVersion "23.0.2"
+     // as long as ownCloud uses Apache HTTP
+     // http://developer.android.com/about/versions/marshmallow/android-6.0-changes.html#behavior-apache-http-client
+     useLibrary 'org.apache.http.legacy'
  
 +    defaultConfig {
 +        applicationId "com.owncloud.android.beta"
 +        versionCode 20151128
 +        versionName "ownCloud beta"
 +    }
 +
      sourceSets {
          main {
              manifest.srcFile 'AndroidManifest.xml'
@@@ -66,26 -64,13 +70,26 @@@
          }
      }
  
 +    productFlavors {
 +    }
 +
      packagingOptions {
          exclude 'META-INF/LICENSE.txt'
      }
 -}
 -
 -
 -
  
 +    signingConfigs {
 +        release {
 +            storeFile file(RELEASE_STORE_FILE)
 +            storePassword RELEASE_STORE_PASSWORD
 +            keyAlias RELEASE_KEY_ALIAS
 +            keyPassword RELEASE_KEY_PASSWORD
 +        }
 +    }
  
 +     buildTypes {
 +        release {
 +            signingConfig signingConfigs.release
 +        }
 +    }
  
- }
++}