From fa7b1228e5e0332d7b044d5f159b6e09deb922d7 Mon Sep 17 00:00:00 2001 From: Scott Johnson Date: Sun, 2 Mar 2014 17:06:45 -0600 Subject: [PATCH] Issue #100: Add a settings screen with a single setting that controls sync frequency. --- agit/AndroidManifest.xml | 6 +++ agit/res/layout/settings_activity.xml | 17 +++++++ agit/res/menu/dashboard.xml | 5 +++ agit/res/values/strings.xml | 6 +++ .../com/madgag/agit/DashboardActivity.java | 4 +- .../com/madgag/agit/SettingsActivity.java | 44 +++++++++++++++++++ .../sync/AccountAuthenticatorService.java | 12 +++-- .../com/madgag/agit/sync/SyncAdapter.java | 2 + 8 files changed, 91 insertions(+), 5 deletions(-) create mode 100644 agit/res/layout/settings_activity.xml create mode 100644 agit/src/main/java/com/madgag/agit/SettingsActivity.java diff --git a/agit/AndroidManifest.xml b/agit/AndroidManifest.xml index fcef7206..0513879b 100644 --- a/agit/AndroidManifest.xml +++ b/agit/AndroidManifest.xml @@ -15,6 +15,12 @@ + + + + + + diff --git a/agit/res/layout/settings_activity.xml b/agit/res/layout/settings_activity.xml new file mode 100644 index 00000000..40c8b2f6 --- /dev/null +++ b/agit/res/layout/settings_activity.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/agit/res/menu/dashboard.xml b/agit/res/menu/dashboard.xml index a79d1556..37617f69 100644 --- a/agit/res/menu/dashboard.xml +++ b/agit/res/menu/dashboard.xml @@ -10,6 +10,11 @@ android:title="@string/open_menu_option" android:showAsAction="never"> + + SSH Install Guide Clone... Clone... + Settings... Url Target Folder Repository url @@ -112,4 +113,9 @@ "No viewer available for '%1$s'" + + Settings + Sync Settings + Sync Frequency (Minutes) + Tap to set how often repository synchronization will occur diff --git a/agit/src/main/java/com/madgag/agit/DashboardActivity.java b/agit/src/main/java/com/madgag/agit/DashboardActivity.java index 014a0a20..5f992b89 100644 --- a/agit/src/main/java/com/madgag/agit/DashboardActivity.java +++ b/agit/src/main/java/com/madgag/agit/DashboardActivity.java @@ -43,7 +43,6 @@ import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuItem; import com.github.rtyley.android.sherlock.roboguice.activity.RoboSherlockFragmentActivity; -import com.madgag.android.IntentUtil; import com.madgag.android.util.store.InstallAppDialogFragment; import java.io.File; @@ -81,6 +80,9 @@ public boolean onOptionsItemSelected(MenuItem item) { case R.id.clone: startActivity(new Intent(this, CloneLauncherActivity.class)); return true; + case R.id.settings: + startActivity(new Intent(this, SettingsActivity.class)); + return true; case R.id.open_repo: if (isIntentAvailable(this, PICK_DIRECTORY_INTENT)) { Intent intent = new Intent(PICK_DIRECTORY_INTENT); diff --git a/agit/src/main/java/com/madgag/agit/SettingsActivity.java b/agit/src/main/java/com/madgag/agit/SettingsActivity.java new file mode 100644 index 00000000..b7df43fd --- /dev/null +++ b/agit/src/main/java/com/madgag/agit/SettingsActivity.java @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2011, 2012 Roberto Tyley + * + * This file is part of 'Agit' - an Android Git client. + * + * Agit is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Agit is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see http://www.gnu.org/licenses/ . + */ + +package com.madgag.agit; + +import static com.madgag.agit.sync.AccountAuthenticatorService.addAccount; +import android.os.Bundle; +import android.preference.PreferenceActivity; +import android.util.Log; + +public class SettingsActivity extends PreferenceActivity { + public void onCreate(Bundle aSavedInstanceState) { + super.onCreate(aSavedInstanceState); + addPreferencesFromResource(R.layout.settings_activity); + } + + @Override + public void onDestroy() { + super.onDestroy(); + try { + addAccount(this); + } catch (Exception e) { + Log.w(TAG, "Unable to re-add account for syncing after preference changes", e); + } + } + + private static final String TAG = "SettingsActivity"; +} diff --git a/agit/src/main/java/com/madgag/agit/sync/AccountAuthenticatorService.java b/agit/src/main/java/com/madgag/agit/sync/AccountAuthenticatorService.java index c25f7c6e..9713467f 100644 --- a/agit/src/main/java/com/madgag/agit/sync/AccountAuthenticatorService.java +++ b/agit/src/main/java/com/madgag/agit/sync/AccountAuthenticatorService.java @@ -34,8 +34,10 @@ import android.content.ContentResolver; import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.os.Bundle; import android.os.IBinder; +import android.preference.PreferenceManager; import android.util.Log; /** @@ -71,15 +73,17 @@ public static Bundle addAccount(Context ctx) { result.putString(AccountManager.KEY_ACCOUNT_NAME, account.name); result.putString(AccountManager.KEY_ACCOUNT_TYPE, account.type); } - configureSyncFor(account); + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx); + int syncFreq = Integer.parseInt(prefs.getString("setting_sync_frequency", "15")); + configureSyncFor(account, syncFreq); return result; } - private static void configureSyncFor(Account account) { - Log.d(TAG, "Trying to configure account for sync..."); + private static void configureSyncFor(Account account, int syncFreq) { + Log.d(TAG, "Trying to configure account for sync at rate of " + syncFreq + " minutes"); setIsSyncable(account, AGIT_PROVIDER_AUTHORITY, 1); setSyncAutomatically(account, AGIT_PROVIDER_AUTHORITY, true); - ContentResolver.addPeriodicSync(account, AGIT_PROVIDER_AUTHORITY, new Bundle(), (long) (15 * 60)); + ContentResolver.addPeriodicSync(account, AGIT_PROVIDER_AUTHORITY, new Bundle(), (long) (syncFreq * 60)); } private static class AccountAuthenticatorImpl extends AbstractAccountAuthenticator { diff --git a/agit/src/main/java/com/madgag/agit/sync/SyncAdapter.java b/agit/src/main/java/com/madgag/agit/sync/SyncAdapter.java index b74251e9..5ec2de74 100644 --- a/agit/src/main/java/com/madgag/agit/sync/SyncAdapter.java +++ b/agit/src/main/java/com/madgag/agit/sync/SyncAdapter.java @@ -25,6 +25,7 @@ import android.content.Context; import android.content.SyncResult; import android.os.Bundle; +import android.util.Log; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -50,6 +51,7 @@ public SyncAdapter(Context context) { @Override public void onPerformSync(Account account, Bundle extras, String authority, ContentProviderClient provider, SyncResult syncResult) { + Log.d(TAG, "Performing sync"); cancelAnyCurrentCampaign(); contextScope.enter(getContext()); try {