build: Upgrade underlying NFD/ndn-cxx to 0.7.0
Change-Id: I3b0b3a6c5b64ce821ca5a0f7831220d01594fa70
diff --git a/app/build.gradle b/app/build.gradle
index 7de47dd..ed87e86 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@
applicationId "net.named_data.nfd"
minSdkVersion 23
targetSdkVersion 29
- versionCode 4013
- versionName "0.6.6-1 (NFD 0.6.6)"
+ versionCode 4018
+ versionName "0.7.0-1 (NFD 0.7.0)"
multiDexEnabled true
}
compileOptions {
diff --git a/app/src/main/java/net/named_data/nfd/MainActivity.java b/app/src/main/java/net/named_data/nfd/MainActivity.java
index a6824c2..b36cad4 100644
--- a/app/src/main/java/net/named_data/nfd/MainActivity.java
+++ b/app/src/main/java/net/named_data/nfd/MainActivity.java
@@ -1,6 +1,6 @@
/* -*- Mode:jde; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2015-2019 Regents of the University of California
+ * Copyright (c) 2015-2020 Regents of the University of California
* <p/>
* This file is part of NFD (Named Data Networking Forwarding Daemon) Android.
* See AUTHORS.md for complete list of NFD Android authors and contributors.
@@ -28,6 +28,8 @@
import com.intel.jndn.management.types.FaceStatus;
import com.intel.jndn.management.types.RibEntry;
+import net.named_data.jndn.encoding.Tlv0_3WireFormat;
+import net.named_data.jndn.encoding.WireFormat;
import net.named_data.nfd.utils.G;
import net.named_data.nfd.wifidirect.utils.NDNController;
@@ -48,6 +50,8 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
+ WireFormat.setDefaultWireFormat(Tlv0_3WireFormat.get());
+
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
diff --git a/app/src/main/java/net/named_data/nfd/RouteInfoFragment.java b/app/src/main/java/net/named_data/nfd/RouteInfoFragment.java
index f20ee18..43bef32 100644
--- a/app/src/main/java/net/named_data/nfd/RouteInfoFragment.java
+++ b/app/src/main/java/net/named_data/nfd/RouteInfoFragment.java
@@ -1,6 +1,6 @@
/* -*- Mode:jde; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2015-2019 Regents of the University of California
+ * Copyright (c) 2015-2020 Regents of the University of California
* <p/>
* This file is part of NFD (Named Data Networking Forwarding Daemon) Android.
* See AUTHORS.md for complete list of NFD Android authors and contributors.
@@ -19,6 +19,7 @@
package net.named_data.nfd;
+import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.os.AsyncTask;
@@ -325,6 +326,7 @@
return m_ribEntry.getRoutes().get(position).getFaceId();
}
+ @SuppressLint("SetTextI18n")
@Override
public View getView(int position, View convertView, ViewGroup parent) {
ListItemHolder holder;
@@ -345,7 +347,12 @@
if (m_faces != null) {
FaceStatus status = m_faces.get(r.getFaceId());
- faceInfo += " (" + status.getRemoteUri() + ")";
+ if (status != null) {
+ faceInfo += " (" + status.getRemoteUri() + ")";
+ }
+ else {
+ faceInfo += " (ERROR: face not found)";
+ }
}
holder.m_title.setText(faceInfo);
diff --git a/app/src/main/jni/Android.mk b/app/src/main/jni/Android.mk
index 1f576eb..c1c96d0 100644
--- a/app/src/main/jni/Android.mk
+++ b/app/src/main/jni/Android.mk
@@ -10,8 +10,8 @@
include $(BUILD_SHARED_LIBRARY)
# Explicitly define versions of precompiled modules
-$(call import-module,../packages/nfd/0.6.6)
-$(call import-module,../packages/ndn_cxx/0.6.6-1)
-$(call import-module,../packages/boost/1.70.0)
-$(call import-module,../packages/sqlite/3.18.0)
-$(call import-module,../packages/openssl/1.1.1-pre8)
+$(call import-module,../packages/nfd/0.7.0)
+$(call import-module,../packages/ndn_cxx/0.7.0)
+$(call import-module,../packages/boost/1.73.0)
+$(call import-module,../packages/sqlite/3.32.1)
+$(call import-module,../packages/openssl/1.1.1g)
diff --git a/app/src/main/jni/nfd-wrapper.cpp b/app/src/main/jni/nfd-wrapper.cpp
index 7b72430..f79d31d 100644
--- a/app/src/main/jni/nfd-wrapper.cpp
+++ b/app/src/main/jni/nfd-wrapper.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2015-2019 Regents of the University of California
+ * Copyright (c) 2015-2020 Regents of the University of California
*
* This file is part of NFD (Named Data Networking Forwarding Daemon) Android.
* See AUTHORS.md for complete list of NFD Android authors and contributors.
@@ -92,7 +92,7 @@
type any
}
}
- localhop_security
+ prefix_announcement_validation
{
trust-anchor
{
@@ -168,7 +168,6 @@
};
static unique_ptr<Runner> g_runner;
-static std::thread g_thread;
static std::map<std::string, std::string> g_params;
} // namespace nfd
@@ -225,7 +224,7 @@
::setenv("HOME", nfd::g_params["homePath"].c_str(), true);
NFD_LOG_INFO("Use [" << nfd::g_params["homePath"] << "] as a security storage");
- nfd::g_thread = std::thread([] {
+ auto thread = std::thread([] {
nfd::resetGlobalIoService();
NFD_LOG_INFO("Starting NFD...");
@@ -256,6 +255,7 @@
nfd::resetGlobalIoService();
NFD_LOG_INFO("NFD stopped");
});
+ thread.detach();
}
}
diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/1174680317794011972.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/12007668794044348844.png
similarity index 100%
rename from app/src/main/play/listings/en-US/graphics/phone-screenshots/1174680317794011972.png
rename to app/src/main/play/listings/en-US/graphics/phone-screenshots/12007668794044348844.png
Binary files differ
diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/8610548870873111104.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/14995211209772951950.png
similarity index 100%
rename from app/src/main/play/listings/en-US/graphics/phone-screenshots/8610548870873111104.png
rename to app/src/main/play/listings/en-US/graphics/phone-screenshots/14995211209772951950.png
Binary files differ
diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/9314260737139509802.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/1606951598295458325.png
similarity index 100%
rename from app/src/main/play/listings/en-US/graphics/phone-screenshots/9314260737139509802.png
rename to app/src/main/play/listings/en-US/graphics/phone-screenshots/1606951598295458325.png
Binary files differ
diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/9314260737139509802.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/2797505759625413406.png
similarity index 100%
copy from app/src/main/play/listings/en-US/graphics/phone-screenshots/9314260737139509802.png
copy to app/src/main/play/listings/en-US/graphics/phone-screenshots/2797505759625413406.png
Binary files differ
diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/13088611630469511818.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/351647500174297761.png
similarity index 100%
rename from app/src/main/play/listings/en-US/graphics/phone-screenshots/13088611630469511818.png
rename to app/src/main/play/listings/en-US/graphics/phone-screenshots/351647500174297761.png
Binary files differ
diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/13088611630469511818.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/4728587754154587625.png
similarity index 100%
copy from app/src/main/play/listings/en-US/graphics/phone-screenshots/13088611630469511818.png
copy to app/src/main/play/listings/en-US/graphics/phone-screenshots/4728587754154587625.png
Binary files differ
diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/1174680317794011972.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/5330727830694217599.png
similarity index 100%
copy from app/src/main/play/listings/en-US/graphics/phone-screenshots/1174680317794011972.png
copy to app/src/main/play/listings/en-US/graphics/phone-screenshots/5330727830694217599.png
Binary files differ
diff --git a/app/src/main/play/listings/en-US/graphics/phone-screenshots/8610548870873111104.png b/app/src/main/play/listings/en-US/graphics/phone-screenshots/5462748549381729952.png
similarity index 100%
copy from app/src/main/play/listings/en-US/graphics/phone-screenshots/8610548870873111104.png
copy to app/src/main/play/listings/en-US/graphics/phone-screenshots/5462748549381729952.png
Binary files differ
diff --git a/app/src/main/play/release-notes/en-US/internal.txt b/app/src/main/play/release-notes/en-US/internal.txt
new file mode 100644
index 0000000..c0ab6ac
--- /dev/null
+++ b/app/src/main/play/release-notes/en-US/internal.txt
@@ -0,0 +1,3 @@
+- Add option to enable unsolicited data caching
+- Upgrade NFD/ndn-cxx to version 0.6.6
+- Switch to Boost 1.70.0
\ No newline at end of file
diff --git a/app/src/main/play/release-notes/en-US/production.txt b/app/src/main/play/release-notes/en-US/production.txt
index 21119db..7f1aead 100644
--- a/app/src/main/play/release-notes/en-US/production.txt
+++ b/app/src/main/play/release-notes/en-US/production.txt
@@ -1,5 +1 @@
-- A new bottom navigation menu
-- A new nicer style for the drawer navigation menu
-- Fix bug with ping unexpectedly starting after reopening app
-- Fix crash if pressing HOME key while ping client is running
-- Codebase transitioned to AndroidX framework
\ No newline at end of file
+NFD and ndn-cxx updated to version 0.7.0
\ No newline at end of file
