archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Integrated crittercism

Browse Source
pull/14/head
Sam Bosley 14 years ago
parent cd56a3eb94
commit 259b447294
9 changed files with 86 additions and 8 deletions
Show Stats Download Patch File Download Diff File

1
astrid/.classpath
Unescape Escape View File

@ -29,5 +29,6 @@
<classpathentry kind="lib" path="libs/google-oauth-client-1.5.0-beta.jar"/>
<classpathentry kind="lib" path="libs/google-oauth-client-extensions-1.5.0-beta.jar"/>
<classpathentry kind="lib" path="libs/gson-1.6.jar"/>
<classpathentry kind="lib" path="libs/crittercism0.79.jar"/>
<classpathentry kind="output" path="ecbuild"/>
</classpath>

19
astrid/AndroidManifest.xml
Unescape Escape View File

@ -158,6 +158,25 @@
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
</intent-filter>
</activity>
<!-- Start of Crittercism.com Code -->
<activity android:name="com.crittercism.FeedbackActivity" />
<activity android:name="com.crittercism.FeedbackCreateActivity" />
<activity android:name="com.crittercism.FeedbackDetailsActivity" />
<activity android:name="com.crittercism.NotificationActivity" />
<service android:name="com.crittercism.service.CrittercismService"
android:process="com.crittercism.service" android:exported="true">
<intent-filter>
<action android:name="com.crittercism.service.CrittercismService" />
</intent-filter>
</service>
<receiver android:name="com.crittercism.service.BReceiver">
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED"></action>
</intent-filter>
</receiver>
<!-- End of Crittercism.com Code -->
<!-- ======================================================= Receivers = -->

BIN
astrid/libs/crittercism0.79.jar
View File

Binary file not shown.

6
astrid/res/values/strings-core.xml
Unescape Escape View File

@ -113,6 +113,9 @@
<!-- Menu: Help -->
<string name="TLA_menu_help">Help</string>
<!-- Menu: Support -->
<string name="TLA_menu_support">Support</string>
<!-- Search Label-->
<string name="TLA_search_label">Search This List</string>
@ -464,6 +467,9 @@
<string name="p_about_text">Current version: %s\n\n
Astrid is open-source and proudly maintained by Todoroo, Inc.</string>
<!-- Title of "Help" option in settings -->
<string name="p_help">Help</string>
<!-- ============================================================= Misc == -->

1
astrid/res/xml/preferences.xml
Unescape Escape View File

@ -4,6 +4,7 @@
android:title="@string/EPr_title">
<PreferenceScreen android:title="" android:key="@string/p_about" />
<PreferenceScreen android:title="" android:key="@string/p_help"/>
<PreferenceCategory
android:title="@string/EPr_appearance_header">
<com.todoroo.astrid.ui.MultilineListPreference

46
astrid/src/com/todoroo/astrid/activity/EditPreferences.java
Unescape Escape View File

@ -18,6 +18,7 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.net.Uri;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.Preference;
@ -42,6 +43,8 @@ import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.helper.MetadataHelper;
import com.todoroo.astrid.service.AddOnService;
import com.todoroo.astrid.service.StartupService;
import com.todoroo.astrid.service.StatisticsConstants;
import com.todoroo.astrid.service.StatisticsService;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.ui.ContactListAdapter;
import com.todoroo.astrid.utility.Constants;
@ -58,7 +61,8 @@ import com.todoroo.astrid.voice.VoiceOutputService;
public class EditPreferences extends TodorooPreferenceActivity {
private static final int ABOUT_PREFERENCE = 0; // see preferences.xml for order of prefs
private static final int POWER_PACK_PREFERENCE = 2;
private static final int HELP_PREFERENCE = 1;
private static final int POWER_PACK_PREFERENCE = 3;
public static final int RESULT_CODE_THEME_CHANGED = 1;
@ -105,6 +109,16 @@ public class EditPreferences extends TodorooPreferenceActivity {
}
});
Preference helpPref = screen.getPreference(HELP_PREFERENCE);
helpPref.setTitle(r.getString(R.string.p_help));
helpPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference p) {
showHelp();
return true;
}
});
addDebugPreferences();
addPreferenceListeners();
@ -121,6 +135,13 @@ public class EditPreferences extends TodorooPreferenceActivity {
About.showAbout(this, version);
}
private void showHelp() {
StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_HELP);
Intent intent = new Intent(Intent.ACTION_VIEW,
Uri.parse(Constants.HELP_URL));
startActivity(intent);
}
private void addPluginPreferences(PreferenceScreen screen) {
Intent queryIntent = new Intent(AstridApiConstants.ACTION_SETTINGS);
PackageManager pm = getPackageManager();
@ -361,4 +382,27 @@ public class EditPreferences extends TodorooPreferenceActivity {
}
}
@Override
protected void onPause() {
StatisticsService.sessionPause();
super.onPause();
}
@Override
protected void onStart() {
super.onStart();
}
@Override
protected void onResume() {
super.onResume();
StatisticsService.sessionStart(this);
}
@Override
protected void onStop() {
StatisticsService.sessionStop(this);
super.onStop();
}
}

6
astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
Unescape Escape View File

@ -56,6 +56,7 @@ import android.widget.TextView;
import android.widget.TextView.OnEditorActionListener;
import android.widget.Toast;
import com.crittercism.FeedbackActivity;
import com.timsu.astrid.R;
import com.todoroo.andlib.data.Property;
import com.todoroo.andlib.data.TodorooCursor;
@ -328,7 +329,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
}
item = menu.add(Menu.NONE, MENU_HELP_ID, Menu.NONE,
R.string.TLA_menu_help);
R.string.TLA_menu_support);
item.setIcon(android.R.drawable.ic_menu_help);
item = menu.add(Menu.NONE, MENU_SETTINGS_ID, Menu.NONE,
@ -1118,8 +1119,7 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
return true;
case MENU_HELP_ID:
StatisticsService.reportEvent(StatisticsConstants.TLA_MENU_HELP);
intent = new Intent(Intent.ACTION_VIEW,
Uri.parse(Constants.HELP_URL));
intent = new Intent(this, FeedbackActivity.class);
startActivity(intent);
return true;
case MENU_ADDON_INTENT_ID:

14
astrid/src/com/todoroo/astrid/service/StartupService.java
Unescape Escape View File

@ -21,12 +21,12 @@ import android.media.AudioManager;
import android.util.Log;
import android.widget.Toast;
import com.crittercism.app.Crittercism;
import com.timsu.astrid.R;
import com.todoroo.andlib.service.Autowired;
import com.todoroo.andlib.service.ContextManager;
import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.service.ExceptionService;
import com.todoroo.andlib.service.ExceptionService.TodorooUncaughtExceptionHandler;
import com.todoroo.andlib.utility.AndroidUtilities;
import com.todoroo.andlib.utility.Preferences;
import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
@ -54,6 +54,7 @@ import com.todoroo.astrid.widget.TasksWidget.WidgetUpdateService;
*/
public class StartupService {
static {
AstridDependencyInjector.initialize();
}
@ -89,6 +90,11 @@ public class StartupService {
*/
private static boolean hasStartedUp = false;
private static final String CRITTERCISM_APP_ID = "4e8a796fddf5203b6f0097c5"; //$NON-NLS-1$
private static final String CRITTERCISM_SECRET = "9mhdwlu85lc6sovpxkabq1cbzzmxe2oi"; //$NON-NLS-1$
private static final String CRITTERCISM_OATH_KEY = "4e8a796fddf5203b6f0097c5nn35ziwt"; //$NON-NLS-1$
/**
* Call to skip initialization steps (i.e. if only a notification screen is needed)
*/
@ -101,12 +107,12 @@ public class StartupService {
if(hasStartedUp)
return;
// set uncaught exception handler
Thread.setDefaultUncaughtExceptionHandler(new TodorooUncaughtExceptionHandler());
// sets up context manager
ContextManager.setContext(context);
Crittercism.init(context.getApplicationContext(), CRITTERCISM_APP_ID, CRITTERCISM_OATH_KEY, CRITTERCISM_SECRET);
// show notification if reminders are silenced
if(context instanceof Activity) {
AudioManager audioManager = (AudioManager)context.getSystemService(

1
astrid/src/com/todoroo/astrid/service/StatisticsConstants.java
Unescape Escape View File

@ -33,6 +33,7 @@ public class StatisticsConstants {
public static final String TLA_MENU_SETTINGS = "tla-menu-settings";
public static final String TLA_MENU_SORT = "tla-menu-sort";
public static final String TLA_MENU_SYNC = "tla-menu-sync";
public static final String TLA_CRITTERCISM = "tla-crittercism";
public static final String TLA_MENU_HELP = "tla-menu-help";
public static final String V2_TASK_REPEAT = "v2-task-repeat";
public static final String TASK_COMPLETED_INBOX = "task-completed-inbox";

Write Preview
Loading…
Cancel
Save