Skip to content

Commit 7245602

Browse files
committed
it compiles again... mostly. Example app does not work again, yet. I am on it.
1 parent 23d327d commit 7245602

File tree

9 files changed

+37
-33
lines changed

9 files changed

+37
-33
lines changed

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ android {
1515
targetSdkVersion 29
1616
versionCode 1
1717
versionName "1.0"
18-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
18+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1919
}
2020
buildTypes {
2121
release {
@@ -28,10 +28,10 @@ android {
2828
dependencies {
2929
//implementation fileTree(include: ['*.jar'], dir: 'libs')
3030

31-
implementation 'com.android.support:appcompat-v7:28.0.0'
32-
implementation 'com.android.support.constraint:constraint-layout:2.0.4'
31+
implementation 'androidx.appcompat:appcompat:1.0.0'
32+
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
3333
implementation files('libs\\ASAPJava.jar')
3434
testImplementation 'junit:junit:4.13.1'
35-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
36-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
35+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
36+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
3737
}

app/src/androidTest/java/net/sharksystem/asap/android/ExampleInstrumentedTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package net.sharksystem.asap.android;
22

33
import android.content.Context;
4-
import android.support.test.InstrumentationRegistry;
5-
import android.support.test.runner.AndroidJUnit4;
4+
import androidx.test.platform.app.InstrumentationRegistry;
5+
import androidx.test.ext.junit.runners.AndroidJUnit4;
66

77
import org.junit.Test;
88
import org.junit.runner.RunWith;

app/src/androidTest/java/net/sharksystem/asap/android/LoRaEngine/Base64Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33

44
import android.content.Context;
5-
import android.support.test.InstrumentationRegistry;
6-
import android.support.test.runner.AndroidJUnit4;
5+
import androidx.test.platform.app.InstrumentationRegistry;
6+
import androidx.test.ext.junit.runners.AndroidJUnit4;
77

88
import org.junit.FixMethodOrder;
99
import org.junit.Test;

app/src/androidTest/java/net/sharksystem/asap/android/LoRaEngine/BasicCommunicationTest.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,8 @@
44
import android.bluetooth.BluetoothDevice;
55
import android.bluetooth.BluetoothSocket;
66
import android.content.Context;
7-
import android.support.test.InstrumentationRegistry;
8-
import android.support.test.runner.AndroidJUnit4;
9-
10-
import net.sharksystem.asap.android.lora.ASAPLoRaException;
11-
import net.sharksystem.asap.android.lora.LoRaBTInputOutputStream;
12-
import net.sharksystem.asap.android.lora.messages.DiscoverASAPLoRaMessage;
7+
import androidx.test.platform.app.InstrumentationRegistry;
8+
import androidx.test.ext.junit.runners.AndroidJUnit4;
139

1410
import org.junit.BeforeClass;
1511
import org.junit.FixMethodOrder;

app/src/androidTest/java/net/sharksystem/asap/android/LoRaEngine/SimultaneousCommunicationTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
import android.bluetooth.BluetoothDevice;
55
import android.bluetooth.BluetoothSocket;
66
import android.content.Context;
7-
import android.support.test.InstrumentationRegistry;
8-
import android.support.test.runner.AndroidJUnit4;
7+
import androidx.test.platform.app.InstrumentationRegistry;
8+
import androidx.test.ext.junit.runners.AndroidJUnit4;
99

1010
import org.junit.BeforeClass;
1111
import org.junit.FixMethodOrder;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import android.os.Message;
1212
import android.os.Messenger;
1313
import android.os.RemoteException;
14-
import android.support.annotation.CallSuper;
15-
import android.support.v7.app.AppCompatActivity;
14+
import androidx.annotation.CallSuper;
15+
import androidx.appcompat.app.AppCompatActivity;
1616
import android.util.Log;
1717
import android.widget.Toast;
1818

app/src/main/java/net/sharksystem/asap/android/apps/ASAPAndroidPeer.java

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import android.content.Context;
77
import android.content.Intent;
88
import android.content.pm.PackageManager;
9-
import android.support.annotation.CallSuper;
10-
import android.support.v4.app.ActivityCompat;
11-
import android.support.v4.content.ContextCompat;
9+
import androidx.annotation.CallSuper;
10+
import androidx.core.app.ActivityCompat;
11+
import androidx.core.content.ContextCompat;
1212
import android.util.Log;
1313
import android.widget.Toast;
1414

@@ -31,8 +31,8 @@
3131
import java.util.Map;
3232
import java.util.Set;
3333

34-
import static android.support.v4.content.PermissionChecker.PERMISSION_DENIED;
35-
import static android.support.v4.content.PermissionChecker.PERMISSION_GRANTED;
34+
import static androidx.core.content.PermissionChecker.PERMISSION_DENIED;
35+
import static androidx.core.content.PermissionChecker.PERMISSION_GRANTED;
3636

3737
public class ASAPAndroidPeer extends BroadcastReceiver implements ASAPPeer {
3838
private static final int MY_ASK_FOR_PERMISSIONS_REQUEST = 100;
@@ -133,10 +133,6 @@ private ASAPAndroidPeer(Collection<CharSequence> supportedFormats,
133133
// remember me
134134
ASAPAndroidPeer.singleton = this;
135135

136-
// create proxy
137-
this.asapPeerApplicationSide =
138-
new ASAPPeerFS(asapOwner, this.getASAPRootFolder(), supportedFormats);
139-
140136
// set context
141137
this.setActivity(initialActivity);
142138

@@ -160,7 +156,7 @@ private ASAPAndroidPeer(Collection<CharSequence> supportedFormats,
160156
/**
161157
* Start initialized ASAPAndroidPeer
162158
*/
163-
public static void startPeer() {
159+
public static void startPeer() throws IOException, ASAPException {
164160
ASAPAndroidPeer.getASAPAndroidPeer().start();
165161
}
166162

@@ -175,7 +171,7 @@ public static boolean peerStarted() {
175171
* <b>Never forget to launch your application.</b>
176172
*/
177173
@CallSuper
178-
public void start() {
174+
public void start() throws IOException, ASAPException {
179175
if(!this.started) {
180176
Log.d(this.getLogStart(), "initialize and launch ASAP Service");
181177
// collect parameters
@@ -213,6 +209,12 @@ public void start() {
213209
} else {
214210
Log.e(this.getLogStart(), "try to re-start application - not allowed. Ignored");
215211
}
212+
213+
// finally create proxy
214+
this.asapPeerApplicationSide =
215+
new ASAPPeerFS(asapOwner, this.getASAPRootFolder(), supportedFormats);
216+
217+
216218
}
217219

218220
private void askForPermissions() {

app/src/main/java/net/sharksystem/asap/android/example/ASAPInitialExampleActivity.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import android.content.Intent;
44
import android.os.Bundle;
5-
import android.support.v7.app.AppCompatActivity;
5+
import androidx.appcompat.app.AppCompatActivity;
66
import android.widget.Toast;
77

8+
import net.sharksystem.asap.ASAP;
89
import net.sharksystem.asap.ASAPException;
910
import net.sharksystem.asap.android.apps.ASAPAndroidPeer;
1011

@@ -20,9 +21,14 @@ protected void onCreate(Bundle savedInstanceState) {
2021
// initialize ASAP peer (application side)
2122
if(!ASAPAndroidPeer.peerInitialized()) {
2223
Collection<CharSequence> formats = new ArrayList<>();
24+
25+
// add a name that identifies your app which also identifies general message format
2326
formats.add(ExampleAppDefinitions.ASAP_EXAMPLE_APPNAME);
2427

25-
ASAPAndroidPeer.initializePeer(formats, this);
28+
// generate a name for this peer
29+
String peerName = ASAP.createUniqueID();
30+
31+
ASAPAndroidPeer.initializePeer(peerName, formats, this);
2632
}
2733

2834
// start ASAP peer (service side)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import android.content.pm.PackageManager;
77
import android.os.IBinder;
88
import android.os.Messenger;
9-
import android.support.v4.content.ContextCompat;
9+
import androidx.core.content.ContextCompat;
1010
import android.util.Log;
1111

1212
import net.sharksystem.asap.ASAPEnvironmentChangesListener;

0 commit comments

Comments
 (0)