aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-09-22 14:36:02 +0900
committerKazuki Yamaguchi <k@rhe.jp>2016-09-22 14:36:02 +0900
commite800f6634ed29f203497fb1849ed7c9273215e02 (patch)
treed39a9cb7b3200e670b735840c62ec77ac3e6491b /app
parent8caca7d8a8e84de95ceab894f5df847e0aa96303 (diff)
downloadSmileEssence-e800f6634ed29f203497fb1849ed7c9273215e02.tar.gz
fix retrolambda with JAVA_HOME not set
Diffstat (limited to 'app')
-rw-r--r--app/build.gradle4
-rw-r--r--app/src/main/java/net/lacolaco/smileessence/data/ExtractionWord.java4
2 files changed, 2 insertions, 6 deletions
diff --git a/app/build.gradle b/app/build.gradle
index 39533beb..5eaf52ba 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -96,10 +96,6 @@ kapt {
generateStubs = true
}
-retrolambda {
- jdk System.getenv("JAVA_HOME")
- oldJdk System.getenv("JAVA7_HOME")
-}
repositories {
mavenCentral()
}
diff --git a/app/src/main/java/net/lacolaco/smileessence/data/ExtractionWord.java b/app/src/main/java/net/lacolaco/smileessence/data/ExtractionWord.java
index cbfe8b51..40c40603 100644
--- a/app/src/main/java/net/lacolaco/smileessence/data/ExtractionWord.java
+++ b/app/src/main/java/net/lacolaco/smileessence/data/ExtractionWord.java
@@ -40,7 +40,7 @@ public class ExtractionWord {
@PrimaryKey
long id;
- @Column(uniqueOnConflict = OnConflict.REPLACE)
+ @Column(unique = true, uniqueOnConflict = OnConflict.REPLACE)
String patternString;
// --------------------- static methods ---------------------
@@ -62,7 +62,7 @@ public class ExtractionWord {
public static synchronized ExtractionWord add(String patternString) {
ExtractionWord extractionWord = new ExtractionWord(patternString);
OrmaDatabase orma = OrmaHolder.getORMA();
- orma.insertIntoExtractionWord(extractionWord);
+ orma.relationOfExtractionWord().inserter().execute(extractionWord);
synchronized(mutex) {
cache.put(extractionWord.id, extractionWord);
}