Skip to content

Commit da5ef5f

Browse files
author
davidgraeff
committed
NFC fixes
1 parent a4f6895 commit da5ef5f

File tree

3 files changed

+25
-30
lines changed

3 files changed

+25
-30
lines changed

‎app/app.iml‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
<component name="FacetManager">
44
<facet type="android" name="Android">
55
<configuration>
6-
<option name="SELECTED_BUILD_VARIANT" value="debug" />
7-
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
8-
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
9-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
10-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
6+
<option name="SELECTED_BUILD_VARIANT" value="release" />
7+
<option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
8+
<option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseJava" />
9+
<option name="SOURCE_GEN_TASK_NAME" value="generateReleaseSources" />
1110
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1211
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
1312
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -22,26 +21,21 @@
2221
</facet>
2322
</component>
2423
<component name="NewModuleRootManager" inherit-compiler-output="false">
25-
<output url="file://$MODULE_DIR$/build/classes/debug" />
24+
<output url="file://$MODULE_DIR$/build/classes/release" />
2625
<exclude-output />
2726
<content url="file://$MODULE_DIR$">
28-
<sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" />
29-
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" generated="true" />
30-
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" generated="true" />
31-
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" />
32-
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
33-
<sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
38-
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
39-
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
40-
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
41-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
42-
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
43-
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
44-
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
27+
<sourceFolder url="file://$MODULE_DIR$/build/source/r/release" isTestSource="false" generated="true" />
28+
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/release" isTestSource="false" generated="true" />
29+
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/release" isTestSource="false" generated="true" />
30+
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/release" isTestSource="false" generated="true" />
31+
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/release" type="java-resource" />
32+
<sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
33+
<sourceFolder url="file://$MODULE_DIR$/src/release/assets" isTestSource="false" />
34+
<sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
35+
<sourceFolder url="file://$MODULE_DIR$/src/release/jni" isTestSource="false" />
36+
<sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
37+
<sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
4539
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
4640
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
4741
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />

‎app/src/main/java/oly/netpowerctrl/datastructure/DeviceCollection.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public String toJSON() throws IOException {
6767

6868
writer.beginObject();
6969
writer.name("version").value(PROTOCOLVERSION);
70+
writer.name("source_device").value(android.os.Build.MODEL);
7071
writer.name("devices").beginArray();
7172
for (DeviceInfo di : devices) {
7273
di.toJSON(writer);

‎app/src/main/java/oly/netpowerctrl/main/NetpowerctrlActivity.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -185,30 +185,30 @@ public NdefMessage createNdefMessage(NfcEvent event) {
185185
String text = null;
186186
try {
187187
text = DeviceCollection.fromDevices(NetpowerctrlApplication.instance.configuredDevices).toJSON();
188-
Log.w("json", text);
189188
} catch (IOException ignored) {
190-
Log.w("json", ignored.toString());
189+
Log.w("DeviceCollection.fromDevices", ignored.toString());
191190
return null;
192191
}
193192

194193
return new NdefMessage(
195-
NdefRecord.createApplicationRecord("oly.netpowerctrl"),
196-
NdefRecord.createMime("application/oly.netpowerctrl", text.getBytes())
194+
NdefRecord.createMime("application/oly.netpowerctrl", text.getBytes()),
195+
NdefRecord.createApplicationRecord("oly.netpowerctrl")
197196
);
198197
}
199198

200199
@Override
201200
public void onResume() {
202201
super.onResume();
203202
// Check to see that the Activity started due to an Android Beam
204-
String intentAction = getIntent().getAction();
203+
Intent intent = getIntent();
204+
String intentAction = intent.getAction();
205+
205206
if (NfcAdapter.ACTION_NDEF_DISCOVERED.equals(intentAction)) {
206-
Intent intent = getIntent();
207207
Parcelable[] rawMessages = intent.getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES);
208208
// only one message sent during the beam
209209
assert rawMessages != null;
210210
NdefMessage msg = (NdefMessage) rawMessages[0];
211-
NFC.showSelectionDialog(this, new String(msg.getRecords()[1].getPayload()));
211+
NFC.showSelectionDialog(this, new String(msg.getRecords()[0].getPayload()));
212212
}
213213

214214
// Start listener and request new device states

0 commit comments

Comments
 (0)