diff options
| author | Stefan Niedermann <info@niedermann.it> | 2021-05-03 18:36:24 +0300 |
|---|---|---|
| committer | Stefan Niedermann <info@niedermann.it> | 2021-05-03 19:22:38 +0300 |
| commit | bbf569b0e9a1a93e4fff8074cc180274fc1f2d24 (patch) | |
| tree | e43c3237b7a36d8d3f4881129cd977e93690f9db /app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/AccountDao.java | |
| parent | e3c4c1cb40ba229f50dd534c9edef42cb807ed18 (diff) | |
| parent | 1cc44ede8e6c605345d794452c099a07a49d2f49 (diff) | |
Merge branch 'master' into 916-settings
# Conflicts:
# app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountAdapter.java
# app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsActivity.java
# app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesClient.java
# app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesClientV1.java
# app/src/main/java/it/niedermann/owncloud/notes/shared/model/ApiVersion.java
# app/src/main/res/values/strings.xml
Diffstat (limited to 'app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/AccountDao.java')
| -rw-r--r-- | app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/AccountDao.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/AccountDao.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/AccountDao.java index b0828717..085c0a16 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/AccountDao.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/dao/AccountDao.java @@ -53,6 +53,6 @@ public interface AccountDao { @Query("UPDATE Account SET MODIFIED = :modified WHERE id = :id") void updateModified(long id, long modified); - @Query("UPDATE Account SET APIVERSION = :apiVersion WHERE id = :id") + @Query("UPDATE Account SET APIVERSION = :apiVersion WHERE id = :id AND ((APIVERSION IS NULL AND :apiVersion IS NOT NULL) OR (APIVERSION IS NOT NULL AND :apiVersion IS NULL) OR APIVERSION <> :apiVersion)") int updateApiVersion(Long id, String apiVersion); } |