Skip to content

Commit e494dd9

Browse files
committed
Merge pull request #370 from ushahidi/364-secret-key-getting-duplicated
A lot of bug fixes to previous release
2 parents 44725a6 + 1022d73 commit e494dd9

File tree

63 files changed

+1398
-660
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1398
-660
lines changed

build.gradle

+7-3
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,17 @@ buildscript {
1919
repositories {
2020
jcenter()
2121
maven { url "http://oss.sonatype.org/content/repositories/snapshots/" }
22+
23+
maven { url 'https://jitpack.io' }
2224
}
2325
dependencies {
24-
classpath 'com.android.tools.build:gradle:1.5.0'
26+
classpath 'com.android.tools.build:gradle:2.0.0-beta4'
2527
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.7'
2628
classpath 'me.tatarka:gradle-retrolambda:3.2.3'
2729
classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
28-
classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'
30+
// Workaround for sdk-manager
31+
// See: http://stackoverflow.com/questions/33881984/errorcause-com-android-sdklib-repository-fullrevision
32+
classpath 'com.github.JakeWharton:sdk-manager-plugin:220bf7a88a7072df3ed16dc8466fb144f2817070'
2933
classpath 'com.github.triplet.gradle:play-publisher:1.1.4'
3034
classpath 'org.ajoberstar:gradle-git:1.3.2'
3135
}
@@ -52,5 +56,5 @@ allprojects {
5256

5357
task wrapper(type: Wrapper) {
5458
description 'Creates the gradle wrapper.'
55-
gradleVersion '2.7'
59+
gradleVersion '2.10'
5660
}

changelog.json

+11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
[
2+
{
3+
"version": "v3.0.5",
4+
"date": "12th Feburary, 2016",
5+
"features": [],
6+
"bugs": [
7+
"Fixed so app uses the devices phone number as the value for the sent_to field not the from number.",
8+
"Fixed so individual messages can be synchronized.",
9+
"Fixed duplication of messages when task checking is enabled.",
10+
"Fixed Test Integration from always reporting wrong endpoint is entered."
11+
]
12+
},
213
{
314
"version": "v3.0.4",
415
"date": "20th November, 2015",

dependencies/dependencies.gradle

+7-12
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ext {
3434
raiburariVersion = '2.8.0'
3535
cupboardVersion = '2.1.3'
3636
wakefulVersion = '1.0.5'
37-
okHttpVersion = '2.5.0'
37+
okHttpVersion = '2.7.0'
3838
twitter4jCoreVersion = '4.0.4'
3939
nineOldAndroidsVersion = '2.4.0'
4040
bottomsheetVersion = '1.1.1'
@@ -45,9 +45,7 @@ ext {
4545
jUnitVersion = '4.12'
4646
mockitoVersion = '1.10.19'
4747
dexmakerVersion = '1.2'
48-
testingSupportRunnerVersion = '0.4'
49-
robolectricVersion = '3.0'
50-
truthVersion = '0.27'
48+
mockWebServerVersion = '2.7.0'
5149

5250
appDependencies = [
5351
daggerCompiler : "com.google.dagger:dagger-compiler:${daggerVersion}",
@@ -65,13 +63,10 @@ ext {
6563
]
6664

6765
appTestDependencies = [
68-
mockito : "org.mockito:mockito-core:${mockitoVersion}",
69-
dexmaker : "com.google.dexmaker:dexmaker:${dexmakerVersion}",
70-
dexmakerMockito : "com.google.dexmaker:dexmaker-mockito:${dexmakerVersion}",
71-
testingSupportRunner: "com.android.support.test:runner:${testingSupportRunnerVersion}",
72-
junit : "junit:junit:${jUnitVersion}",
73-
mockito : "org.mockito:mockito-core:${mockitoVersion}",
74-
robolectric : "org.robolectric:robolectric:${robolectricVersion}",
75-
truth : "com.google.truth:truth:${truthVersion}",
66+
dexmaker : "com.google.dexmaker:dexmaker:${dexmakerVersion}",
67+
dexmakerMockito: "com.google.dexmaker:dexmaker-mockito:${dexmakerVersion}",
68+
junit : "junit:junit:${jUnitVersion}",
69+
mockito : "org.mockito:mockito-core:${mockitoVersion}",
70+
mockWebServer : "com.squareup.okhttp:mockwebserver:${mockWebServerVersion}",
7671
]
7772
}
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Sun Oct 04 21:29:12 JST 2015
1+
#Thu Feb 11 19:43:40 GMT 2016
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip

smssync/build.gradle

+2-5
Original file line numberDiff line numberDiff line change
@@ -254,14 +254,11 @@ dependencies {
254254
// Test depedencies
255255
testCompile appTestDependencies.junit
256256
testCompile appTestDependencies.mockito
257-
testCompile appTestDependencies.robolectric
258-
testCompile appTestDependencies.truth
257+
testCompile appTestDependencies.mockWebServer
258+
testApt appDependencies.daggerCompiler
259259

260260
androidTestCompile appTestDependencies.mockito
261261
androidTestCompile appTestDependencies.dexmaker
262262
androidTestCompile appTestDependencies.dexmakerMockito
263-
androidTestCompile(appTestDependencies.testingSupportRunner) {
264-
exclude module: 'support-annotations'
265-
}
266263
androidTestApt appDependencies.daggerCompiler
267264
}

smssync/src/internal/java/org/addhen/smssync/data/repository/InternalFilterDataRepository.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -115,25 +115,25 @@ private List<FilterEntity> getFilterEntities() {
115115

116116
private FilterEntity getFilterEntityOne() {
117117
FilterEntity filterEntity = new FilterEntity();
118-
filterEntity._id = 1l;
119-
filterEntity.phoneNumber = "090909392";
120-
filterEntity.status = FilterEntity.Status.BLACKLIST;
118+
filterEntity.setId(1l);
119+
filterEntity.setPhoneNumber("090909392");
120+
filterEntity.setStatus(FilterEntity.Status.BLACKLIST);
121121
return filterEntity;
122122
}
123123

124124
private FilterEntity getFilterEntityTwo() {
125125
FilterEntity filterEntity = new FilterEntity();
126-
filterEntity._id = 2l;
127-
filterEntity.phoneNumber = "0909145895";
128-
filterEntity.status = FilterEntity.Status.WHITELIST;
126+
filterEntity.setId(2l);
127+
filterEntity.setPhoneNumber("0909145895");
128+
filterEntity.setStatus(FilterEntity.Status.WHITELIST);
129129
return filterEntity;
130130
}
131131

132132
private FilterEntity getFilterEntityThree() {
133133
FilterEntity filterEntity = new FilterEntity();
134134
filterEntity._id = 3l;
135-
filterEntity.phoneNumber = "0904632489";
136-
filterEntity.status = FilterEntity.Status.WHITELIST;
135+
filterEntity.setPhoneNumber("0904632489");
136+
filterEntity.setStatus(FilterEntity.Status.WHITELIST);
137137
return filterEntity;
138138
}
139139
}

smssync/src/main/java/org/addhen/smssync/data/cache/FileManager.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public static List<Log> readLogFile(File file) {
138138
String fileLine;
139139
while ((fileLine = bufferedReader.readLine()) != null) {
140140
Log log = new Log();
141-
log.message = fileLine;
141+
log.setMessage(fileLine);
142142
logs.add(log);
143143
}
144144
} catch (IOException e) {
@@ -266,7 +266,7 @@ public Observable<List<Log>> getLogs() {
266266

267267
public Observable<Long> addLog(Log log) {
268268
return Observable.create(subscriber -> {
269-
appendAndClose(log.message);
269+
appendAndClose(log.getMessage());
270270
subscriber.onNext(1l);
271271
subscriber.onCompleted();
272272
});
@@ -285,7 +285,7 @@ public Observable<Log> getLog() {
285285
final String logString = readLogs(mName);
286286
if (logString != null) {
287287
Log log = new Log();
288-
log.message = logString;
288+
log.setMessage(logString);
289289
subscriber.onNext(log);
290290
subscriber.onCompleted();
291291
} else {

smssync/src/main/java/org/addhen/smssync/data/entity/Filter.java

+26-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,33 @@
2424
*/
2525
public class Filter extends DataEntity {
2626

27-
public String phoneNumber;
27+
private String phoneNumber;
2828

29-
public Status status;
29+
private Status status;
30+
31+
public Long getId() {
32+
return _id;
33+
}
34+
35+
public void setId(Long id) {
36+
_id = id;
37+
}
38+
39+
public String getPhoneNumber() {
40+
return phoneNumber;
41+
}
42+
43+
public void setPhoneNumber(String phoneNumber) {
44+
this.phoneNumber = phoneNumber;
45+
}
46+
47+
public Status getStatus() {
48+
return status;
49+
}
50+
51+
public void setStatus(Status status) {
52+
this.status = status;
53+
}
3054

3155
/**
3256
* The status of the filtered phone number.

smssync/src/main/java/org/addhen/smssync/data/entity/Log.java

+17-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,23 @@
2626
*/
2727
public class Log extends DataEntity {
2828

29-
public String message;
29+
private String message;
30+
31+
public Long getId() {
32+
return _id;
33+
}
34+
35+
public void setId(Long id) {
36+
_id = id;
37+
}
38+
39+
public String getMessage() {
40+
return message;
41+
}
42+
43+
public void setMessage(String message) {
44+
this.message = message;
45+
}
3046

3147
@Override
3248
public String toString() {

smssync/src/main/java/org/addhen/smssync/data/entity/Message.java

+116-12
Original file line numberDiff line numberDiff line change
@@ -35,49 +35,153 @@ public class Message extends DataEntity implements Serializable {
3535

3636
@SerializedName("message")
3737
@Column("messages_body")
38-
public String messageBody;
38+
private String messageBody;
3939

4040
@SerializedName("to")
4141
@Column("messages_from")
42-
public String messageFrom;
42+
private String messageFrom;
4343

4444
@SerializedName("timestamp")
4545
@Column("messages_date")
46-
public Date messageDate;
46+
private Date messageDate;
4747

4848
@SerializedName("uuid")
4949
@Column("message_uuid")
50-
public String messageUuid;
50+
private String messageUuid;
5151

5252
@SerializedName("type")
5353
@Column("message_type")
54-
public Type messageType;
54+
private Type messageType;
5555

5656
@SerializedName("sent_result_code")
5757
@Column("sent_result_code")
58-
public int sentResultCode;
58+
private int sentResultCode;
5959

6060
@SerializedName("sent_result_message")
6161
@Column("sent_result_message")
62-
public String sentResultMessage;
62+
private String sentResultMessage;
6363

6464
@SerializedName("delivery_result_code")
6565
@Column("delivery_result_code")
66-
public int deliveryResultCode;
66+
private int deliveryResultCode;
6767

6868
@SerializedName("delivered_result_message")
6969
@Column("delivery_result_message")
70-
public String deliveryResultMessage;
70+
private String deliveryResultMessage;
7171

7272
@SerializedName("delivered_timestamp")
7373
@Column("delivered_timestamp")
74-
public Date deliveredDate;
74+
private Date deliveredDate;
7575

7676
@Column("retries")
77-
public int retries;
77+
private int retries;
7878

7979
@Column("status")
80-
public Status status;
80+
private Status status;
81+
82+
public Long getId() {
83+
return _id;
84+
}
85+
86+
public void setId(Long id) {
87+
_id = id;
88+
}
89+
90+
public String getMessageBody() {
91+
return messageBody;
92+
}
93+
94+
public void setMessageBody(String messageBody) {
95+
this.messageBody = messageBody;
96+
}
97+
98+
public String getMessageFrom() {
99+
return messageFrom;
100+
}
101+
102+
public void setMessageFrom(String messageFrom) {
103+
this.messageFrom = messageFrom;
104+
}
105+
106+
public Date getMessageDate() {
107+
return messageDate;
108+
}
109+
110+
public void setMessageDate(Date messageDate) {
111+
this.messageDate = messageDate;
112+
}
113+
114+
public String getMessageUuid() {
115+
return messageUuid;
116+
}
117+
118+
public void setMessageUuid(String messageUuid) {
119+
this.messageUuid = messageUuid;
120+
}
121+
122+
public Type getMessageType() {
123+
return messageType;
124+
}
125+
126+
public void setMessageType(Type messageType) {
127+
this.messageType = messageType;
128+
}
129+
130+
public int getSentResultCode() {
131+
return sentResultCode;
132+
}
133+
134+
public void setSentResultCode(int sentResultCode) {
135+
this.sentResultCode = sentResultCode;
136+
}
137+
138+
public String getSentResultMessage() {
139+
return sentResultMessage;
140+
}
141+
142+
public void setSentResultMessage(String sentResultMessage) {
143+
this.sentResultMessage = sentResultMessage;
144+
}
145+
146+
public int getDeliveryResultCode() {
147+
return deliveryResultCode;
148+
}
149+
150+
public void setDeliveryResultCode(int deliveryResultCode) {
151+
this.deliveryResultCode = deliveryResultCode;
152+
}
153+
154+
public String getDeliveryResultMessage() {
155+
return deliveryResultMessage;
156+
}
157+
158+
public void setDeliveryResultMessage(String deliveryResultMessage) {
159+
this.deliveryResultMessage = deliveryResultMessage;
160+
}
161+
162+
public Date getDeliveredDate() {
163+
return deliveredDate;
164+
}
165+
166+
public void setDeliveredDate(Date deliveredDate) {
167+
this.deliveredDate = deliveredDate;
168+
}
169+
170+
public int getRetries() {
171+
return retries;
172+
}
173+
174+
public void setRetries(int retries) {
175+
this.retries = retries;
176+
}
177+
178+
public Status getStatus() {
179+
return status;
180+
}
181+
182+
public void setStatus(Status status) {
183+
this.status = status;
184+
}
81185

82186
@Override
83187
public String toString() {

0 commit comments

Comments
 (0)