KISS FEND Fix

AndroidManifest.xml

@@ -89,6 +89,29 @@
 		android:parentActivityName=".PrefsAct"
 		android:launchMode="singleTop"
 		/>
+	<activity android:name=".DigiPrefs"
+		android:label="@string/p__digipeating"
+		android:parentActivityName=".PrefsAct"
+		android:launchMode="singleTop"
+		android:configChanges="orientation|keyboardHidden|screenSize" />
+	<activity android:name=".IgatePrefs"
+		android:label="@string/p__igating"
+		android:parentActivityName=".PrefsAct"
+		android:launchMode="singleTop"
+		android:configChanges="orientation|keyboardHidden|screenSize" />
+
+	<activity android:name=".CompressedPrefs"
+		android:label="@string/p__location_compressed_settings"
+		android:parentActivityName=".PrefsAct"
+		android:launchMode="singleTop"
+		android:configChanges="orientation|keyboardHidden|screenSize" />
+
+	<activity android:name=".MessagingPrefs"
+		android:label="@string/p__messaging"
+		android:parentActivityName=".PrefsAct"
+		android:launchMode="singleTop"
+		android:configChanges="orientation|keyboardHidden|screenSize" />		
+
 	<activity android:name=".GoogleMapAct" android:label="@string/app_map"
 		android:launchMode="singleTop"
 		android:parentActivityName=".HubActivity"

README.md

@@ -29,15 +29,31 @@ for your signing key, or the map view will remain blank.
 Having the Maps API key, do the following to compile and install an APK:
 
 ```bash
-git clone https://github.com/ge0rg/aprsdroid/
+sudo apt-get install -y git openjdk-8-jdk vim-nox wget unzip
+
+cmdline_tool_file="commandlinetools-linux-6609375_latest.zip"
+export ANDROID_SDK_ROOT="$(pwd)/android"
+mkdir -p "${ANDROID_SDK_ROOT}"
+wget "https://dl.google.com/android/repository/${cmdline_tool_file}"
+unzip "${cmdline_tool_file}" -d "${ANDROID_SDK_ROOT}/cmdline-tools"
+rm -f "${cmdline_tool_file}"
+export PATH="${ANDROID_SDK_ROOT}/cmdline-tools/tools/bin:${PATH}"
+export PATH="${ANDROID_SDK_ROOT}/platform-tools:${PATH}"
+export PATH="${ANDROID_SDK_ROOT}/emulator:${PATH}"
+mkdir "${ANDROID_SDK_ROOT}/licenses"
+echo 24333f8a63b6825ea9c5514f83c2829b004d1fee > "${ANDROID_SDK_ROOT}/licenses/android-sdk-license"
+echo 84831b9409646a918e30573bab4c9c91346d8abd > "${ANDROID_SDK_ROOT}/licenses/android-sdk-preview-license"
+sdkmanager --install emulator 'system-images;android-24;default;armeabi-v7a'
+
+git clone https://github.com/na7q/aprsdroid/
 cd aprsdroid
 git submodule update --init --recursive
 # replace AI... with your API key:
 echo "mapsApiKey=AI..." > local.properties
 # for a debug build:
-./gradlew installDebug
+./gradlew assembleDebug
 # for a release build:
-./gradlew installRelease
+./gradlew assembleRelease
 ```
 
 

build.gradle

@@ -26,7 +26,6 @@ plugins {
 	// obtain revision from git
 	id 'org.ajoberstar.grgit' version '1.6.0'
 	// gradle-amazon-app-store-publisher
-	id "app.brant.amazonappstorepublisher" version "0.1.0"
 }
 
 allprojects {
@@ -69,13 +68,6 @@ def mapsApiKey() {
 	properties.getProperty('mapsApiKey', "AIzaSyA12R_iI_upYQ33FWnPU_8GlMKrEmjDxiQ")
 }
 
-amazon {
-	securityProfile = file("amazon-publish-credentials.json")
-	applicationId = "amzn1.devportal.mobileapp.90ffde1571a347f8a100e1083c64812e"
-	pathToApks = [ file("build/outputs/apk/release/aprsdroid-release.apk") ]
-	replaceEdit = true
-}
-
 android {
 	compileSdkVersion 33
 	buildToolsVersion "33.0.2"

res/menu/options.xml

@@ -16,6 +16,10 @@
 		android:title="@string/clear_log"
 		android:alphabeticShortcut="c"
 		android:icon="@android:drawable/ic_menu_delete" />
+	<item android:id="@+id/clearallmessages"
+		android:title="@string/clearallmessages"
+		android:alphabeticShortcut="d"
+		android:icon="@android:drawable/ic_menu_delete" />		
 	<item android:id="@+id/preferences"
 		android:title="@string/preferences"
 		android:alphabeticShortcut="p"

res/values/arrays.xml

@@ -26,14 +26,24 @@
 	</string-array>
 	<string-array name="p_link_e">
 		<item>@string/p_link_bt</item>
+		<item>@string/p_link_ble</item>
 		<item>@string/p_link_usb</item>
 		<item>@string/p_link_tcpip</item>
 	</string-array>
 	<string-array name="p_link_ev">
 		<item>bluetooth</item>
+		<item>ble</item>
 		<item>usb</item>
 		<item>tcpip</item>
 	</string-array>
+	<string-array name="p_afsk_e">
+		<item>@string/p_afsk_vox</item>
+		<item>@string/p_afsk_digirig</item>
+	</string-array>
+	<string-array name="p_afsk_ev">
+		<item>vox</item>
+		<item>digirig</item>
+	</string-array>	
 	<string-array name="p_afsk_out_ev">
 		<item>0</item>
 		<item>2</item>
@@ -85,6 +95,10 @@
 		<item>12</item> <item>13</item> <item>14</item> <item>15</item>
 	</string-array>
 
+	<string-array name="p_units_ev">
+		<item>1</item> <item>2</item>
+	</string-array>
+
 	<string-array name="ages">
 		<item>@string/age_30</item>
 		<item>@string/age_2h</item>
@@ -110,4 +124,14 @@
 		<item>460800</item>
 		<item>921600</item>
 	</string-array>
+    <string-array name="compressed_mice_status">
+        <item>Off Duty</item>
+        <item>En Route</item>
+        <item>In Service</item>
+        <item>Returning</item>
+        <item>Committed</item>
+        <item>Special</item>
+        <item>Priority</item>
+        <item>EMERGENCY!</item>
+	</string-array>			
 </resources>

res/values/strings.xml

@@ -61,7 +61,7 @@
 <string name="service_sm_no_gps">SmartBeaconing™ requires GPS!</string>
 <!-- service result codes -->
 <string name="post_error">Error</string>
-<string name="post_incmg">received</string>
+<string name="post_incmg">Received</string>
 <string name="post_info"></string>
 <string name="post_connecting">Connecting to %1$s:%2$d...</string>
 <string name="post_reconnect">Connection lost. Reconnect in %d seconds...</string>
@@ -108,6 +108,43 @@
 <string name="ad_trans">\n\nTranslation:</string>
 <string name="ad_homepage">Home Page</string>
 
+<string name="p_regenerate">Regenerate Packets</string>
+<string name="p_regenerate_summary">Dangerously regenerates heard packets with NO filter!!</string>
+
+<string name="p_digipeating">Digipeating Preferences</string>
+<string name="p_digipeating_entry">Digipeater</string>
+<string name="p_digipeating_summary">Enable Digipeater</string>
+<string name="p_digipeating_preferences">Digi &amp; Regen Functions</string>
+<string name="p_directonly_entry">Direct Only</string>
+<string name="p_directonly_summary">Only digipeats stations directly heard</string>
+
+<string name="p_igating">IGating Preferences</string>
+<string name="p_igating_entry">IGate</string>
+<string name="p_igating_summary">Enable IGate</string>
+<string name="p_igating_preferences">IGate Settings</string>
+
+<string name="p_aprsistraffic_entry">Suppress APRS-IS Traffic Log</string>
+<string name="p_aprsistraffic_summary">Suppresses all APRS-IS traffic in the log</string>
+
+<string name="p_aprsistorf_entry">Enable Bidirectional IGate</string>
+<string name="p_aprsistorf_summary">Allows messages to pass to RF</string>
+
+<string name="p_offlinemap">OSM Maps</string>
+<string name="p_offlinemap_entry">Enable offline mapping</string>
+<string name="p_offlinemap_summary">Uses locally hosted tile server</string>
+
+<string name="p_dedupe">Dedupe Timeout</string>
+<string name="p_dedupe_entry">Timeout in seconds</string>
+<string name="p_dedupe_summary">Digipeat timeout for duplicate packets</string>
+
+<string name="p_digipeaterpath">Digipeater Path</string>
+<string name="p_digipeaterpath_entry">Set Digi Path</string>
+<string name="p_digipeaterpath_summary">Paths to digipeat</string>
+
+<string name="p_igpath">Digi Path</string>
+<string name="p_igpath_entry">Set RF Digi Path</string>
+<string name="p_igpath_summary">APRS-IS to RF Digi Path</string>
+
 <!-- map view -->
 <string name="map_overlays">Overlays</string>
 <string name="map_google">Google: Map</string>
@@ -134,6 +171,8 @@
 <string name="export_log">Export Log</string>
 <string name="export_empty">Nothing to export</string>
 <string name="clear_log">Clear Log</string>
+<string name="clearallmessages">Clear Messages</string>
+
 <string name="quit">Quit</string>
 <string name="preferences">Preferences</string>
 <!-- preferences -->
@@ -153,6 +192,9 @@
 <string name="p_ssid">SSID</string>
 <string name="p_ssid_summary">Station type (1..15; 9=Mobile, 10=APRS-IS)</string>
 <string name="p_ssid_entry">Enter the SSID for your station</string>
+<string name="p_units_title">Distance Units</string>
+<string name="p_units">Unit Preference</string>
+<string name="p_units_entry">Select Distance Unit</string>
 <!-- array of station types (SSID) -->
 <string-array name="p_ssid_e">
 	<item>(none) Primary Station</item>
@@ -172,6 +214,12 @@
 	<item>14: Freight vehicle</item>
 	<item>15: Generic additional station</item>
 </string-array>
+
+<string-array name="p_units_e">
+	<item>Metric</item>
+	<item>Imperial</item>
+</string-array>
+
 <string name="p_symbol">APRS symbol</string>
 <string name="p_symbol_summary">Your symbol for map display</string>
 <string name="p_symbol_overlay">Overlay:</string>
@@ -182,6 +230,13 @@
 <string name="p_status_summary">The text after your coordinates</string>
 <string name="p_status_entry">Enter your beacon comment</string>
 <string name="p__connection">APRS Connection</string>
+<string name="p__digipeating">Digipeating Preferences</string>
+<string name="p__igating">IGating Preferences</string>
+<string name="p__messaging">Messaging Preferences</string>
+<string name="p__igaterf">Bidirectional Settings</string>
+<string name="p__igateserver">Server Settings</string>
+<string name="p__ratelimit">Transmit Rate Limiting</string>
+
 <string name="p_conntype">Connection Protocol</string>
 <string name="p_conntype_entry">Choose the connection protocol</string>
 <string name="p_link">Connection Type</string>
@@ -206,8 +261,12 @@
 <string name="p_aprsis_udp">UDP (send only)</string>
 <!-- array of TNC link types -->
 <string name="p_link_bt">Bluetooth SPP</string>
+<string name="p_link_ble">Bluetooth Low Energy</string>
 <string name="p_link_tcpip">TCP/IP</string>
 <string name="p_link_usb">USB Serial</string>
+<!-- array of AFSK modes -->
+<string name="p_afsk_vox">VOX</string>
+<string name="p_afsk_digirig">Digirig</string>
 <!-- array of location sources -->
 <string name="p_source_manual">Manual Position</string>
 <string name="p_source_periodic">Periodic GPS/Network Position</string>
@@ -241,14 +300,30 @@
 
 <!-- connection type properties -->
 <string name="p_host">Server</string>
+<string name="p_igserver">Server</string>
 <string name="p_host_summary">APRS-IS server (port 8080) to send beacons</string>
 <string name="p_host_entry">Enter the APRS-IS server hostname</string>
+<string name="p_igserver_entry">Enter the APRS-IS server hostname</string>
 <string name="p_host_hint">host:port</string>
+<string name="p_igserver_hint">host:port</string>
 <string name="p__position">Position Reports</string>
 <string name="p_locsource">Location Source</string>
 <string name="p_locsource_summary">Manual, Periodic or SmartBeaconing™</string>
 <string name="p__location">Location Settings</string>
 
+<string name="p__location_compressed_beacons">Normal Compressed Beacons</string>
+<string name="p__location_compressed_beacons_on">Send Compressed Beacons</string>
+<string name="p__location_compressed_beacons_off">Send Uncompressed Beacons</string>
+
+<string name="p__location_mice_beacons">Mic-E Compressed Beacons</string>
+<string name="p__location_mice_beacons_on">Send Mic-E Beacons</string>
+<string name="p__location_mice_beacons_off">Send Uncompressed Beacons</string>
+
+<string name="p__location_compressed_settings">Compressed Beacon Settings</string>
+<string name="p__location_compressed_summary">Normal &amp; Mic-E Compression</string>
+
+<string name="p__location_mice_status">Mic-E Status</string>
+
 <string name="p_smartbeaconing">SmartBeaconing™</string>
 <string name="p_sb_help">SmartBeaconing™ help</string>
 <string name="p_sb_fast_speed">Fast Speed [km/h]</string>
@@ -312,6 +387,30 @@
 <string name="status_linkoff">Error: %s</string>
 <string name="status_linkon">Connected: %s</string>
 
+<string name="p_messaging">Messaging Preferences</string>
+<string name="p_messaging_preferences">Advanced Messaging Options</string>
+<string name="p_message_retry">Message Retries</string>
+<string name="p_message_retry_entry">Number of messages to retry</string>
+<string name="p_message_retry_summary">Message retry limit</string>
+
+<string name="p_retry_interval">Retry Interval</string>
+<string name="p_retry_interval_entry">Retry interval start rate</string>
+<string name="p_retry_interval_summary">Rate doubles each retry</string>
+
+<string name="p_ackdupe_interval">Ack Dupe Timeout or Disable</string>
+<string name="p_ackdupe_interval_entry">Ack dupe timeout (0 = ack disabled)</string>
+<string name="p_ackdupe_interval_summary">Dupe acks allowed after timeout</string>
+
+<string name="p_ackdupetoggle">Ack Dupe Timeout</string>
+<string name="p_ackdupetoggle_summary">Sends dupe acks after the timeout period</string>
+
+<string name="p_msgdupetoggle">Duplicate Messages</string>
+<string name="p_msgdupetoggle_summary">Allows dupe messages after timeout period</string>
+
+<string name="p_msgdupetime_summary">Duplicate messages allowed after timeout</string>
+<string name="p_msgdupetime_entry">Dupe message timeout (0 = disabled)</string>
+<string name="p_msgdupetime_title">Dupe Message Timeout</string>
+
 <!-- AFSK settings -->
 <string name="p_aprs_path">APRS digi path</string>
 <string name="p_aprs_path_hint">hop 1, hop 2, ...</string>
@@ -325,6 +424,8 @@
 <string name="p_afsk_btsco">Bluetooth Headset</string>
 <string name="p_afsk_btsco_summary">Use Bluetooth (SCO) headset for AFSK</string>
 <string name="p_afsk_output">Audio Output</string>
+<string name="p_afsk_ptt">Use Push-to-Talk</string>
+<string name="p_afsk_pttport">Push-to-Talk Port</string>
 <string-array name="p_afsk_out_e">
 	<item>Voice Call</item>
 	<item>Ringtone</item>
@@ -334,21 +435,52 @@
 
 <!-- TCP server settings -->
 <string name="p_tcp_server_summary">APRS-IS TCP server (port 14580) to contact</string>
+<string name="p_igserver_summary">APRS-IS TCP server (port 14580) to contact</string>
 <string name="p_filterdist">Neighbor radius</string>
 <string name="p_filterdist_summary">Receive packets from stations in this radius</string>
 <string name="p_filterdist_entry">Radius around you to monitor for packets [km]</string>
 <string name="p_filter">Packet filter</string>
+<string name="p_igfilter">Packet filter</string>
 <string name="p_filter_hint">b/BUDDY o/OBJECT ...</string>
 <string name="p_filter_summary">Filter for incoming packets</string>
 <string name="p_filter_entry">Enter a filter for incoming packets</string>
 
+<string name="p_igfilter_hint">b/BUDDY o/OBJECT ...</string>
+<string name="p_igfilter_summary">Filter for incoming packets</string>
+<string name="p_igfilter_entry">Enter a filter for incoming packets</string>
+
+<string name="p_igconnectretry">Connection Retry Interval</string>
+<string name="p_igconnectretry_summary">Reconnect to server in seconds</string>
+<string name="p_igconnectretry_entry">Retry interval in seconds</string>
+
+<string name="p_ratelimit1">TX Rate Limit 1 Min</string>
+<string name="p_ratelimit1_summary">Limit Number of TX Packets in 1 Min Interval</string>
+<string name="p_ratelimit1_entry">Packet Limit at 1 Min Interval</string>
+
+<string name="p_ratelimit5">TX Rate Limit 5 Min</string>
+<string name="p_ratelimit5_summary">Limit Number of TX Packets in 5 Min Interval</string>
+<string name="p_ratelimit5_entry">Packet Limit at 5 Min Interval</string>
+
+<string name="p_timelastheard">Recently heard station timeout</string>
+<string name="p_timelastheard_summary">Timeout to pass messages to recently heard stations to RF</string>
+<string name="p_timelastheard_entry">Timeout in minutes</string>
+
+
 <string name="p_filterhelp">Message filter help</string>
 <string name="p_filterhelp_summary">Online reference for APRS-IS filters</string>
 
 <string name="p_sotimeout">TCP socket timeout</string>
 <string name="p_sotimeout_summary">Time before resetting the connection</string>
 <string name="p_sotimeout_entry">Timeout value in seconds (0 = disable)</string>
 
+<string name="p_igsotimeout">TCP socket timeout</string>
+<string name="p_igsotimeout_summary">Time before resetting the connection</string>
+<string name="p_igsotimeout_entry">Timeout value in seconds (0 = disable)</string>
+
+<string name="p_reconnect">TCP reconnect timeout</string>
+<string name="p_reconnect_summary">Time before reconnecting</string>
+<string name="p_reconnect_entry">Timeout value in seconds</string>
+
 <string name="p_mapfile">Map file name</string>
 <string name="p_mapfile_summary">MapsForge map file for APRSdroid</string>
 <string name="p_mapfile_choose">Choose map file</string>
@@ -434,4 +566,13 @@
 <string name="p_serial_notfound">No USB device found!</string>
 
 <string name="no_perm_text">The following permissions are required:</string>
+
+<!-- UV-PRO Control -->
+<string name="freq_control">Radio Freq Control</string>
+<string name="freq_control_summary">Freq</string>
+<string name="freq_control_options_summary">Sets Freq at Start</string>
+<string name="freq_control_options">Enable Radio Frequency Control</string>
+<string name="freq_control_title">Set Frequency</string>
+<string name="freq_control_hint">144.390</string>
+
 </resources>