Notificações completamente funcionais

ponces · Jul 6, 2015 · aaff347 · aaff347
1 parent b351cbd
commit aaff347
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 60 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/CalendarioCoco2.iml → CalendarioCoco.iml b/CalendarioCoco2.iml → CalendarioCoco.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="CalendarioCoco2" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="CalendarioCoco" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>
diff --git a/app/app.iml b/app/app.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="CalendarioCoco2" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="CalendarioCoco" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -92,12 +92,12 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="design-22.2.0" level="project" />
-    <orderEntry type="library" exported="" name="material-calendarview-0.4.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="recyclerview-v7-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="cardview-v7-21.0.3" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
-    <orderEntry type="library" exported="" name="recyclerview-v7-21.0.3" level="project" />
+    <orderEntry type="library" exported="" name="design-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="material-calendarview-0.4.0" level="project" />
   </component>
 </module>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -12,7 +12,6 @@
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
@@ -32,9 +31,7 @@
             android:name=".CalendarViewActivity"
             android:label="@string/title_activity_calendar_view" >
         </activity>
-        <receiver android:name=".AlarmReceiver"
-            android:enabled="true"
-            android:exported="false" >
+        <receiver android:name=".AlarmReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>

diff --git a/app/src/main/java/com/ponces/alberto/calendariococo/AlarmReceiver.java b/app/src/main/java/com/ponces/alberto/calendariococo/AlarmReceiver.java
@@ -27,21 +27,27 @@ public void onReceive(Context context, Intent intent) {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
         boolean enabled = sharedPreferences.getBoolean("switch_notifications", true);
         if(enabled) {
-            showNotification();
             if(Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
                 java.util.Calendar c = java.util.Calendar.getInstance();
                 c.setTimeInMillis(System.currentTimeMillis());
                 c.set(java.util.Calendar.HOUR_OF_DAY, 8);
                 c.set(java.util.Calendar.MINUTE, 0);
                 c.set(java.util.Calendar.SECOND, 0);
                 long timeChosen = PreferenceManager.getDefaultSharedPreferences(context)
-                        .getLong("notification_hour", c.getTimeInMillis());c.setTimeInMillis(timeChosen);
+                        .getLong("notification_hour", c.getTimeInMillis());
+                c.setTimeInMillis(timeChosen);
                 if(java.util.Calendar.getInstance().get(java.util.Calendar.HOUR_OF_DAY) > c.get(java.util.Calendar.HOUR_OF_DAY)) {
                     timeChosen += 24 * 60 * 60 * 1000;
+                } else {
+                    if(java.util.Calendar.getInstance().get(java.util.Calendar.MINUTE) > c.get(java.util.Calendar.MINUTE)) {
+                        timeChosen += 24 * 60 * 60 * 1000;
+                    }
                 }
                 AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
                 am.setRepeating(AlarmManager.RTC_WAKEUP, timeChosen, 24 * 60 * 60 * 1000,
                         PendingIntent.getBroadcast(context, 0, new Intent(context, AlarmReceiver.class), 0));
+            } else {
+                showNotification();
             }
         }
     }

diff --git a/app/src/main/java/com/ponces/alberto/calendariococo/TimePreference.java b/app/src/main/java/com/ponces/alberto/calendariococo/TimePreference.java
@@ -21,23 +21,19 @@
  */
 public class TimePreference extends DialogPreference {
 
-    private Context context;
     private java.util.Calendar calendar;
     private TimePicker picker = null;
 
     public TimePreference(Context ctxt) {
         this(ctxt, null);
-        this.context = ctxt;
     }
 
     public TimePreference(Context ctxt, AttributeSet attrs) {
         this(ctxt, attrs, android.R.attr.dialogPreferenceStyle);
-        this.context = ctxt;
     }
 
     public TimePreference(Context ctxt, AttributeSet attrs, int defStyle) {
         super(ctxt, attrs, defStyle);
-        this.context = ctxt;
         setPositiveButtonText(R.string.ok);
         setNegativeButtonText(R.string.cancel);
         calendar = new GregorianCalendar();
@@ -114,19 +110,23 @@ public void createNotification() {
         c.set(java.util.Calendar.HOUR_OF_DAY, 8);
         c.set(java.util.Calendar.MINUTE, 0);
         c.set(java.util.Calendar.SECOND, 0);
-        long timeChosen = PreferenceManager.getDefaultSharedPreferences(context)
+        long timeChosen = PreferenceManager.getDefaultSharedPreferences(getContext())
                 .getLong("notification_hour", c.getTimeInMillis());
         c.setTimeInMillis(timeChosen);
         if(java.util.Calendar.getInstance().get(java.util.Calendar.HOUR_OF_DAY) > c.get(java.util.Calendar.HOUR_OF_DAY)) {
             timeChosen += 24 * 60 * 60 * 1000;
+        } else {
+            if(java.util.Calendar.getInstance().get(java.util.Calendar.MINUTE) > c.get(java.util.Calendar.MINUTE)) {
+                timeChosen += 24 * 60 * 60 * 1000;
+            }
         }
-        AlarmManager am = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
+        AlarmManager am = (AlarmManager) getContext().getSystemService(Context.ALARM_SERVICE);
         am.setRepeating(AlarmManager.RTC_WAKEUP, timeChosen, 24 * 60 * 60 * 1000,
-                PendingIntent.getBroadcast(context, 0, new Intent(context, AlarmReceiver.class), 0));
+                PendingIntent.getBroadcast(getContext(), 0, new Intent(getContext(), AlarmReceiver.class), 0));
     }
 
     public void cancelNotification() {
-        AlarmManager am = (AlarmManager) context.getSystemService(context.ALARM_SERVICE);
-        am.cancel(PendingIntent.getBroadcast(context, 0, new Intent(context, AlarmReceiver.class), 0));
+        AlarmManager am = (AlarmManager) getContext().getSystemService(Context.ALARM_SERVICE);
+        am.cancel(PendingIntent.getBroadcast(getContext(), 0, new Intent(getContext(), AlarmReceiver.class), 0));
     }
 }