Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
Renamed lib folder to libs which resolves our linking problem.
Browse files Browse the repository at this point in the history 
Reworked some of the application preferences and made some small refactoring changes as a result (moving methods to Utils to get base url and upload/sync built properly).
  • Loading branch information
@alanmcna
alanmcna committed Jun 18, 2012
1 parent 800f891 commit 54093a9
Show file tree
Hide file tree
Showing 7 changed files with 319 additions and 153 deletions.
0 lib/apache-mime4j-0.6.jar → libs/apache-mime4j-0.6.jar
View file
File renamed without changes.
0 lib/httpmime-4.0.1.jar → libs/httpmime-4.0.1.jar
View file
File renamed without changes.
53 changes: 38 additions & 15 deletions res/values/strings.xml
View file
Expand Up @@ -18,17 +18,10 @@
<string name="context_menu_upload">Upload</string>
<string name="context_menu_view">View</string>
<string name="context_menu_delete">Delete</string>

<string name="pref_upload_url_key">upload.uri</string>
<string name="pref_upload_url_title">Upload URI</string>
<string name="pref_upload_url_summary">Enter the URL to post files to Mahara</string>
<string name="pref_upload_url_default">http://solent-mahara.catalystdemo.co.uk/api/mobile/upload.php</string>

<string name="pref_sync_url_key">sync.uri</string>
<string name="pref_sync_url_title">Sync URI</string>
<string name="pref_sync_url_summary">Enter the sync URL to Mahara</string>
<string name="pref_sync_url_default">http://solent-mahara.catalystdemo.co.uk/api/mobile/sync.php</string>

<!-- Authentication Details -->
<string name="prefcat_authentication">Mahara Authentication Details</string>

<string name="pref_auth_username_key">auth.username</string>
<string name="pref_auth_username_title">Username</string>
<string name="pref_auth_username_summary">Enter your Mahara username</string>
Expand All @@ -37,6 +30,24 @@
<string name="pref_auth_token_title">Token</string>
<string name="pref_auth_token_summary">Enter your Mahara mobile token</string>

<!-- Connection Details -->
<string name="prefcat_connection">Mahara Connection Details</string>

<string name="pref_base_url_key">upload.base_uri</string>
<string name="pref_base_url_title">Mahara Base URI</string>
<string name="pref_base_url_summary">Enter the Mahara base URL for file posts &amp; syncronisation</string>
<string name="pref_base_url_default">http://solent-mahara.catalystdemo.co.uk</string>

<string name="pref_upload_url_key">upload.uri</string>
<string name="pref_upload_url_title">Upload URI</string>
<string name="pref_upload_url_summary">Enter the URL to post files to Mahara</string>
<string name="pref_upload_url_default">/api/mobile/upload.php</string>

<string name="pref_sync_url_key">sync.uri</string>
<string name="pref_sync_url_title">Sync URI</string>
<string name="pref_sync_url_summary">Enter the sync URL to Mahara</string>
<string name="pref_sync_url_default">/api/mobile/sync.php</string>

<string name="pref_upload_connection_key">upload.connection</string>
<string name="pref_upload_connection_title">Connection Type</string>
<string name="pref_upload_connection_summary">Restrict upload to the following connection types (default is fall back to handset settings):</string>
Expand All @@ -50,9 +61,12 @@
<item>wifi</item>
<item>mobile</item>
</string-array>

<string name="prefcat_advanced">Advanced</string>

<!-- Defaults -->
<string name="prefcat_defaults">Application Defaults</string>

<string name="prefcat_defaults_post">Default Post Settings</string>

<string name="pref_upload_journal_default_key">upload.journal.default</string>
<string name="pref_upload_journal_default_title">Journal post by default</string>
<string name="pref_upload_journal_default_summary">Check to select a default journal to post to</string>
Expand All @@ -76,7 +90,16 @@
<string name="pref_upload_tags_title">Tags</string>
<string name="pref_upload_tags_summary">Select the default tag to add to all uploaded files/journals.
Note: nothing will be shown until your first sync.</string>


<string name="prefcat_defaults_notification">Default Notification Settings</string>

<!-- Notification defaults -->
<string name="pref_sync_notification_key">sync.notification</string>
<string name="pref_sync_notification_title">Enable Sync Notifications</string>
<string name="pref_sync_notification_summary">Raise notifications if new messages are found during syncronisation.</string>

<string name="prefcat_advanced">Advanced Settings</string>

<string name="pref_sync_periodic_key">sync.periodic</string>
<string name="pref_sync_periodic_title">Periodic Sync</string>
<string name="pref_sync_periodic_summary">Enter the time in minutes to force a perioidc sync (0 or blank for none)</string>
Expand Down Expand Up @@ -105,7 +128,7 @@
<string name="uploadsaved">Upload saved</string>
<string name="uploadnotavailable">Sorry you can only uploaded files.</string>
<string name="capturefailed">Sorry there was a problem capturing that image.</string>
<string name="uploadingartifact">Uploading ...</string>
<string name="uploadingartifact">Uploading #8230;</string>
<string name="uploading">Uploading</string>
<string name="uploadnoconnection">Sorry you don\'t have a working data connection to upload at this time.</string>
<string name="uploadincomplete">Sorry you must enter a title and an entry for journal posts</string>
Expand Down Expand Up @@ -136,7 +159,7 @@
<string name="load_config_success">Successfully loaded the configuration file.</string>
<string name="scan_not_available">Sorry you need to install ZXing Barcode Scanner for this.</string>

<string name="login_authenticating">Authenticating...</string>
<string name="login_authenticating">Authenticating #8230;</string>
<string name="only_one_account">Currently you may only have at most one account at any one time.</string>

<string name="auth_result_no_connection">Server address or port number incorrect</string>
Expand Down
241 changes: 165 additions & 76 deletions res/xml/preferences.xml
View file
Expand Up @@ -3,83 +3,172 @@
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android">

<EditTextPreference
android:key="@string/pref_upload_url_key"
android:title="@string/pref_upload_url_title"
android:summary="@string/pref_upload_url_summary"
android:defaultValue="@string/pref_upload_url_default" />
<EditTextPreference
android:key="@string/pref_sync_url_key"
android:title="@string/pref_sync_url_title"
android:summary="@string/pref_sync_url_summary"
android:defaultValue="@string/pref_sync_url_default" />
<EditTextPreference
android:key="@string/pref_auth_username_key"
android:title="@string/pref_auth_username_title"
android:summary="@string/pref_auth_username_summary" />
<EditTextPreference
android:key="@string/pref_auth_token_key"
android:title="@string/pref_auth_token_title"
android:summary="@string/pref_auth_token_summary" />

<ListPreference
android:key="@string/pref_upload_connection_key"
android:title="@string/pref_upload_connection_title"
android:summary="@string/pref_upload_connection_summary"
android:defaultValue=""
android:entries="@array/pref_upload_connection_entry"
android:entryValues="@array/pref_upload_connection_entryValues"
android:dialogTitle="@string/pref_upload_connection_title" />

<PreferenceCategory
android:title="@string/prefcat_authentication">
<EditTextPreference
android:key="@string/pref_auth_username_key"
android:title="@string/pref_auth_username_title"
android:summary="@string/pref_auth_username_summary" />
<EditTextPreference
android:key="@string/pref_auth_token_key"
android:title="@string/pref_auth_token_title"
android:summary="@string/pref_auth_token_summary" />
</PreferenceCategory>

<PreferenceCategory
android:title="@string/prefcat_connection">

<EditTextPreference
android:key="@string/pref_base_url_key"
android:title="@string/pref_base_url_title"
android:summary="@string/pref_base_url_summary"
android:defaultValue="@string/pref_base_url_default" />
<EditTextPreference
android:key="@string/pref_upload_url_key"
android:title="@string/pref_upload_url_title"
android:summary="@string/pref_upload_url_summary"
android:defaultValue="@string/pref_upload_url_default" />
<EditTextPreference
android:key="@string/pref_sync_url_key"
android:title="@string/pref_sync_url_title"
android:summary="@string/pref_sync_url_summary"
android:defaultValue="@string/pref_sync_url_default" />
<ListPreference
android:key="@string/pref_upload_connection_key"
android:title="@string/pref_upload_connection_title"
android:summary="@string/pref_upload_connection_summary"
android:defaultValue=""
android:entries="@array/pref_upload_connection_entry"
android:entryValues="@array/pref_upload_connection_entryValues"
android:dialogTitle="@string/pref_upload_connection_title" />
</PreferenceCategory>
<PreferenceCategory
android:title="@string/prefcat_defaults">
<PreferenceScreen android:title="@string/prefcat_defaults_post" xmlns:android="http://schemas.android.com/apk/res/android">
<CheckBoxPreference
android:key="@string/pref_upload_journal_default_key"
android:enabled="true"
android:defaultValue="false"
android:summary="@string/pref_upload_journal_default_summary"
android:title="@string/pref_upload_journal_default_title" />
<ListPreference
android:dependency="@string/pref_upload_journal_default_key"
android:key="@string/pref_upload_journal_key"
android:title="@string/pref_upload_journal_title"
android:summary="@string/pref_upload_journal_summary"
android:dialogTitle="@string/pref_upload_journal_title" />

<CheckBoxPreference
android:key="@string/pref_upload_folder_default_key"
android:enabled="true"
android:defaultValue="false"
android:summary="@string/pref_upload_folder_default_summary"
android:title="@string/pref_upload_folder_default_title" />
<ListPreference
android:dependency="@string/pref_upload_folder_default_key"
android:key="@string/pref_upload_folder_key"
android:title="@string/pref_upload_folder_title"
android:summary="@string/pref_upload_folder_summary"
android:dialogTitle="@string/pref_upload_folder_title" />

<CheckBoxPreference
android:key="@string/pref_upload_tags_default_key"
android:enabled="true"
android:defaultValue="false"
android:summary="@string/pref_upload_tags_default_summary"
android:title="@string/pref_upload_tags_default_title" />
<ListPreference
android:dependency="@string/pref_upload_tags_default_key"
android:key="@string/pref_upload_tags_key"
android:title="@string/pref_upload_tags_title"
android:summary="@string/pref_upload_tags_summary"
android:dialogTitle="@string/pref_upload_tags_title" />
</PreferenceScreen>
<PreferenceScreen android:title="@string/prefcat_defaults_notification" xmlns:android="http://schemas.android.com/apk/res/android">
<!--
<CheckBoxPreference
android:key="@string/pref_sync_notification_feedback_key"
android:enabled="true"
android:defaultValue="true"
android:summary="@string/pref_sync_notification_feedback_summary"
android:title="@string/pref_sync_notification_feedback_title" />
<CheckBoxPreference
android:key="@string/pref_sync_notification_newpost_key"
android:enabled="true"
android:defaultValue="true"
android:summary="@string/pref_sync_notification_newpost_summary"
android:title="@string/pref_sync_notification_newpost_title" />
<CheckBoxPreference
android:key="@string/pref_sync_notification_maharamessage_key"
android:enabled="true"
android:defaultValue="true"
android:summary="@string/pref_sync_notification_maharamessage_summary"
android:title="@string/pref_sync_notification_maharamessage_title" />
<CheckBoxPreference
android:key="@string/pref_sync_notification_usermessage_key"
android:enabled="true"
android:defaultValue="true"
android:summary="@string/pref_sync_notification_usermessage_summary"
android:title="@string/pref_sync_notification_usermessage_title" />
<CheckBoxPreference
android:key="@string/pref_sync_notification_groupmessage_key"
android:enabled="true"
android:defaultValue="true"
android:summary="@string/pref_sync_notification_groupmessage_summary"
android:title="@string/pref_sync_notification_groupmessage_title" />
<CheckBoxPreference
android:key="@string/pref_sync_notification_watchlist_key"
android:enabled="true"
android:defaultValue="true"
android:summary="@string/pref_sync_notification_watchlist_summary"
android:title="@string/pref_sync_notification_watchlist_title" />
<CheckBoxPreference
android:key="@string/pref_sync_notification_viewaccess_key"
android:enabled="true"
android:defaultValue="true"
android:summary="@string/pref_sync_notification_viewaccess_summary"
android:title="@string/pref_sync_notification_viewaccess_title" />
<CheckBoxPreference
android:key="@string/pref_sync_notification_contactus_key"
android:enabled="true"
android:defaultValue="true"
android:summary="@string/pref_sync_notification_contactus_summary"
android:title="@string/pref_sync_notification_contactus_title" />
<CheckBoxPreference
android:key="@string/pref_sync_notification_objectionable_key"
android:enabled="true"
android:defaultValue="true"
android:summary="@string/pref_sync_notification_objectionable_summary"
android:title="@string/pref_sync_notification_objectionable_title" />
<CheckBoxPreference
android:key="@string/pref_sync_notification_virusrepeat_key"
android:enabled="true"
android:defaultValue="true"
android:summary="@string/pref_sync_notification_virusrepeat_summary"
android:title="@string/pref_sync_notification_virusrepeat_title" />
<CheckBoxPreference
android:key="@string/pref_sync_notification_virusrelease_key"
android:enabled="true"
android:defaultValue="true"
android:summary="@string/pref_sync_notification_virusrelease_summary"
android:title="@string/pref_sync_notification_virusrelease_title" />
<CheckBoxPreference
android:key="@string/pref_sync_notification_institutionmessage_key"
android:enabled="true"
android:defaultValue="true"
android:summary="@string/pref_sync_notification_institutionmessage_summary"
android:title="@string/pref_sync_notification_institutionmessage_title" />
-->
</PreferenceScreen>
</PreferenceCategory>
<PreferenceCategory
android:title="@string/prefcat_advanced">

<CheckBoxPreference
android:key="@string/pref_upload_journal_default_key"
android:enabled="true"
android:defaultValue="false"
android:summary="@string/pref_upload_journal_default_summary"
android:title="@string/pref_upload_journal_default_title" />
<ListPreference
android:dependency="@string/pref_upload_journal_default_key"
android:key="@string/pref_upload_journal_key"
android:title="@string/pref_upload_journal_title"
android:summary="@string/pref_upload_journal_summary"
android:dialogTitle="@string/pref_upload_journal_title" />

<CheckBoxPreference
android:key="@string/pref_upload_folder_default_key"
android:enabled="true"
android:defaultValue="false"
android:summary="@string/pref_upload_folder_default_summary"
android:title="@string/pref_upload_folder_default_title" />
<ListPreference
android:dependency="@string/pref_upload_folder_default_key"
android:key="@string/pref_upload_folder_key"
android:title="@string/pref_upload_folder_title"
android:summary="@string/pref_upload_folder_summary"
android:dialogTitle="@string/pref_upload_folder_title" />

<CheckBoxPreference
android:key="@string/pref_upload_tags_default_key"
android:enabled="true"
android:defaultValue="false"
android:summary="@string/pref_upload_tags_default_summary"
android:title="@string/pref_upload_tags_default_title" />
<ListPreference
android:dependency="@string/pref_upload_tags_default_key"
android:key="@string/pref_upload_tags_key"
android:title="@string/pref_upload_tags_title"
android:summary="@string/pref_upload_tags_summary"
android:dialogTitle="@string/pref_upload_tags_title" />

<EditTextPreference
android:key="@string/pref_sync_periodic_key"
android:title="@string/pref_sync_periodic_title"
android:summary="@string/pref_sync_periodic_summary"
android:defaultValue="0"
<EditTextPreference
android:key="@string/pref_sync_periodic_key"
android:title="@string/pref_sync_periodic_title"
android:summary="@string/pref_sync_periodic_summary"
android:defaultValue="0"
android:numeric="integer"
/>

</PreferenceCategory>

</PreferenceCategory>
</PreferenceScreen>

0 comments on commit 54093a9

Please sign in to comment.