Skip to content

Commit b587181

Browse files
eyedoleyedol
committed
Merge branch 'develop'
2 parents 3e35d25 + d420d7b commit b587181

12 files changed

Lines changed: 108 additions & 122 deletions

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ script: ./gradlew build
1010
notifications:
1111
hipchat:
1212
rooms:
13-
secure: pofqFB1dvZq/Ue0okcuy3cWDKMxkq/5acPGoK2VlB8Sj1OEPm3Uau2y4Kx0DKtV9vQCLmAwc9Wvy26eIbihFIjzM6O8BDS5kdWlApJIlnJtT5hJ/YT5JB0jDHW6P1aU4muu9PXtBMMZhUWmBU3jIUPTgiLbCAygCYPGOkVRku+g=
13+
secure: WiQT1MnkaN41pXrDA/OFzpTU88K7UZZrV2ESGPD8Cz5KJOCJUeFZlmSlRZiwmVj5SBKP/7k2dVfmtoA/4exhKgRzei9UF63udwDBN63HCwb4CUGMWRbJYub99KB/QW5J52M4fsDd8w3p20I9L2ht9rZJMzqU+QPxcuNtkdEYZgA=

‎changelog.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11
[
2+
{
3+
"version": "v2.8.3",
4+
"date": "17th June, 2015",
5+
"features": [],
6+
"bugs": [
7+
"Fix issue with app crashing because of unnecessary definition of otto bus @Producers",
8+
"Fix issue with app crashing because otto bus is not properly registered.",
9+
"Fix issue with app sporadically crashing when you invoke navigation drawer."
10+
]
11+
},
212
{
313
"version": "v2.8.2",
414
"date": "9th June, 2015",

‎smssync/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ android {
112112
}
113113

114114
defaultConfig {
115-
versionCode 35
116-
versionName "2.8.2"
115+
versionCode 36
116+
versionName "2.8.3"
117117
minSdkVersion 8
118118
targetSdkVersion 22
119119
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

‎smssync/src/main/java/org/addhen/smssync/activities/BaseActivity.java‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,13 @@ public void run() {
312312
syncUrlNavDrawerItem.setCounter();
313313
filterNavDrawerItem.setCounter();
314314
whitelistNavDrawerItem.setCounter();
315-
navDrawerAdapter.notifyDataSetChanged();
315+
UiThread.getInstance().post(new Runnable() {
316+
@Override
317+
public void run() {
318+
navDrawerAdapter.notifyDataSetChanged();
319+
}
320+
});
321+
316322
DonationFragment.checkUserHasDonated(getApplication(),
317323
new DonationFragment.DonationStatusListener() {
318324
@Override

‎smssync/src/main/java/org/addhen/smssync/fragments/PendingMessages.java‎

Lines changed: 60 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,6 @@
1717

1818
package org.addhen.smssync.fragments;
1919

20-
import android.app.Activity;
21-
import android.app.AlertDialog;
22-
import android.content.BroadcastReceiver;
23-
import android.content.Context;
24-
import android.content.DialogInterface;
25-
import android.content.Intent;
26-
import android.content.IntentFilter;
27-
import android.os.Bundle;
28-
import android.view.MenuItem;
29-
import android.view.View;
30-
3120
import com.squareup.otto.Subscribe;
3221

3322
import org.addhen.smssync.App;
@@ -51,6 +40,17 @@
5140
import org.addhen.smssync.util.Util;
5241
import org.addhen.smssync.views.PendingMessagesView;
5342

43+
import android.app.Activity;
44+
import android.app.AlertDialog;
45+
import android.content.BroadcastReceiver;
46+
import android.content.Context;
47+
import android.content.DialogInterface;
48+
import android.content.Intent;
49+
import android.content.IntentFilter;
50+
import android.os.Bundle;
51+
import android.view.MenuItem;
52+
import android.view.View;
53+
5454
import java.text.DateFormat;
5555
import java.util.ArrayList;
5656
import java.util.Date;
@@ -63,7 +63,9 @@ public class PendingMessages
6363
android.view.View.OnClickListener {
6464

6565
public static final int PENDING_MESSAGES_INTENT_FLAG = 4;
66+
6667
private static final String STATE_CHECKED = "org.addhen.smssync.fragments.STATE_CHECKED";
68+
6769
private Intent syncPendingMessagesServiceIntent;
6870

6971
private LinkedHashSet<Integer> mSelectedItemsPositions;
@@ -117,7 +119,6 @@ public void onActivityCreated(Bundle savedInstanceState) {
117119
}
118120
}
119121
view.sync.setOnClickListener(this);
120-
App.bus.register(this);
121122
getActivity().registerReceiver(failedReceiver,
122123
new IntentFilter(ServicesConstants.FAILED_ACTION));
123124
}
@@ -133,6 +134,7 @@ public void onSaveInstanceState(Bundle state) {
133134
public void onResume() {
134135
log("onResume()");
135136
super.onResume();
137+
App.bus.register(this);
136138
idle();
137139
loadingTask();
138140
}
@@ -462,30 +464,31 @@ public void loadingTask() {
462464
}
463465

464466
private void fetchMessages() {
465-
App.getDatabaseInstance().getMessageInstance().fetchPending(new BaseDatabseHelper.DatabaseCallback<List<Message>>() {
466-
@Override
467-
public void onFinished(final List<Message> result) {
468-
if (result != null) {
469-
UiThread.getInstance().post(new Runnable() {
470-
@Override
471-
public void run() {
472-
view.listLoadingProgress.setVisibility(android.view.View.GONE);
473-
view.emptyView.setVisibility(View.VISIBLE);
474-
adapter.setItems(result);
475-
listView.setAdapter(adapter);
467+
App.getDatabaseInstance().getMessageInstance()
468+
.fetchPending(new BaseDatabseHelper.DatabaseCallback<List<Message>>() {
469+
@Override
470+
public void onFinished(final List<Message> result) {
471+
if (result != null) {
472+
UiThread.getInstance().post(new Runnable() {
473+
@Override
474+
public void run() {
475+
view.listLoadingProgress.setVisibility(android.view.View.GONE);
476+
view.emptyView.setVisibility(View.VISIBLE);
477+
adapter.setItems(result);
478+
listView.setAdapter(adapter);
479+
}
480+
});
481+
} else {
482+
toastLong("No pending messages");
476483
}
477-
});
478-
} else {
479-
toastLong("No pending messages");
480-
}
481484

482-
}
485+
}
483486

484-
@Override
485-
public void onError(Exception exception) {
487+
@Override
488+
public void onError(Exception exception) {
486489

487-
}
488-
});
490+
}
491+
});
489492
}
490493

491494
@Subscribe
@@ -554,31 +557,34 @@ protected Boolean doInBackground(String... args) {
554557
if (deletebyUuid) {
555558

556559
for (Integer position : mSelectedItemsPositions) {
557-
App.getDatabaseInstance().getMessageInstance().fetchByUuid(adapter.getItem(position).getUuid(), new BaseDatabseHelper.DatabaseCallback<Message>() {
558-
@Override
559-
public void onFinished(Message result) {
560-
// Do nothing
561-
}
562-
563-
@Override
564-
public void onError(Exception exception) {
565-
// Do nothing
566-
}
567-
});
560+
App.getDatabaseInstance().getMessageInstance()
561+
.fetchByUuid(adapter.getItem(position).getUuid(),
562+
new BaseDatabseHelper.DatabaseCallback<Message>() {
563+
@Override
564+
public void onFinished(Message result) {
565+
// Do nothing
566+
}
567+
568+
@Override
569+
public void onError(Exception exception) {
570+
// Do nothing
571+
}
572+
});
568573

569574
}
570575
} else {
571-
App.getDatabaseInstance().getMessageInstance().deleteAll(new BaseDatabseHelper.DatabaseCallback<Void>() {
572-
@Override
573-
public void onFinished(Void result) {
574-
// Do nothing
575-
}
576-
577-
@Override
578-
public void onError(Exception exception) {
579-
//Do nothing
580-
}
581-
});
576+
App.getDatabaseInstance().getMessageInstance()
577+
.deleteAll(new BaseDatabseHelper.DatabaseCallback<Void>() {
578+
@Override
579+
public void onFinished(Void result) {
580+
// Do nothing
581+
}
582+
583+
@Override
584+
public void onError(Exception exception) {
585+
//Do nothing
586+
}
587+
});
582588
}
583589
deleted = 2;
584590
}

‎smssync/src/main/java/org/addhen/smssync/fragments/SentMessageFragment.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ public void onActivityCreated(Bundle savedInstanceState) {
8787
listView.setLongClickable(true);
8888
listView.setOnItemLongClickListener(new SentMessagesActionModeListener(
8989
this, listView));
90-
App.bus.register(this);
91-
9290
}
9391

9492
@Override

‎smssync/src/main/java/org/addhen/smssync/net/GoogleDocsHttpClient.java‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@
1717

1818
package org.addhen.smssync.net;
1919

20-
import android.content.Context;
21-
import android.content.res.Resources;
22-
23-
import com.squareup.otto.Produce;
24-
2520
import org.addhen.smssync.R;
2621
import org.addhen.smssync.util.Util;
2722

23+
import android.content.Context;
24+
import android.content.res.Resources;
25+
2826
import java.util.Locale;
2927

3028
/**
@@ -74,9 +72,4 @@ public void setServerError(String error, int statusCode) {
7472
res.getString(R.string.sending_failed_http_code, statusCode));
7573
Util.logActivities(context, serverError);
7674
}
77-
78-
@Produce
79-
public boolean reloadLog() {
80-
return true;
81-
}
8275
}

‎smssync/src/main/java/org/addhen/smssync/net/MessageSyncHttpClient.java‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,7 @@
1616
*/
1717
package org.addhen.smssync.net;
1818

19-
import android.content.Context;
20-
import android.content.res.Resources;
21-
import android.text.TextUtils;
22-
2319
import com.google.gson.Gson;
24-
import com.squareup.otto.Produce;
2520

2621
import org.addhen.smssync.R;
2722
import org.addhen.smssync.models.Message;
@@ -35,6 +30,10 @@
3530
import org.apache.http.client.entity.UrlEncodedFormEntity;
3631
import org.apache.http.protocol.HTTP;
3732

33+
import android.content.Context;
34+
import android.content.res.Resources;
35+
import android.text.TextUtils;
36+
3837
import java.util.Locale;
3938

4039
public class MessageSyncHttpClient extends MainHttpClient {
@@ -212,11 +211,6 @@ public void setServerSuccessResp(SmssyncResponse smssyncResponse) {
212211
this.smssyncResponse = smssyncResponse;
213212
}
214213

215-
@Produce
216-
public boolean reloadLog() {
217-
return true;
218-
}
219-
220214
public SyncUrl getSyncUrl() {
221215
return syncUrl;
222216
}

‎smssync/src/main/java/org/addhen/smssync/services/AutoSyncScheduledService.java‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,13 @@
1717

1818
package org.addhen.smssync.services;
1919

20-
import android.content.Intent;
21-
22-
import com.squareup.otto.Produce;
23-
2420
import org.addhen.smssync.App;
2521
import org.addhen.smssync.messages.ProcessMessage;
2622
import org.addhen.smssync.messages.ProcessSms;
27-
import org.addhen.smssync.state.LogEvent;
2823
import org.addhen.smssync.util.ServicesConstants;
2924

25+
import android.content.Intent;
26+
3027
/**
3128
* This class handles background services for periodic synchronization of pending messages.
3229
*
@@ -63,9 +60,4 @@ protected void executeTask(Intent intent) {
6360
sendBroadcast(statusIntent);
6461
}
6562
}
66-
67-
@Produce
68-
public LogEvent readLogs() {
69-
return new LogEvent();
70-
}
7163
}

‎smssync/src/main/java/org/addhen/smssync/services/CheckTaskScheduledService.java‎

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,16 @@
1717

1818
package org.addhen.smssync.services;
1919

20-
import android.content.Intent;
21-
22-
import com.squareup.otto.Produce;
23-
2420
import org.addhen.smssync.App;
2521
import org.addhen.smssync.R;
2622
import org.addhen.smssync.database.BaseDatabseHelper;
2723
import org.addhen.smssync.messages.ProcessMessage;
2824
import org.addhen.smssync.messages.ProcessSms;
2925
import org.addhen.smssync.models.SyncUrl;
30-
import org.addhen.smssync.state.LogEvent;
3126
import org.addhen.smssync.util.Util;
3227

28+
import android.content.Intent;
29+
3330
import java.util.List;
3431

3532
public class CheckTaskScheduledService extends SmsSyncServices {
@@ -52,7 +49,8 @@ public void executeTask(Intent intent) {
5249
public void onFinished(List<SyncUrl> result) {
5350
for (SyncUrl syncUrl : result) {
5451
new ProcessMessage(CheckTaskScheduledService.this,
55-
new ProcessSms(CheckTaskScheduledService.this)).performTask(syncUrl);
52+
new ProcessSms(CheckTaskScheduledService.this))
53+
.performTask(syncUrl);
5654
}
5755
}
5856

@@ -63,9 +61,4 @@ public void onError(Exception exception) {
6361
});
6462

6563
}
66-
67-
@Produce
68-
public LogEvent readLog() {
69-
return new LogEvent();
70-
}
7164
}

0 commit comments

Comments
 (0)