mirror of
https://github.com/cwinfo/envayasms.git
synced 2025-06-25 18:29:24 +00:00
version 3.0 - real-time AMQP connections; change server API format from XML to JSON, update PHP server library; persistent storage of pending messages
This commit is contained in:
Jesse Young
@ -3,18 +3,22 @@
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent" android:background="#333333">
|
||||
<ScrollView android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent" android:layout_weight="1">
|
||||
<TextView
|
||||
android:linksClickable="true"
|
||||
android:drawablePadding="5px"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/help"
|
||||
android:autoLink="web"
|
||||
android:textColor="#FFFFFF"
|
||||
android:layout_margin="5px">
|
||||
</TextView>
|
||||
</ScrollView>
|
||||
</TextView>
|
||||
<Button
|
||||
android:id="@+id/reset"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="10dp"
|
||||
android:onClick="resetClicked"
|
||||
android:text="Reset All Settings" />
|
||||
</LinearLayout>
|
||||
|
||||
@ -5,13 +5,17 @@
|
||||
android:layout_height="fill_parent"
|
||||
android:paddingLeft="8dp"
|
||||
android:paddingRight="8dp">
|
||||
<Spinner android:id="@+android:id/inbox_selector"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content">
|
||||
</Spinner>
|
||||
<ListView android:id="@android:id/list"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_weight="1"
|
||||
/>
|
||||
<TextView android:id="@android:id/empty"
|
||||
android:text="The inbox is empty."
|
||||
android:text="No messages found."
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:layout_weight="1"
|
||||
|
||||
@ -3,14 +3,46 @@
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent" android:background="#333333">
|
||||
<ScrollView android:id="@+id/info_scroll" android:layout_width="fill_parent"
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:orientation="vertical"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:clickable="true"
|
||||
android:onClick="infoClicked"
|
||||
android:padding="10px"
|
||||
android:background="#666666">
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/heading"
|
||||
android:textSize="15sp"
|
||||
android:textColor="#FFFFFF"
|
||||
android:gravity="center"
|
||||
></TextView>
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColor="#FFFFFF"
|
||||
android:gravity="center"
|
||||
android:id="@+id/info"
|
||||
></TextView>
|
||||
</LinearLayout>
|
||||
<ScrollView android:id="@+id/log_scroll" android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent" android:layout_weight="1">
|
||||
<TextView
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
android:id="@+id/info"
|
||||
android:id="@+id/log"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textColorLink="#FFFFFF"
|
||||
android:layout_margin="5px"></TextView>
|
||||
</ScrollView>
|
||||
<Button
|
||||
android:id="@+id/upgrade_button"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="20sp"
|
||||
android:onClick="upgradeClicked"
|
||||
android:text="" />
|
||||
</LinearLayout>
|
||||
|
||||
@ -11,6 +11,13 @@
|
||||
android:text="@string/test_phone_numbers">
|
||||
</TextView>
|
||||
|
||||
<CheckBox android:id="@+id/auto_add_outgoing"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:onClick="autoAddOutgoingClicked"
|
||||
android:text="Automatically add recipients of outgoing messages"
|
||||
/>
|
||||
|
||||
<ListView android:id="@android:id/list"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
|
||||
@ -9,9 +9,9 @@
|
||||
<item android:id="@+id/check_now"
|
||||
android:icon="@drawable/ic_menu_tick"
|
||||
android:title="@string/check_now" />
|
||||
<item android:id="@+id/forward_inbox"
|
||||
<item android:id="@+id/forward_saved"
|
||||
android:icon="@drawable/ic_menu_dialog"
|
||||
android:title="@string/forward_inbox" />
|
||||
android:title="@string/forward_saved" />
|
||||
<item android:id="@+id/retry_now"
|
||||
android:icon="@drawable/ic_menu_magnet"
|
||||
android:title="@string/retry_now" />
|
||||
|
||||
@ -1,18 +1,30 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">EnvayaSMS</string>
|
||||
<string name="running">EnvayaSMS running</string>
|
||||
<string name="disabled">EnvayaSMS disabled</string>
|
||||
<string name="started">EnvayaSMS started.</string>
|
||||
<string name="stopped">EnvayaSMS stopped.</string>
|
||||
<string name="log_view_title">EnvayaSMS : Log View</string>
|
||||
<string name="add_phone_title">EnvayaSMS : Add Phone</string>
|
||||
<string name="help_title">EnvayaSMS : Help</string>
|
||||
<string name='test_phone_numbers_title'>EnvayaSMS : Test Phone Numbers</string>
|
||||
<string name='ignored_phone_numbers_title'>EnvayaSMS : Ignored Phone Numbers</string>
|
||||
<string name='forward_saved_title'>EnvayaSMS : Forward Saved Messages</string>
|
||||
<string name='pending_messages_title'>EnvayaSMS : Pending Messages</string>
|
||||
<string name='settings_title'>EnvayaSMS : Settings</string>
|
||||
<string name="settings">Settings</string>
|
||||
<string name="test">Test Connection</string>
|
||||
<string name="check_now">Check Messages</string>
|
||||
<string name="help">Help</string>
|
||||
<string name="pending">Pending Msgs...</string>
|
||||
<string name="retry_now">Retry</string>
|
||||
<string name="forward_inbox">Fwd Inbox...</string>
|
||||
<string name='service_started'>New SMS will be forwarded to server</string>
|
||||
<string name='test_phone_numbers'>When running EnvayaSMS in Test Mode,
|
||||
<string name="forward_saved">Fwd Saved...</string>
|
||||
<string name='service_started'>New messages will be forwarded to server</string>
|
||||
<string name='test_phone_numbers'>When running Telerivet in Test Mode,
|
||||
EnvayaSMS will only forward SMS messages from the phone numbers
|
||||
listed below. (Incoming SMS messages from other phone numbers will be saved
|
||||
in the normal Messaging inbox, and outgoing messages will be ignored.)</string>
|
||||
in the normal Messaging inbox.)</string>
|
||||
<string name='ignored_phone_numbers'>
|
||||
EnvayaSMS will ignore SMS messages from the phone numbers listed below.
|
||||
Incoming messages from these senders will be saved in the normal Messaging inbox.</string>
|
||||
|
||||
23
res/xml/expansion_packs.xml
Normal file
23
res/xml/expansion_packs.xml
Normal file
@ -0,0 +1,23 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<PreferenceScreen
|
||||
android:key="pack01"
|
||||
android:title="SMS Expansion Pack 1"
|
||||
android:summary="...">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="market://details?id=org.envaya.sms.pack01"
|
||||
/>
|
||||
</PreferenceScreen>
|
||||
<PreferenceScreen
|
||||
android:key="pack02"
|
||||
android:title="SMS Expansion Pack 2"
|
||||
android:summary="...">
|
||||
<intent
|
||||
android:action="android.intent.action.VIEW"
|
||||
android:data="market://details?id=org.envaya.sms.pack02"
|
||||
/>
|
||||
</PreferenceScreen>
|
||||
</PreferenceScreen>
|
||||
@ -6,9 +6,11 @@
|
||||
android:key="enabled"
|
||||
android:title="Enable EnvayaSMS"
|
||||
android:defaultValue='false'
|
||||
android:summaryOn="All new SMS will be forwarded between phone and server"
|
||||
android:summaryOff="New SMS will not be forwarded between phone and server"
|
||||
></CheckBoxPreference>
|
||||
android:summaryOn="New messages will be forwarded between phone and server"
|
||||
android:summaryOff="New messages will not be forwarded between phone and server"
|
||||
></CheckBoxPreference>
|
||||
|
||||
<PreferenceCategory android:title="Server Settings">
|
||||
|
||||
<EditTextPreference
|
||||
android:key="server_url"
|
||||
@ -37,36 +39,42 @@
|
||||
android:entries="@array/check_intervals"
|
||||
android:entryValues="@array/check_intervals_values"
|
||||
></ListPreference>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:title="Messaging Settings">
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="keep_in_inbox"
|
||||
android:title="Keep new messages"
|
||||
android:summaryOff="Incoming SMS will not be stored in Messaging inbox"
|
||||
android:summaryOn="Incoming SMS will be stored in Messaging inbox"
|
||||
android:summaryOff="Incoming messages will not be stored in Messaging inbox"
|
||||
android:summaryOn="Incoming messages will be stored in Messaging inbox"
|
||||
></CheckBoxPreference>
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="call_notifications"
|
||||
android:title="Call notifications"
|
||||
android:summaryOff="EnvayaSMS will not notify server when phone receives an incoming call"
|
||||
android:summaryOn="EnvayaSMS will notify server when phone receives an incoming call"
|
||||
></CheckBoxPreference>
|
||||
|
||||
<ListPreference
|
||||
android:key="wifi_sleep_policy"
|
||||
android:title="Wi-Fi sleep policy"
|
||||
android:defaultValue="never"
|
||||
android:entries="@array/wifi_sleep_policies"
|
||||
android:entryValues="@array/wifi_sleep_policies_values"
|
||||
>
|
||||
</ListPreference>
|
||||
|
||||
android:summaryOff="Telerivet will not notify server when phone receives an incoming call"
|
||||
android:summaryOn="Telerivet will notify server when phone receives an incoming call"
|
||||
></CheckBoxPreference>
|
||||
|
||||
<PreferenceScreen
|
||||
android:key="send_limit"
|
||||
android:title="SMS rate limit"
|
||||
android:summary="..."
|
||||
>
|
||||
<intent
|
||||
android:action="android.intent.action.MAIN"
|
||||
android:targetPackage="org.envaya.sms"
|
||||
android:targetClass="org.envaya.sms.ui.ExpansionPacks" />
|
||||
</PreferenceScreen>
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="network_failover"
|
||||
android:title="Network failover"
|
||||
android:summaryOff="Do nothing if phone can't connect to server via Wi-Fi"
|
||||
android:summaryOn="Automatically switch to mobile data if phone can't connect to server via Wi-Fi"
|
||||
></CheckBoxPreference>
|
||||
android:key="forward_sent"
|
||||
android:title="Forward sent messages"
|
||||
android:summaryOff="SMS sent from Messaging app will not be forwarded to server"
|
||||
android:summaryOn="SMS sent from Messaging app will be forwarded to server"
|
||||
></CheckBoxPreference>
|
||||
|
||||
<PreferenceScreen
|
||||
android:key="ignored_numbers"
|
||||
@ -77,7 +85,7 @@
|
||||
android:action="android.intent.action.MAIN"
|
||||
android:targetPackage="org.envaya.sms"
|
||||
android:targetClass="org.envaya.sms.ui.IgnoredPhoneNumbers" />
|
||||
</PreferenceScreen>
|
||||
</PreferenceScreen>
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="test_mode"
|
||||
@ -96,16 +104,114 @@
|
||||
android:action="android.intent.action.MAIN"
|
||||
android:targetPackage="org.envaya.sms"
|
||||
android:targetClass="org.envaya.sms.ui.TestPhoneNumbers" />
|
||||
</PreferenceScreen>
|
||||
</PreferenceScreen>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
|
||||
<PreferenceScreen
|
||||
android:key="help"
|
||||
android:title="About EnvayaSMS"
|
||||
>
|
||||
<PreferenceCategory android:title="Networking Settings">
|
||||
|
||||
<ListPreference
|
||||
android:key="wifi_sleep_policy"
|
||||
android:title="Wi-Fi sleep policy"
|
||||
android:defaultValue="never"
|
||||
android:entries="@array/wifi_sleep_policies"
|
||||
android:entryValues="@array/wifi_sleep_policies_values"
|
||||
>
|
||||
</ListPreference>
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="network_failover"
|
||||
android:title="Network failover"
|
||||
android:summaryOff="Do nothing if phone can't connect to server via Wi-Fi"
|
||||
android:summaryOn="Automatically switch to mobile data if phone can't connect to server via Wi-Fi"
|
||||
></CheckBoxPreference>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:title="AMQP Settings (Real-Time Connection)">
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="amqp_enabled"
|
||||
android:title="Enable AMQP"
|
||||
android:summaryOff="AMQP is disabled"
|
||||
android:summaryOn="AMQP is enabled"
|
||||
></CheckBoxPreference>
|
||||
|
||||
<EditTextPreference
|
||||
android:key="amqp_host"
|
||||
android:title="AMQP Host"
|
||||
android:inputType="textUri"
|
||||
android:defaultValue=""
|
||||
android:dependency="amqp_enabled"
|
||||
></EditTextPreference>
|
||||
|
||||
<EditTextPreference
|
||||
android:key="amqp_port"
|
||||
android:title="AMQP Port"
|
||||
android:inputType="number"
|
||||
android:defaultValue="5672"
|
||||
android:dependency="amqp_enabled"
|
||||
></EditTextPreference>
|
||||
|
||||
<EditTextPreference
|
||||
android:key="amqp_vhost"
|
||||
android:title="AMQP Virtual Host"
|
||||
android:inputType="text"
|
||||
android:defaultValue="/"
|
||||
android:dependency="amqp_enabled"
|
||||
></EditTextPreference>
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="amqp_ssl"
|
||||
android:title="AMQP SSL"
|
||||
android:summaryOff="Off (Plain text)"
|
||||
android:summaryOn="On (Encrypted)"
|
||||
android:dependency="amqp_enabled"
|
||||
></CheckBoxPreference>
|
||||
|
||||
<EditTextPreference
|
||||
android:key="amqp_user"
|
||||
android:title="AMQP User"
|
||||
android:defaultValue=""
|
||||
android:dependency="amqp_enabled"
|
||||
></EditTextPreference>
|
||||
|
||||
<EditTextPreference
|
||||
android:key="amqp_password"
|
||||
android:title="AMQP Password"
|
||||
android:defaultValue=""
|
||||
android:password="true"
|
||||
android:dependency="amqp_enabled"
|
||||
></EditTextPreference>
|
||||
|
||||
<EditTextPreference
|
||||
android:key="amqp_queue"
|
||||
android:title="AMQP Queue Name"
|
||||
android:defaultValue=""
|
||||
android:dependency="amqp_enabled"
|
||||
></EditTextPreference>
|
||||
|
||||
<EditTextPreference
|
||||
android:key="amqp_heartbeat"
|
||||
android:title="AMQP Heartbeat (sec)"
|
||||
android:inputType="number"
|
||||
android:defaultValue="60"
|
||||
android:dependency="amqp_enabled"
|
||||
></EditTextPreference>
|
||||
|
||||
</PreferenceCategory>
|
||||
|
||||
<PreferenceCategory android:title="Help">
|
||||
<PreferenceScreen
|
||||
android:key="help"
|
||||
android:title="About EnvayaSMS"
|
||||
>
|
||||
<intent
|
||||
android:action="android.intent.action.MAIN"
|
||||
android:targetPackage="org.envaya.sms"
|
||||
android:targetClass="org.envaya.sms.ui.Help" />
|
||||
</PreferenceScreen>
|
||||
</PreferenceCategory>
|
||||
|
||||
</PreferenceScreen>
|
||||
Reference in New Issue
Block a user