flywithu/ownCloud-SMS-App
1
0
Fork 0
mirror of https://github.com/nerzhul/ownCloud-SMS-App.git synced 2025-06-26 09:16:15 +00:00
Code Issues Releases Wiki Activity

Crash fix. Also design the new activity with a blue skin

Browse Source
This commit is contained in:
Loic Blot 2015-02-10 19:38:58 +01:00
parent 553e05b7c5
commit 2b8df80187
6 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable/next_arrow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

10
res/layout/fragment_mainactivity_gotosettings.xml
View File

@ -80,4 +80,14 @@
style="@style/StandardButton"
android:text="@string/ma_button_goto_settings" />
<ImageView
android:id="@+id/imageView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignLeft="@+id/textView1"
android:layout_alignStart="@+id/textView1"
android:layout_below="@+id/main_button_settings"
android:layout_marginTop="33dp"
android:src="@drawable/next_arrow" />
</RelativeLayout>

10
res/layout/fragment_mainactivity_main.xml
View File

@ -60,4 +60,14 @@
android:text="@string/ma_content_welcome"
android:textAppearance="?android:attr/textAppearanceMedium" />
<ImageView
android:id="@+id/imageView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:maxHeight="@dimen/arrow_max_height"
android:src="@drawable/next_arrow" />
</RelativeLayout>

1
res/values/dimens.xml
View File

@ -3,5 +3,6 @@
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="arrow_max_height">22dp</dimen>
</resources>

3
res/values/strings.xml
View File

@ -28,7 +28,7 @@
<resources>
<!-- Translation version, reference for translators -->
<string name="translation_version">4</string>
<string name="translation_version">5</string>
<!-- System strings, do not translate -->
<string name="app_name">ownCloud-SMS</string>
@ -151,6 +151,7 @@ Contributors and issue\'s reporters</string>
<string name="err_sync_http_request_resp">Error #14: Unable to parse server response</string>
<string name="err_sync_http_request_parse_resp">Error #15: Unable to parse server response</string>
<string name="err_sync_no_connection_available">Error #16: No data connection available</string>
<string name="err_sync_account_unparsable">Error #17: malformed account. Please reconfigure it</string>
<string name="title_activity_main">MainActivity</string>
<string name="title_section1">Section 1</string>
<string name="title_section2">Section 2</string>

11
src/fr/unix_experience/owncloud_sms/sync_adapters/SmsSyncAdapter.java
View File

@ -17,6 +17,7 @@ package fr.unix_experience.owncloud_sms.sync_adapters;
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
import fr.unix_experience.owncloud_sms.R;
import fr.unix_experience.owncloud_sms.engine.OCSMSOwnCloudClient;
import fr.unix_experience.owncloud_sms.enums.OCSyncErrorType;
import fr.unix_experience.owncloud_sms.exceptions.OCSyncException;
@ -43,10 +44,16 @@ public class SmsSyncAdapter extends AbstractThreadedSyncAdapter {
ContentProviderClient provider, SyncResult syncResult) {
OCSMSNotificationManager nMgr = new OCSMSNotificationManager(getContext());
nMgr.setSyncProcessMsg();
// Create client
Uri serverURI = Uri.parse(_accountMgr.getUserData(account, "ocURI"));
String ocURI = _accountMgr.getUserData(account, "ocURI");
if (ocURI == null) {
nMgr.setSyncErrorMsg(getContext().getString(R.string.err_sync_account_unparsable));
return;
}
Uri serverURI = Uri.parse(ocURI);
nMgr.setSyncProcessMsg();
OCSMSOwnCloudClient _client = new OCSMSOwnCloudClient(getContext(),
serverURI, _accountMgr.getUserData(account, "ocLogin"),