Skip to content

Commit 5c2df2b

Browse files
thsc42thsc42
committed
that should work
1 parent e5dbb3b commit 5c2df2b

7 files changed

Lines changed: 34 additions & 26 deletions

File tree

‎app/src/main/java/net/sharksystem/asap/android/ASAP.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class ASAP {
1212
public static final String FOLDER = "folder";
1313
public static final String RECIPIENT = "recipient";
1414

15-
public static final String ASAP_RECEIVED_ACTION = "net.sharksystem.asap.received";
15+
public static final String ASAP_CHUNK_RECEIVED_ACTION = "net.sharksystem.asap.received";
1616

1717
public static final String URI = "ASAP_MESSAGE_URI";
1818
public static final String MESSAGE_CONTENT = "ASAP_MESSAGE_CONTENT";

app/src/main/java/net/sharksystem/asap/android/ASAPReceivedBroadcastIntent.java renamed to app/src/main/java/net/sharksystem/asap/android/ASAPChunkReceivedBroadcastIntent.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44

55
import net.sharksystem.asap.ASAPException;
66

7-
public class ASAPReceivedBroadcastIntent extends Intent {
7+
public class ASAPChunkReceivedBroadcastIntent extends Intent {
88

99
private CharSequence folder;
1010
private CharSequence uri;
1111
private int era;
1212
private CharSequence user;
1313

14-
public ASAPReceivedBroadcastIntent(CharSequence user, CharSequence folderName,
15-
CharSequence uri, int eraInt) throws ASAPException {
14+
public ASAPChunkReceivedBroadcastIntent(CharSequence user, CharSequence folderName,
15+
CharSequence uri, int eraInt) throws ASAPException {
1616
super();
1717

1818
if(folderName == null || uri == null || user == null)
1919
throw new ASAPException("parameters must no be null");
2020

21-
this.setAction(ASAP.ASAP_RECEIVED_ACTION);
21+
this.setAction(ASAP.ASAP_CHUNK_RECEIVED_ACTION);
2222

2323
this.putExtra(ASAP.ERA, eraInt);
2424
this.putExtra(ASAP.FOLDER, folderName);
@@ -31,7 +31,7 @@ public ASAPReceivedBroadcastIntent(CharSequence user, CharSequence folderName,
3131
this.user = user;
3232
}
3333

34-
public ASAPReceivedBroadcastIntent(Intent intent) throws ASAPException {
34+
public ASAPChunkReceivedBroadcastIntent(Intent intent) throws ASAPException {
3535
super();
3636

3737
// just parse extras

‎app/src/main/java/net/sharksystem/asap/android/apps/ASAPActivity.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -228,16 +228,16 @@ private void shutdownASAPServiceNotificationBroadcastReceiver() {
228228
/////////////////////////////////////////////////////////////////////////////////////
229229

230230
// asap application handles message from asap engine
231-
private void setupASAPReceivedBroadcastReceiver() {
231+
private void setupASAPChunkReceivedBroadcastReceiver() {
232232
Log.d(this.getLogStart(), "setup asap received bc receiver");
233233
IntentFilter filter = new IntentFilter();
234-
filter.addAction(ASAP.ASAP_RECEIVED_ACTION);
234+
filter.addAction(ASAP.ASAP_CHUNK_RECEIVED_ACTION);
235235

236236
// register
237237
this.registerReceiver(this.asapApplication, filter);
238238
}
239239

240-
private void shutdownASAPReceivedBroadcastReceiver() {
240+
private void shutdownASAPChunkReceivedBroadcastReceiver() {
241241
Log.d(this.getLogStart(), "shutdown asap received bc receiver");
242242
try {
243243
this.unregisterReceiver(this.asapApplication);
@@ -274,7 +274,7 @@ protected void onStart() {
274274
Log.d(this.getLogStart(), "onStart");
275275
this.asapApplication.setActivity(this);
276276
this.setupASAPServiceNotificationBroadcastReceiver();
277-
this.setupASAPReceivedBroadcastReceiver();
277+
this.setupASAPChunkReceivedBroadcastReceiver();
278278
this.bindServices();
279279
// (re-)start asap broadcast request is issued whenever connection was established
280280
// see ServiceConnection below
@@ -298,7 +298,7 @@ protected void onStop() {
298298
super.onStop();
299299
Log.d(this.getLogStart(), "onStop");
300300
this.shutdownASAPServiceNotificationBroadcastReceiver();
301-
this.shutdownASAPReceivedBroadcastReceiver();
301+
this.shutdownASAPChunkReceivedBroadcastReceiver();
302302
this.unbindServices();
303303

304304
// forget stored messages

‎app/src/main/java/net/sharksystem/asap/android/apps/ASAPApplication.java‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import android.content.BroadcastReceiver;
66
import android.content.Context;
77
import android.content.Intent;
8-
import android.content.IntentFilter;
98
import android.content.pm.PackageManager;
109
import android.support.v4.app.ActivityCompat;
1110
import android.support.v4.content.ContextCompat;
@@ -14,15 +13,14 @@
1413
import net.sharksystem.asap.ASAPChunkReceivedListener;
1514
import net.sharksystem.asap.ASAPException;
1615
import net.sharksystem.asap.android.ASAP;
17-
import net.sharksystem.asap.android.ASAPReceivedBroadcastIntent;
16+
import net.sharksystem.asap.android.ASAPChunkReceivedBroadcastIntent;
1817
import net.sharksystem.asap.android.ASAPServiceCreationIntent;
1918
import net.sharksystem.asap.android.Util;
20-
import net.sharksystem.asap.android.service2AppMessaging.ASAPServiceRequestNotifyBroadcastReceiver;
21-
import net.sharksystem.asap.android.service2AppMessaging.ASAPServiceRequestNotifyIntent;
2219

23-
import java.lang.reflect.Array;
2420
import java.util.ArrayList;
21+
import java.util.HashMap;
2522
import java.util.List;
23+
import java.util.Map;
2624

2725
import static android.support.v4.content.PermissionChecker.PERMISSION_DENIED;
2826
import static android.support.v4.content.PermissionChecker.PERMISSION_GRANTED;
@@ -265,11 +263,11 @@ public boolean getBTDiscovery() {
265263

266264
@Override
267265
public void onReceive(Context context, Intent intent) {
268-
Log.d(this.getLogStart(), "received asap received from asap engine/service");
266+
Log.d(this.getLogStart(), "received asap chunk received from asap engine/service");
269267

270268
try {
271-
ASAPReceivedBroadcastIntent asapReceivedIntent
272-
= new ASAPReceivedBroadcastIntent(intent);
269+
ASAPChunkReceivedBroadcastIntent asapReceivedIntent
270+
= new ASAPChunkReceivedBroadcastIntent(intent);
273271

274272
// call listener - that's me in that case
275273
this.chunkReceived(
@@ -284,13 +282,22 @@ public void onReceive(Context context, Intent intent) {
284282
}
285283
}
286284

285+
private Map<CharSequence, ASAPChunkReceivedListener> chunkReceivedListener = new HashMap<>();
287286
public void chunkReceived(String sender, String uri, String foldername, int era) {
288287
Log.d(this.getLogStart(), "got chunk received message: "
289288
+ sender + " | " + uri + " | " + foldername + " | " + era);
290289

291290
Log.d(this.getLogStart(), "should inform apps about it");
292291
}
293292

293+
public void addChunkReceivedListener(CharSequence uri, ASAPChunkReceivedListener listener) {
294+
this.chunkReceivedListener.put(uri, listener);
295+
}
296+
297+
public void removeChunkReceivedListener(CharSequence uri) {
298+
this.chunkReceivedListener.remove(uri);
299+
}
300+
294301
public List<CharSequence> getOnlinePeerList() {
295302
return this.onlinePeerList;
296303
}

‎app/src/main/java/net/sharksystem/asap/android/example/ASAPServiceTestActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected void onCreate(Bundle savedInstanceState) {
3434
// create broadcast receiver
3535
ExampleASAPBroadcastReceiver br = new ExampleASAPBroadcastReceiver();
3636
IntentFilter filter = new IntentFilter();
37-
filter.addAction(ASAP.ASAP_RECEIVED_ACTION);
37+
filter.addAction(ASAP.ASAP_CHUNK_RECEIVED_ACTION);
3838
this.registerReceiver(br, filter);
3939
}
4040

‎app/src/main/java/net/sharksystem/asap/android/example/ExampleASAPBroadcastReceiver.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
import net.sharksystem.asap.ASAPEngineFS;
99
import net.sharksystem.asap.ASAPException;
1010
import net.sharksystem.asap.ASAPStorage;
11-
import net.sharksystem.asap.android.ASAPReceivedBroadcastIntent;
11+
import net.sharksystem.asap.android.ASAPChunkReceivedBroadcastIntent;
1212

1313
import java.io.IOException;
1414

1515
public class ExampleASAPBroadcastReceiver extends BroadcastReceiver {
1616
@Override
1717
public void onReceive(Context context, Intent intent) {
1818
try {
19-
ASAPReceivedBroadcastIntent aaspIntent = new ASAPReceivedBroadcastIntent(intent);
19+
ASAPChunkReceivedBroadcastIntent aaspIntent = new ASAPChunkReceivedBroadcastIntent(intent);
2020

2121
String text = "ASAPService notified: "
2222
+ aaspIntent.getUser() + " / "

‎app/src/main/java/net/sharksystem/asap/android/service/ASAPService.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import net.sharksystem.asap.MultiASAPEngineFS;
1919
import net.sharksystem.asap.MultiASAPEngineFS_Impl;
2020
import net.sharksystem.asap.android.ASAP;
21-
import net.sharksystem.asap.android.ASAPReceivedBroadcastIntent;
21+
import net.sharksystem.asap.android.ASAPChunkReceivedBroadcastIntent;
2222
import net.sharksystem.asap.android.Util;
2323
import net.sharksystem.asap.android.bluetooth.BluetoothEngine;
2424
import net.sharksystem.asap.android.service2AppMessaging.ASAPServiceRequestNotifyIntent;
@@ -244,14 +244,15 @@ public void propagateProtocolStatus() {
244244
//////////////////////////////////////////////////////////////////////////////////////
245245

246246
private boolean broadcastOn = false;
247-
private List<ASAPReceivedBroadcastIntent> chunkReceivedBroadcasts = new ArrayList<>();
247+
private List<ASAPChunkReceivedBroadcastIntent> chunkReceivedBroadcasts = new ArrayList<>();
248248

249249
@Override
250250
public void chunkReceived(String sender, String uri, int era) {
251+
Log.d(LOGSTART, "was notified ba engine that chunk received. Uri: " + uri);
251252
// issue broadcast
252-
ASAPReceivedBroadcastIntent intent = null;
253+
ASAPChunkReceivedBroadcastIntent intent = null;
253254
try {
254-
intent = new ASAPReceivedBroadcastIntent(
255+
intent = new ASAPChunkReceivedBroadcastIntent(
255256
sender, this.getASAPRootFolderName(), uri, era);
256257
} catch (ASAPException e) {
257258
e.printStackTrace();

0 commit comments

Comments
 (0)