Skip to content

Commit b2935d4

Browse files
chimdi2000chimdi2000
committed
Updated some bugs
Updated app crashing when you swipe to the analytics screen and settings button icon now working.
1 parent f11b962 commit b2935d4

15 files changed

+1728
-1184
lines changed

‎src/com/peacecorps/malaria/AlarmAutoStart.java

100644100755
+18-18
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
package com.peacecorps.malaria;
2-
3-
import android.content.BroadcastReceiver;
4-
import android.content.Context;
5-
import android.content.Intent;
6-
7-
public class AlarmAutoStart extends BroadcastReceiver {
8-
9-
@Override
10-
public void onReceive(Context context, Intent intent) {
11-
12-
if (intent.getAction().equals(
13-
R.string.alarm_auto_start_boot_completed_intent_check)) {
14-
context.startService(new Intent(context, AlarmService.class));
15-
}
16-
}
17-
18-
}
1+
package com.peacecorps.malaria;
2+
3+
import android.content.BroadcastReceiver;
4+
import android.content.Context;
5+
import android.content.Intent;
6+
import com.peacecorps.malaria.R;
7+
8+
public class AlarmAutoStart extends BroadcastReceiver {
9+
10+
@Override
11+
public void onReceive(Context context, Intent intent) {
12+
13+
if (intent.getAction().equals(R.string.alarm_auto_start_boot_completed_intent_check)) {
14+
context.startService(new Intent(context, AlarmService.class));
15+
}
16+
}
17+
18+
}

‎src/com/peacecorps/malaria/AlarmHandlerClass.java

100644100755
+90-90
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,90 @@
1-
package com.peacecorps.malaria;
2-
3-
import java.util.Calendar;
4-
import java.util.Date;
5-
6-
import android.app.AlarmManager;
7-
import android.app.PendingIntent;
8-
import android.content.BroadcastReceiver;
9-
import android.content.Context;
10-
import android.content.Intent;
11-
import android.os.PowerManager;
12-
13-
public class AlarmHandlerClass extends BroadcastReceiver {
14-
15-
public static Calendar mAlarmScheduleTime;
16-
final int INTERVAL_WEEK = 604800000;
17-
public static AlarmManager mAlarmManager;
18-
19-
static SharedPreferenceStore mSharedPreferenceStore;
20-
21-
@Override
22-
public void onReceive(Context context, Intent intent) {
23-
PowerManager powerManager = (PowerManager) context
24-
.getSystemService(Context.POWER_SERVICE);
25-
PowerManager.WakeLock wakeLock = powerManager.newWakeLock(
26-
PowerManager.PARTIAL_WAKE_LOCK, "");
27-
wakeLock.acquire();
28-
29-
/** Opening the Alert Dialog Window */
30-
31-
intent = new Intent(context, AlertCallerFragmentActivity.class);
32-
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
33-
context.startActivity(intent);
34-
wakeLock.release();
35-
}
36-
37-
public void getSharedPreferences(Context context) {
38-
mSharedPreferenceStore.mPrefsStore = context.getSharedPreferences(
39-
"com.pc.storeTimePicked", Context.MODE_PRIVATE);
40-
mSharedPreferenceStore.mEditor = mSharedPreferenceStore.mPrefsStore
41-
.edit();
42-
}
43-
44-
public void setAlarm(Context context) {
45-
46-
getSharedPreferences(context);
47-
int hour = mSharedPreferenceStore.mPrefsStore.getInt(
48-
"com.pc.AlarmHour", -1);
49-
int minute = mSharedPreferenceStore.mPrefsStore.getInt(
50-
"com.pc.AlarmMinute", -1);
51-
if ((hour != -1) && (minute != -1)) {
52-
AlarmTime(context, hour, minute);
53-
mAlarmManager = (AlarmManager) context
54-
.getSystemService(Context.ALARM_SERVICE);
55-
Intent alarmIntent = new Intent(
56-
"com.example.viewpagertest.START_ALARM");
57-
PendingIntent pendingAlarm = PendingIntent.getBroadcast(context, 0,
58-
alarmIntent, Intent.FLAG_ACTIVITY_NEW_TASK);
59-
if (mSharedPreferenceStore.mPrefsStore.getBoolean(
60-
"com.pc.isWeekly", false)) {
61-
mAlarmManager.setRepeating(AlarmManager.RTC_WAKEUP,
62-
mAlarmScheduleTime.getTimeInMillis(), INTERVAL_WEEK,
63-
pendingAlarm);
64-
} else {
65-
mAlarmManager.setRepeating(AlarmManager.RTC_WAKEUP,
66-
mAlarmScheduleTime.getTimeInMillis(),
67-
AlarmManager.INTERVAL_DAY, pendingAlarm);
68-
}
69-
}
70-
71-
}
72-
73-
public void AlarmTime(Context context, int hour, int minute) {
74-
75-
Date date = new Date();
76-
mAlarmScheduleTime = Calendar.getInstance();
77-
mAlarmScheduleTime.setTime(date);
78-
79-
Calendar dateNow = Calendar.getInstance();
80-
dateNow.setTime(date);
81-
82-
mAlarmScheduleTime.set(Calendar.HOUR_OF_DAY, hour);
83-
mAlarmScheduleTime.set(Calendar.MINUTE, minute);
84-
85-
if (mAlarmScheduleTime.before(dateNow)) {
86-
mAlarmScheduleTime.add(Calendar.DATE, 1);
87-
}
88-
89-
}
90-
}
1+
package com.peacecorps.malaria;
2+
3+
import java.util.Calendar;
4+
import java.util.Date;
5+
6+
import android.app.AlarmManager;
7+
import android.app.PendingIntent;
8+
import android.content.BroadcastReceiver;
9+
import android.content.Context;
10+
import android.content.Intent;
11+
import android.os.PowerManager;
12+
13+
public class AlarmHandlerClass extends BroadcastReceiver {
14+
15+
public static Calendar mAlarmScheduleTime;
16+
final int INTERVAL_WEEK = 604800000;
17+
public static AlarmManager mAlarmManager;
18+
19+
static SharedPreferenceStore mSharedPreferenceStore;
20+
21+
@Override
22+
public void onReceive(Context context, Intent intent) {
23+
PowerManager powerManager = (PowerManager) context
24+
.getSystemService(Context.POWER_SERVICE);
25+
PowerManager.WakeLock wakeLock = powerManager.newWakeLock(
26+
PowerManager.PARTIAL_WAKE_LOCK, "");
27+
wakeLock.acquire();
28+
29+
/** Opening the Alert Dialog Window */
30+
31+
intent = new Intent(context, AlertCallerFragmentActivity.class);
32+
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
33+
context.startActivity(intent);
34+
wakeLock.release();
35+
}
36+
37+
public void getSharedPreferences(Context context) {
38+
mSharedPreferenceStore.mPrefsStore = context.getSharedPreferences(
39+
"com.peacecorps.malaria.storeTimePicked", Context.MODE_PRIVATE);
40+
mSharedPreferenceStore.mEditor = mSharedPreferenceStore.mPrefsStore
41+
.edit();
42+
}
43+
44+
public void setAlarm(Context context) {
45+
46+
getSharedPreferences(context);
47+
int hour = mSharedPreferenceStore.mPrefsStore.getInt(
48+
"com.peacecorps.malaria.AlarmHour", -1);
49+
int minute = mSharedPreferenceStore.mPrefsStore.getInt(
50+
"com.peacecorps.malaria.AlarmMinute", -1);
51+
if ((hour != -1) && (minute != -1)) {
52+
AlarmTime(context, hour, minute);
53+
mAlarmManager = (AlarmManager) context
54+
.getSystemService(Context.ALARM_SERVICE);
55+
Intent alarmIntent = new Intent(
56+
"com.example.viewpagertest.START_ALARM");
57+
PendingIntent pendingAlarm = PendingIntent.getBroadcast(context, 0,
58+
alarmIntent, Intent.FLAG_ACTIVITY_NEW_TASK);
59+
if (mSharedPreferenceStore.mPrefsStore.getBoolean(
60+
"com.peacecorps.malaria.isWeekly", false)) {
61+
mAlarmManager.setRepeating(AlarmManager.RTC_WAKEUP,
62+
mAlarmScheduleTime.getTimeInMillis(), INTERVAL_WEEK,
63+
pendingAlarm);
64+
} else {
65+
mAlarmManager.setRepeating(AlarmManager.RTC_WAKEUP,
66+
mAlarmScheduleTime.getTimeInMillis(),
67+
AlarmManager.INTERVAL_DAY, pendingAlarm);
68+
}
69+
}
70+
71+
}
72+
73+
public void AlarmTime(Context context, int hour, int minute) {
74+
75+
Date date = new Date();
76+
mAlarmScheduleTime = Calendar.getInstance();
77+
mAlarmScheduleTime.setTime(date);
78+
79+
Calendar dateNow = Calendar.getInstance();
80+
dateNow.setTime(date);
81+
82+
mAlarmScheduleTime.set(Calendar.HOUR_OF_DAY, hour);
83+
mAlarmScheduleTime.set(Calendar.MINUTE, minute);
84+
85+
if (mAlarmScheduleTime.before(dateNow)) {
86+
mAlarmScheduleTime.add(Calendar.DATE, 1);
87+
}
88+
89+
}
90+
}

‎src/com/peacecorps/malaria/AlarmService.java

100644100755
+35-35
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
package com.peacecorps.malaria;
2-
3-
import android.app.Service;
4-
import android.content.Intent;
5-
import android.os.IBinder;
6-
7-
public class AlarmService extends Service {
8-
9-
AlarmHandlerClass alarmHandlerClass = new AlarmHandlerClass();
10-
11-
@Override
12-
public IBinder onBind(Intent intent) {
13-
14-
return null;
15-
}
16-
17-
public void onStart(Intent intent, int startId) {
18-
19-
alarmHandlerClass.setAlarm(AlarmService.this);
20-
}
21-
22-
@Override
23-
public void onCreate() {
24-
25-
super.onCreate();
26-
}
27-
28-
@Override
29-
public int onStartCommand(Intent intent, int flags, int startId) {
30-
31-
alarmHandlerClass.setAlarm(AlarmService.this);
32-
return START_STICKY;
33-
}
34-
35-
}
1+
package com.peacecorps.malaria;
2+
3+
import android.app.Service;
4+
import android.content.Intent;
5+
import android.os.IBinder;
6+
7+
public class AlarmService extends Service {
8+
9+
AlarmHandlerClass alarmHandlerClass = new AlarmHandlerClass();
10+
11+
@Override
12+
public IBinder onBind(Intent intent) {
13+
14+
return null;
15+
}
16+
17+
public void onStart(Intent intent, int startId) {
18+
19+
alarmHandlerClass.setAlarm(AlarmService.this);
20+
}
21+
22+
@Override
23+
public void onCreate() {
24+
25+
super.onCreate();
26+
}
27+
28+
@Override
29+
public int onStartCommand(Intent intent, int flags, int startId) {
30+
31+
alarmHandlerClass.setAlarm(AlarmService.this);
32+
return START_STICKY;
33+
}
34+
35+
}

0 commit comments

Comments
 (0)