isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'v1.5.6' into dev

Browse Source 
v1.5.6
This commit is contained in:
Alinson S. Xavier
2016-06-19 17:10:17 -04:00
parent 91e39372a1 2b6fc06b86
commit a445ca962b
3 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,8 @@
<manifest <manifest
package="org.isoron.uhabits" package="org.isoron.uhabits"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="21" android:versionCode="22"
android:versionName="1.5.5"> android:versionName="1.5.6">
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>

17
app/src/main/java/org/isoron/uhabits/HabitBroadcastReceiver.java
View File

@@ -173,10 +173,11 @@ public class HabitBroadcastReceiver extends BroadcastReceiver
contentIntent.setData(data); contentIntent.setData(data);
PendingIntent contentPendingIntent = PendingIntent contentPendingIntent =
PendingIntent.getActivity(context, 0, contentIntent, PendingIntent.getActivity(context, 0, contentIntent,
PendingIntent.FLAG_CANCEL_CURRENT); PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent dismissPendingIntent = buildDismissIntent(context); PendingIntent dismissPendingIntent = buildDismissIntent(context);
PendingIntent checkIntentPending = buildCheckIntent(context, habit, timestamp); PendingIntent checkIntentPending = buildCheckIntent(context,
habit, timestamp, 1);
PendingIntent snoozeIntentPending = buildSnoozeIntent(context, habit); PendingIntent snoozeIntentPending = buildSnoozeIntent(context, habit);
Uri ringtoneUri = ReminderHelper.getRingtoneUri(context); Uri ringtoneUri = ReminderHelper.getRingtoneUri(context);
@@ -223,18 +224,20 @@ public class HabitBroadcastReceiver extends BroadcastReceiver
Intent snoozeIntent = new Intent(context, HabitBroadcastReceiver.class); Intent snoozeIntent = new Intent(context, HabitBroadcastReceiver.class);
snoozeIntent.setData(data); snoozeIntent.setData(data);
snoozeIntent.setAction(ACTION_SNOOZE); snoozeIntent.setAction(ACTION_SNOOZE);
return PendingIntent.getBroadcast(context, 0, snoozeIntent, PendingIntent.FLAG_CANCEL_CURRENT); return PendingIntent.getBroadcast(context, 0, snoozeIntent,
PendingIntent.FLAG_UPDATE_CURRENT);
} }
public static PendingIntent buildCheckIntent(Context context, Habit habit, Long timestamp) public static PendingIntent buildCheckIntent(Context context, Habit
habit, Long timestamp, int requestCode)
{ {
Uri data = habit.getUri(); Uri data = habit.getUri();
Intent checkIntent = new Intent(context, HabitBroadcastReceiver.class); Intent checkIntent = new Intent(context, HabitBroadcastReceiver.class);
checkIntent.setData(data); checkIntent.setData(data);
checkIntent.setAction(ACTION_CHECK); checkIntent.setAction(ACTION_CHECK);
if(timestamp != null) checkIntent.putExtra("timestamp", timestamp); if(timestamp != null) checkIntent.putExtra("timestamp", timestamp);
return PendingIntent.getBroadcast(context, 0, checkIntent, return PendingIntent.getBroadcast(context, requestCode, checkIntent,
PendingIntent.FLAG_CANCEL_CURRENT); PendingIntent.FLAG_UPDATE_CURRENT);
} }
public static PendingIntent buildDismissIntent(Context context) public static PendingIntent buildDismissIntent(Context context)
@@ -242,7 +245,7 @@ public class HabitBroadcastReceiver extends BroadcastReceiver
Intent deleteIntent = new Intent(context, HabitBroadcastReceiver.class); Intent deleteIntent = new Intent(context, HabitBroadcastReceiver.class);
deleteIntent.setAction(ACTION_DISMISS); deleteIntent.setAction(ACTION_DISMISS);
return PendingIntent.getBroadcast(context, 0, deleteIntent, return PendingIntent.getBroadcast(context, 0, deleteIntent,
PendingIntent.FLAG_CANCEL_CURRENT); PendingIntent.FLAG_UPDATE_CURRENT);
} }
public static PendingIntent buildViewHabitIntent(Context context, Habit habit) public static PendingIntent buildViewHabitIntent(Context context, Habit habit)

2
app/src/main/java/org/isoron/uhabits/widgets/CheckmarkWidgetProvider.java
View File

@@ -47,7 +47,7 @@ public class CheckmarkWidgetProvider extends BaseWidgetProvider
@Override @Override
protected PendingIntent getOnClickPendingIntent(Context context, Habit habit) protected PendingIntent getOnClickPendingIntent(Context context, Habit habit)
{ {
return HabitBroadcastReceiver.buildCheckIntent(context, habit, null); return HabitBroadcastReceiver.buildCheckIntent(context, habit, null, 2);
} }
@Override @Override