diff options
8 files changed, 33 insertions, 16 deletions
diff --git a/News-Android-App/src/dev/res/values/strings.xml b/News-Android-App/src/dev/res/values/strings.xml new file mode 100644 index 00000000..fb18ba4f --- /dev/null +++ b/News-Android-App/src/dev/res/values/strings.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="app_name" translatable="false">News Dev</string> + <string name="account_type" translatable="false">de.luhmer.owncloudnewsreader.dev</string> + <string name="authority" translatable="false">de.luhmer.owncloudnewsreader.dev</string> +</resources> diff --git a/News-Android-App/src/main/AndroidManifest.xml b/News-Android-App/src/main/AndroidManifest.xml index 003d2fd8..c993ff4a 100644 --- a/News-Android-App/src/main/AndroidManifest.xml +++ b/News-Android-App/src/main/AndroidManifest.xml @@ -162,7 +162,7 @@ <provider android:name=".providers.OwnCloudSyncProvider" - android:authorities="de.luhmer.owncloudnewsreader" + android:authorities="@string/authority" android:label="@string/auto_sync_string" android:syncable="true" /> <provider diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java index d20d16a9..d627a4f1 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java @@ -400,8 +400,9 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements boolean isAccountThere = false; Account[] accounts = mAccountManager.getAccounts(); + String accountType = AccountGeneral.getAccountType(this); for (Account account : accounts) { - if (account.type.intern().equals(AccountGeneral.ACCOUNT_TYPE)) { + if (account.type.intern().equals(accountType)) { isAccountThere = true; } } @@ -409,7 +410,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements //If the account is not in the Android Account Manager if (!isAccountThere) { //Then add the new account - Account account = new Account(getString(R.string.app_name), AccountGeneral.ACCOUNT_TYPE); + Account account = new Account(getString(R.string.app_name), accountType); mAccountManager.addAccountExplicitly(account, "", new Bundle()); SyncIntervalSelectorActivity.setAccountSyncInterval(this, mPrefs); @@ -679,8 +680,9 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements AccountManager mAccountManager = AccountManager.get(this); Account[] accounts = mAccountManager.getAccounts(); for(Account acc : accounts) { - if (acc.type.equals(AccountGeneral.ACCOUNT_TYPE)) { - ContentResolver.requestSync(acc, AccountGeneral.ACCOUNT_TYPE, accBundle); + String accountType = AccountGeneral.getAccountType(this); + if (acc.type.equals(accountType)) { + ContentResolver.requestSync(acc, accountType, accBundle); } } //http://stackoverflow.com/questions/5253858/why-does-contentresolver-requestsync-not-trigger-a-sync diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SyncIntervalSelectorActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SyncIntervalSelectorActivity.java index 3a363d7b..fb85288d 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SyncIntervalSelectorActivity.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/SyncIntervalSelectorActivity.java @@ -95,21 +95,22 @@ public class SyncIntervalSelectorActivity extends AppCompatActivity { int minutes = mPrefs.getInt(SYNC_INTERVAL_IN_MINUTES_STRING, 1440); AccountManager mAccountManager = AccountManager.get(context); - Account[] accounts = mAccountManager.getAccountsByType(AccountGeneral.ACCOUNT_TYPE); + String accountType = AccountGeneral.getAccountType(context); + Account[] accounts = mAccountManager.getAccountsByType(accountType); for (Account account : accounts) { if (minutes != 0) { long SYNC_INTERVAL = minutes * SECONDS_PER_MINUTE; - ContentResolver.setSyncAutomatically(account, AccountGeneral.ACCOUNT_TYPE, true); + ContentResolver.setSyncAutomatically(account, accountType, true); Bundle bundle = new Bundle(); ContentResolver.addPeriodicSync( account, - AccountGeneral.ACCOUNT_TYPE, + accountType, bundle, SYNC_INTERVAL); } else { - ContentResolver.setSyncAutomatically(account, AccountGeneral.ACCOUNT_TYPE, false); + ContentResolver.setSyncAutomatically(account, accountType, false); } } } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/authentication/AccountGeneral.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/authentication/AccountGeneral.java index 81b3902a..f8d2734d 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/authentication/AccountGeneral.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/authentication/AccountGeneral.java @@ -1,10 +1,10 @@ package de.luhmer.owncloudnewsreader.authentication; +import android.content.Context; + +import de.luhmer.owncloudnewsreader.R; + public class AccountGeneral { - /** - * Account type id - */ - public static final String ACCOUNT_TYPE = "de.luhmer.owncloudnewsreader"; /** * Account name @@ -21,4 +21,10 @@ public class AccountGeneral { public static final String AUTHTOKEN_TYPE_FULL_ACCESS = "Full access"; public static final String AUTHTOKEN_TYPE_FULL_ACCESS_LABEL = "Full access to an Nextcloud News account"; + /** + * Account type id + */ + public static String getAccountType(Context context) { + return context.getString(R.string.account_type); + } } diff --git a/News-Android-App/src/main/res/values/strings.xml b/News-Android-App/src/main/res/values/strings.xml index a16910bc..f7c84af4 100644 --- a/News-Android-App/src/main/res/values/strings.xml +++ b/News-Android-App/src/main/res/values/strings.xml @@ -3,6 +3,8 @@ <string name="auto_sync_string">Auto sync</string> <string name="app_name" translatable="false">News</string> + <string name="account_type" translatable="false">de.luhmer.owncloudnewsreader</string> + <string name="authority" translatable="false">de.luhmer.owncloudnewsreader</string> <string name="title_activity_sync_interval_selector">Sync Interval</string> <string name="title_activity_news_detail">NewsDetailActivity</string> <string name="empty_view_content">No items here</string> diff --git a/News-Android-App/src/main/res/xml/authenticator.xml b/News-Android-App/src/main/res/xml/authenticator.xml index d81131bc..14e05b26 100644 --- a/News-Android-App/src/main/res/xml/authenticator.xml +++ b/News-Android-App/src/main/res/xml/authenticator.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android" - android:accountType="de.luhmer.owncloudnewsreader" + android:accountType="@string/account_type" android:icon="@mipmap/ic_launcher" android:smallIcon="@mipmap/ic_launcher" android:label="@string/app_name" diff --git a/News-Android-App/src/main/res/xml/syncadapter.xml b/News-Android-App/src/main/res/xml/syncadapter.xml index a67c2118..234843c7 100644 --- a/News-Android-App/src/main/res/xml/syncadapter.xml +++ b/News-Android-App/src/main/res/xml/syncadapter.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android" - android:contentAuthority="de.luhmer.owncloudnewsreader" - android:accountType="de.luhmer.owncloudnewsreader" + android:contentAuthority="@string/authority" + android:accountType="@string/account_type" android:userVisible="true" android:supportsUploading="false" />
\ No newline at end of file |