bauer/UdacityProject6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Better message parsing and notification building

Browse Source
This commit is contained in:
Dan Galpin
2015-05-24 23:52:11 -07:00
parent 83cfcaff0f
commit 3a0b035c69
3 changed files with 124 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
app/src/main/AndroidManifest.xml
View File

@@ -21,20 +21,17 @@
<uses-permission android:name="android.permission.INTERNET" />
<!-- Permissions required by the sync adapter -->
<uses-permission
android:name="android.permission.READ_SYNC_SETTINGS"/>
<uses-permission
android:name="android.permission.WRITE_SYNC_SETTINGS"/>
<uses-permission
android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
<!-- Permissions required to make our UI more friendly -->
<uses-permission
android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<!-- Permissions required for Google Cloud Messaging -->
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
<permission android:name="com.example.android.sunshine.app.permission.C2D_MESSAGE"
<permission
android:name="com.example.android.sunshine.app.permission.C2D_MESSAGE"
android:protectionLevel="signature" />
<uses-permission android:name="com.example.android.sunshine.app.permission.C2D_MESSAGE" />
@@ -46,8 +43,8 @@
android:supportsRtl="true">
<activity
android:name=".MainActivity"
android:theme="@style/ForecastTheme"
android:label="@string/app_name" >
android:label="@string/app_name"
android:theme="@style/ForecastTheme" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -66,22 +63,24 @@
android:name=".SettingsActivity"
android:label="@string/title_activity_settings"
android:parentActivityName=".MainActivity"
android:theme="@style/SettingsTheme">
android:theme="@style/SettingsTheme" >
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.example.android.sunshine.app.MainActivity" />
</activity>
<provider
android:authorities="@string/content_authority"
android:name=".data.WeatherProvider"
android:authorities="@string/content_authority"
android:exported="false"
android:syncable="true" />
<!-- SyncAdapter's dummy authentication service -->
<service android:name=".sync.SunshineAuthenticatorService">
<service android:name=".sync.SunshineAuthenticatorService" >
<intent-filter>
<action android:name="android.accounts.AccountAuthenticator" />
</intent-filter>
<meta-data
android:name="android.accounts.AccountAuthenticator"
android:resource="@xml/authenticator" />
@@ -90,25 +89,25 @@
<!-- The SyncAdapter service -->
<service
android:name=".sync.SunshineSyncService"
android:exported="true"
>
android:exported="true" >
<intent-filter>
<action android:name="android.content.SyncAdapter" />
</intent-filter>
<meta-data
android:name="android.content.SyncAdapter"
android:resource="@xml/syncadapter" />
</service>
<!-- GCM receiver - Commented out until we write the class -->
<!--<receiver-->
<!--android:name=".GcmBroadcastReceiver"-->
<!--android:permission="com.google.android.c2dm.permission.SEND" >-->
<!--<intent-filter>-->
<!--<action android:name="com.google.android.c2dm.intent.RECEIVE" />-->
<!--<category android:name="com.example.android.sunshine.app" />-->
<!--</intent-filter>-->
<!--</receiver>-->
<!-- GCM receiver -->
<receiver
android:name=".GcmBroadcastReceiver"
android:permission="com.google.android.c2dm.permission.SEND" >
<intent-filter>
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
<category android:name="com.example.android.sunshine.app" />
</intent-filter>
</receiver>
</application>
</manifest>