Merge branch 'master' into large-file-support

Conflicts:
	src/main/java/synapticloop/b2/request/B2CreateBucketRequest.java
	src/main/java/synapticloop/b2/request/B2DeleteBucketRequest.java
	src/main/java/synapticloop/b2/request/B2DeleteFileVersionRequest.java
	src/main/java/synapticloop/b2/request/B2GetFileInfoRequest.java
	src/main/java/synapticloop/b2/request/B2GetUploadUrlRequest.java
	src/main/java/synapticloop/b2/request/B2HideFileRequest.java
	src/main/java/synapticloop/b2/request/B2ListBucketsRequest.java
	src/main/java/synapticloop/b2/request/B2ListFileNamesRequest.java
	src/main/java/synapticloop/b2/request/B2ListFileVersionsRequest.java
	src/main/java/synapticloop/b2/request/B2UpdateBucketRequest.java
	src/main/java/synapticloop/b2/request/B2UploadFileRequest.java
	src/main/java/synapticloop/b2/request/BaseB2Request.java
	src/main/java/synapticloop/b2/response/B2FileResponse.java
	src/main/java/synapticloop/b2/response/BaseB2Response.java

Author: Synapticloop

.gitignore

@@ -15,7 +15,6 @@ gradle-app.setting
 ### Eclipse ###
 *.pydevproject
 .metadata
-.gradle
 bin/
 tmp/
 *.tmp

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/synapticloop/backblaze-b2-java-api.svg?branch=master)](https://travis-ci.org/synapticloop/backblaze-b2-java-api)
+[![Build Status](https://travis-ci.org/synapticloop/backblaze-b2-java-api.svg?branch=master)](https://travis-ci.org/synapticloop/backblaze-b2-java-api) [![Download](https://api.bintray.com/packages/synapticloop/maven/backblaze-b2-java-api/images/download.svg) ](https://bintray.com/synapticloop/maven/backblaze-b2-java-api/_latestVersion)
 
 A Java API for the truly excellent backblaze B2 storage
 
@@ -8,7 +8,8 @@ A Java API for the truly excellent backblaze B2 storage
 String b2AccountId = ""; // your b2 account ID
 String b2ApplicationKey = ""; // your b2 application Key
 
-B2ApiClient b2ApiClient = new B2ApiClient(b2AccountId, b2ApplicationKey);
+B2ApiClient b2ApiClient = new B2ApiClient();
+b2ApiClient.authorize(b2AccountId, b2ApplicationKey);
 
 // now create a private bucket
 B2BucketResponse createPrivateBucket = b2ApiClient.createBucket("super-secret-bucket" , BucketType.ALL_PRIVATE);
@@ -24,7 +25,10 @@ see [B2ApiClient.java](https://github.com/synapticloop/backblaze-b2-java-api/blo
 
 ```
 // create a new B2ApiClient
-B2ApiClient(String, String)
+B2ApiClient()
+
+// authorize the client
+authorize(String, String)
 
 // create a bucket
 createBucket(String, BucketType)

build.gradle

@@ -12,7 +12,7 @@ group = 'synapticloop'
 archivesBaseName = 'backblaze-b2-java-api'
 description = """An api for backblaze b2 storage in java"""
 
-version = 'v1.1.3'
+version = 'v1.2.0'
 
 description = """backblaze-b2-java-api"""
 
@@ -153,4 +153,4 @@ github {
 	assets = [
 		'build/libs/' + archivesBaseName + '-' + version + '.jar'
 	]
-}
+}

src/main/java/synapticloop/b2/Action.java

@@ -1,5 +1,21 @@
 package synapticloop.b2;
 
+/*
+ * Copyright (c) 2016 synapticloop.
+ * 
+ * All rights reserved.
+ * 
+ * This code may contain contributions from other parties which, where 
+ * applicable, will be listed in the default build file for the project 
+ * ~and/or~ in a file named CONTRIBUTORS.txt in the root of the project.
+ * 
+ * This source code and any derived binaries are covered by the terms and 
+ * conditions of the Licence agreement ("the Licence").  You may not use this 
+ * source code or any derived binaries except in compliance with the Licence.  
+ * A copy of the Licence is available in the file named LICENSE.txt shipped with 
+ * this source code or binaries.
+ */
+
 /**
  * The action for an associated file, either 'hide' or 'upload', "upload" means 
  * a file that was uploaded to B2 Cloud Storage. "hide" means a file version 
@@ -11,17 +27,6 @@
  * @author synapticloop
  */
 public enum Action {
-	HIDE("hide"),
-	UPLOAD("upload");
-
-	private final String actionType;
-
-	Action(String actionType) {
-		this.actionType = actionType;
-	}
-
-	@Override
-	public String toString() {
-		return(actionType);
-	}
+	hide,
+	upload
 }