Skip to content

Commit 6eaee99

Browse files
authored
Merge pull request #1493 from Raizlabs/develop
4.2.1
2 parents 966a9ad + 18733dc commit 6eaee99

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
![Image](https://github.com/agrosner/DBFlow/blob/develop/dbflow_banner.png?raw=true)
22

3-
[![JitPack.io](https://img.shields.io/badge/JitPack.io-4.2.0-red.svg?style=flat)](https://jitpack.io/#Raizlabs/DBFlow) [![Android Weekly](http://img.shields.io/badge/Android%20Weekly-%23129-2CB3E5.svg?style=flat)](http://androidweekly.net/issues/issue-129) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-DBFlow-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/1134)
3+
[![JitPack.io](https://img.shields.io/badge/JitPack.io-4.2.1-red.svg?style=flat)](https://jitpack.io/#Raizlabs/DBFlow) [![Android Weekly](http://img.shields.io/badge/Android%20Weekly-%23129-2CB3E5.svg?style=flat)](http://androidweekly.net/issues/issue-129) [![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-DBFlow-brightgreen.svg?style=flat)](https://android-arsenal.com/details/1/1134)
44

55
A robust, powerful, and very simple ORM android database library with **annotation processing**.
66

@@ -43,7 +43,7 @@ Add the library to the project-level build.gradle, using the apt plugin to enabl
4343
4444
apply plugin: 'kotlin-kapt' // required for kotlin.
4545
46-
def dbflow_version = "4.2.0"
46+
def dbflow_version = "4.2.1"
4747
// or dbflow_version = "develop-SNAPSHOT" for grabbing latest dependency in your project on the develop branch
4848
// or 10-digit short-hash of a specific commit. (Useful for bugs fixed in develop, but not in a release yet)
4949

dbflow/src/main/java/com/raizlabs/android/dbflow/list/FlowQueryList.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import android.support.annotation.NonNull;
1111
import android.support.annotation.Nullable;
1212

13+
import com.raizlabs.android.dbflow.StringUtils;
1314
import com.raizlabs.android.dbflow.config.FlowManager;
1415
import com.raizlabs.android.dbflow.list.FlowCursorList.OnCursorRefreshListener;
1516
import com.raizlabs.android.dbflow.runtime.FlowContentObserver;
@@ -60,7 +61,9 @@ public class FlowQueryList<TModel> extends FlowContentObserver
6061

6162

6263
private FlowQueryList(Builder<TModel> builder) {
63-
super(FlowManager.DEFAULT_AUTHORITY);
64+
super(StringUtils.isNotNullOrEmpty(builder.contentAuthority)
65+
? builder.contentAuthority
66+
: FlowManager.DEFAULT_AUTHORITY);
6467
transact = builder.transact;
6568
changeInTransaction = builder.changeInTransaction;
6669
successCallback = builder.success;
@@ -671,6 +674,8 @@ public static class Builder<TModel> {
671674
private Transaction.Success success;
672675
private Transaction.Error error;
673676

677+
private String contentAuthority;
678+
674679
private Builder(FlowCursorList<TModel> cursorList) {
675680
table = cursorList.table();
676681
cursor = cursorList.cursor();
@@ -708,6 +713,11 @@ public Builder<TModel> modelCache(ModelCache<TModel, ?> modelCache) {
708713
return this;
709714
}
710715

716+
public Builder<TModel> contentAuthority(String contentAuthority) {
717+
this.contentAuthority = contentAuthority;
718+
return this;
719+
}
720+
711721
/**
712722
* If true, when an operation occurs when we call endTransactionAndNotify, we refresh content.
713723
*/

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version=4.2.0
1+
version=4.2.1
22
version_code=1
33
group=com.raizlabs.android
44
bt_siteUrl=https://github.com/Raizlabs/DBFlow

0 commit comments

Comments
 (0)