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 4e8d7ae8..4f77ae20 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 @@ -458,7 +458,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements MaterialShowcaseSequence sequence = new MaterialShowcaseSequence(this, "SWIPE_LEFT_RIGHT_AND_PTR"); sequence.setConfig(config); sequence.addSequenceItem(getNewsReaderDetailFragment().pbLoading, - "Pull-to-Refresh to sync with ownCloud", "GOT IT"); + "Pull-to-Refresh to sync with server", "GOT IT"); sequence.addSequenceItem(getNewsReaderDetailFragment().pbLoading, "Swipe Left/Right to mark article as read", "GOT IT"); sequence.start(); diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java index 7fc5bb79..d9fd5567 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java @@ -257,7 +257,7 @@ public class NewsReaderListFragment extends Fragment implements OnCreateContextM new MaterialShowcaseView.Builder(getActivity()) .setTarget(headerLogo) .setDismissText("GOT IT") - .setContentText("Tap this logo to sync with ownCloud") + .setContentText("Tap this logo to sync with server") .setDelay(300) // optional but starting animations immediately in onCreate can make them choppy .singleUse("LOGO_SYNC") // provide a unique ID used to ensure it is only shown once .show(); 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 3ae1823d..81b3902a 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 @@ -16,9 +16,9 @@ public class AccountGeneral { * Auth token types */ public static final String AUTHTOKEN_TYPE_READ_ONLY = "Read only"; - public static final String AUTHTOKEN_TYPE_READ_ONLY_LABEL = "Read only access to an ownCloud News account"; + public static final String AUTHTOKEN_TYPE_READ_ONLY_LABEL = "Read only access to an Nextcloud News account"; public static final String AUTHTOKEN_TYPE_FULL_ACCESS = "Full access"; - public static final String AUTHTOKEN_TYPE_FULL_ACCESS_LABEL = "Full access to an ownCloud News account"; + public static final String AUTHTOKEN_TYPE_FULL_ACCESS_LABEL = "Full access to an Nextcloud News account"; } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/DownloadImagesService.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/DownloadImagesService.java index 6f3186ea..3f540d66 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/DownloadImagesService.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/DownloadImagesService.java @@ -153,7 +153,7 @@ public class DownloadImagesService extends IntentService { Intent intentNewsReader = new Intent(this, NewsReaderListActivity.class); PendingIntent pIntent = PendingIntent.getActivity(this, 0, intentNewsReader, 0); NotificationCompat.Builder notifyBuilder = new NotificationCompat.Builder(this) - .setContentTitle("ownCloud News Reader") + .setContentTitle("Nextcloud News") .setContentText("Only " + limit + " images can be cached at once") .setSmallIcon(R.drawable.ic_notification) .setContentIntent(pIntent); diff --git a/News-Android-App/src/main/res/values/strings.xml b/News-Android-App/src/main/res/values/strings.xml index 00eeaf3a..b2a9c694 100644 --- a/News-Android-App/src/main/res/values/strings.xml +++ b/News-Android-App/src/main/res/values/strings.xml @@ -2,7 +2,7 @@ Auto sync - ownCloud News + Nextcloud News Sync Interval Selector NewsDetailActivity No items here @@ -10,7 +10,7 @@ No WiFi connected Do you want to download the images without a WiFi connection You\'re using Version %s - ownCloud News + Nextcloud News %d new item available %d new items available @@ -80,8 +80,8 @@ Username Password - ownCloud root address - https://1.2.3.4/owncloud + Nextcloud root address + https://1.2.3.4/nextcloud Sign in Signing in… @@ -213,7 +213,7 @@ Error Something went wrong :( The Web News App returned Version "0". Please take a look at the following bug report: https://github.com/nextcloud/news/issues/5#issuecomment-242883795 - This App version is not compatible with your ownCloud News App. Please update the news app and the appframework. + This App version is not compatible with your Nextcloud News App. Please update the news app and the appframework. Security Warning You\'re not using https. An attacker could intercept your traffic and gain access to some sensitive data (e.g. your password). So it\'s strongly recommend to use https!