From 9f94af6239121a32d5c391b0ddc26a577e14f135 Mon Sep 17 00:00:00 2001 From: Amine Bou Date: Sun, 20 May 2018 10:13:29 +0200 Subject: [PATCH] Removed firebase and crashlytics --- .github/CONTRIBUTING.md | 2 - app/build.gradle | 34 ---------- app/src/main/AndroidManifest.xml | 11 +--- .../bou/readerforselfoss/HomeActivity.kt | 50 +-------------- .../bou/readerforselfoss/LoginActivity.kt | 10 +-- .../apps/amine/bou/readerforselfoss/MyApp.kt | 3 - .../bou/readerforselfoss/ReaderActivity.kt | 17 +---- .../readerforselfoss/adapters/ItemsAdapter.kt | 10 +-- .../fragments/ArticleFragment.kt | 63 +++---------------- .../bou/readerforselfoss/utils/AppUtils.kt | 49 --------------- .../bou/readerforselfoss/utils/ItemsUtils.kt | 8 +-- app/src/main/res/menu/home_menu.xml | 5 -- app/src/main/res/values-af-rZA/strings.xml | 1 - app/src/main/res/values-ar-rSA/strings.xml | 1 - app/src/main/res/values-ca-rES/strings.xml | 2 +- app/src/main/res/values-cs-rCZ/strings.xml | 2 +- app/src/main/res/values-da-rDK/strings.xml | 2 +- app/src/main/res/values-de-rDE/strings.xml | 2 +- app/src/main/res/values-el-rGR/strings.xml | 2 +- app/src/main/res/values-es-rES/strings.xml | 2 +- app/src/main/res/values-fi-rFI/strings.xml | 2 +- app/src/main/res/values-fr-rFR/strings.xml | 2 +- app/src/main/res/values-hu-rHU/strings.xml | 2 +- app/src/main/res/values-in-rID/strings.xml | 2 +- app/src/main/res/values-it-rIT/strings.xml | 2 +- app/src/main/res/values-iw-rIL/strings.xml | 2 +- app/src/main/res/values-ja-rJP/strings.xml | 2 +- app/src/main/res/values-ko-rKR/strings.xml | 2 +- app/src/main/res/values-nl-rNL/strings.xml | 2 +- app/src/main/res/values-no-rNO/strings.xml | 2 +- app/src/main/res/values-pl-rPL/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt-rPT/strings.xml | 2 +- app/src/main/res/values-ro-rRO/strings.xml | 2 +- app/src/main/res/values-ru-rRU/strings.xml | 2 +- app/src/main/res/values-sr-rSP/strings.xml | 2 +- app/src/main/res/values-sv-rSE/strings.xml | 2 +- app/src/main/res/values-tr-rTR/strings.xml | 2 +- app/src/main/res/values-uk-rUA/strings.xml | 2 +- app/src/main/res/values-vi-rVN/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 1 - build.gradle | 4 -- 44 files changed, 43 insertions(+), 282 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 4ea6526..1a44615 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -47,8 +47,6 @@ You can directly import this project into IntellIJ/Android Studio. You'll have to: -- Configure fabric and add your `apiKey` and `apiSecret` in the `fabric.properties` file. -- Create a firebase project and add the `google-services.json` to the `app/` folder. - Define some parameters either in `~/.gradle/gradle.properties` or as gradle parameters (see the examples) - mercuryApiKey: A [Mercury](https://mercury.postlight.com/web-parser/) web parser api key for the internal browser diff --git a/app/build.gradle b/app/build.gradle index cb5e372..83daa51 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,4 @@ buildscript { - repositories { - maven { url 'https://maven.fabric.io/public' } - } - - dependencies { - classpath 'io.fabric.tools:gradle:1.+' - } } ext { @@ -37,16 +30,11 @@ def versionNameFromGit() { apply plugin: 'com.android.application' -apply plugin: 'io.fabric' - apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' repositories { - maven { - url 'https://maven.fabric.io/public' - } } android { @@ -129,14 +117,6 @@ dependencies { implementation 'com.android.support:cardview-v7:27.1.1' implementation 'com.android.support.constraint:constraint-layout:1.1.0' - // Firebase + crashlytics - implementation 'com.google.firebase:firebase-core:15.0.2' - implementation 'com.google.firebase:firebase-config:15.0.2' - implementation 'com.google.firebase:firebase-invites:15.0.1' - implementation('com.crashlytics.sdk.android:crashlytics:2.9.1@aar') { - transitive = true - } - //multidex implementation 'com.android.support:multidex:1.0.3' @@ -186,26 +166,12 @@ dependencies { } -apply plugin: 'com.google.gms.google-services' - afterEvaluate { - initFabricPropertiesIfNeeded() initAppLoginPropertiesIfNeeded() initAppForSecretPropertiesIfNeeded() } -def initFabricPropertiesIfNeeded() { - def propertiesFile = file('fabric.properties') - if (!propertiesFile.exists()) { - def commentMessage = "This is autogenerated fabric property from system environment to prevent key to be committed to source control." - ant.propertyfile(file: "fabric.properties", comment: commentMessage) { - entry(key: "apiSecret", value: crashlyticsdemoApisecret) - entry(key: "apiKey", value: crashlyticsdemoApikey) - } - } -} - def initAppLoginPropertiesIfNeeded() { def propertiesFile = file(System.getProperty("user.home") + '/.gradle/gradle.properties') if (!propertiesFile.exists()) { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b31db38..5d23e85 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,15 +4,6 @@ xmlns:tools="http://schemas.android.com/tools"> - - - - - - - - - - + diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt index 3299bb0..6ddcaa2 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt @@ -38,7 +38,6 @@ import apps.amine.bou.readerforselfoss.themes.Toppings import apps.amine.bou.readerforselfoss.utils.Config import apps.amine.bou.readerforselfoss.utils.bottombar.maybeShow import apps.amine.bou.readerforselfoss.utils.bottombar.removeBadge -import apps.amine.bou.readerforselfoss.utils.checkApkVersion import apps.amine.bou.readerforselfoss.utils.customtabs.CustomTabActivityHelper import apps.amine.bou.readerforselfoss.utils.drawer.CustomUrlPrimaryDrawerItem import apps.amine.bou.readerforselfoss.utils.flattenTags @@ -54,15 +53,8 @@ import com.anupcowkur.reservoir.ReservoirPutCallback import com.ashokvarma.bottomnavigation.BottomNavigationBar import com.ashokvarma.bottomnavigation.BottomNavigationItem import com.ashokvarma.bottomnavigation.TextBadgeItem -import com.crashlytics.android.Crashlytics -import com.crashlytics.android.answers.Answers -import com.crashlytics.android.answers.InviteEvent import com.ftinc.scoop.Scoop import com.github.stkent.amplify.tracking.Amplify -import com.google.android.gms.appinvite.AppInviteInvitation -import com.google.android.gms.common.ConnectionResult -import com.google.android.gms.common.GoogleApiAvailability -import com.google.firebase.remoteconfig.FirebaseRemoteConfig import com.google.gson.reflect.TypeToken import com.heinrichreimersoftware.androidissuereporter.IssueReporterLauncher import com.mikepenz.aboutlibraries.Libs @@ -80,8 +72,6 @@ import retrofit2.Response class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { private val MENU_PREFERENCES = 12302 - private val REQUEST_INVITE = 13231 - private val REQUEST_INVITE_BYMAIL = 13232 private val DRAWER_ID_TAGS = 100101L private val DRAWER_ID_SOURCES = 100110L private val DRAWER_ID_FILTERS = 100111L @@ -120,7 +110,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { private lateinit var customTabActivityHelper: CustomTabActivityHelper private lateinit var editor: SharedPreferences.Editor private lateinit var sharedPref: SharedPreferences - private lateinit var firebaseRemoteConfig: FirebaseRemoteConfig private lateinit var appColors: AppColors private var offset: Int = 0 private var firstVisible: Int = 0 @@ -157,9 +146,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { Amplify.getSharedInstance().promptIfReady(promptView) } - firebaseRemoteConfig = FirebaseRemoteConfig.getInstance() - firebaseRemoteConfig.setDefaults(R.xml.default_remote_config) - customTabActivityHelper = CustomTabActivityHelper() sharedPref = PreferenceManager.getDefaultSharedPreferences(this) @@ -338,10 +324,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { editor = settings.edit() - if (BuildConfig.GITHUB_VERSION) { - this@HomeActivity.checkApkVersion(settings, editor, firebaseRemoteConfig) - } - handleSharedPrefs() handleThemeUpdate() @@ -1057,13 +1039,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { drawer.closeDrawer() recreate() } - REQUEST_INVITE -> if (result == Activity.RESULT_OK) { - Answers.getInstance().logInvite(InviteEvent()) - } - REQUEST_INVITE_BYMAIL -> { - Answers.getInstance().logInvite(InviteEvent()) - super.onActivityResult(req, result, data) - } else -> super.onActivityResult(req, result, data) } } @@ -1129,9 +1104,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { .toMap() fun readAllDebug(e: Throwable) { - Crashlytics.setUserIdentifier(userIdentifier) - Crashlytics.log(100, "READ_ALL_ERROR", e.message) - Crashlytics.logException(e) + // TODO: debug } if (ids.isNotEmpty()) { @@ -1208,27 +1181,6 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { R.id.action_disconnect -> { return Config.logoutAndRedirect(this, this@HomeActivity, editor) } - R.id.action_share_the_app -> { - if (GoogleApiAvailability.getInstance().isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS) { - val share = - AppInviteInvitation.IntentBuilder(getString(R.string.invitation_title)) - .setMessage(getString(R.string.invitation_message)) - .setDeepLink(Uri.parse("https://ymbh5.app.goo.gl/qbvQ")) - .setCallToActionText(getString(R.string.invitation_cta)) - .build() - startActivityForResult(share, REQUEST_INVITE) - } else { - val sendIntent = Intent() - sendIntent.action = Intent.ACTION_SEND - sendIntent.putExtra( - Intent.EXTRA_TEXT, - getString(R.string.invitation_message) + " https://ymbh5.app.goo.gl/qbvQ" - ) - sendIntent.type = "text/plain" - startActivityForResult(sendIntent, REQUEST_INVITE_BYMAIL) - } - return super.onOptionsItemSelected(item) - } else -> return super.onOptionsItemSelected(item) } } diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt index dadf042..55c973b 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/LoginActivity.kt @@ -20,8 +20,6 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse import apps.amine.bou.readerforselfoss.themes.AppColors import apps.amine.bou.readerforselfoss.utils.Config import apps.amine.bou.readerforselfoss.utils.isBaseUrlValid -import com.crashlytics.android.Crashlytics -import com.google.firebase.analytics.FirebaseAnalytics import com.mikepenz.aboutlibraries.Libs import com.mikepenz.aboutlibraries.LibsBuilder import kotlinx.android.synthetic.main.activity_login.* @@ -38,7 +36,6 @@ class LoginActivity : AppCompatActivity() { private lateinit var settings: SharedPreferences private lateinit var editor: SharedPreferences.Editor - private lateinit var firebaseAnalytics: FirebaseAnalytics private lateinit var userIdentifier: String private var logErrors: Boolean = false private lateinit var appColors: AppColors @@ -65,8 +62,6 @@ class LoginActivity : AppCompatActivity() { goToMain() } - firebaseAnalytics = FirebaseAnalytics.getInstance(this) - handleActions() } @@ -213,9 +208,7 @@ class LoginActivity : AppCompatActivity() { httpLoginView.error = getString(R.string.wrong_infos) httpPasswordView.error = getString(R.string.wrong_infos) if (logErrors) { - Crashlytics.setUserIdentifier(userIdentifier) - Crashlytics.log(100, "LOGIN_DEBUG_ERRROR", t.message) - Crashlytics.logException(t) + // TODO: log Toast.makeText( this@LoginActivity, t.message, @@ -230,7 +223,6 @@ class LoginActivity : AppCompatActivity() { response: Response ) { if (response.body() != null && response.body()!!.isSuccess) { - firebaseAnalytics.logEvent(FirebaseAnalytics.Event.LOGIN, Bundle()) goToMain() } else { preferenceError(Exception("No response body...")) diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt index 370c559..b5e590c 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/MyApp.kt @@ -10,14 +10,12 @@ import apps.amine.bou.readerforselfoss.utils.Config import com.anupcowkur.reservoir.Reservoir import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions -import com.crashlytics.android.Crashlytics import com.ftinc.scoop.Scoop import com.github.stkent.amplify.feedback.DefaultEmailFeedbackCollector import com.github.stkent.amplify.feedback.GooglePlayStoreFeedbackCollector import com.github.stkent.amplify.tracking.Amplify import com.mikepenz.materialdrawer.util.AbstractDrawerImageLoader import com.mikepenz.materialdrawer.util.DrawerImageLoader -import io.fabric.sdk.android.Fabric import java.io.IOException import java.util.UUID.randomUUID @@ -25,7 +23,6 @@ class MyApp : MultiDexApplication() { override fun onCreate() { super.onCreate() - Fabric.with(this, Crashlytics()) initAmplify() diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt index af1c77d..22fa3f9 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/ReaderActivity.kt @@ -24,7 +24,6 @@ import apps.amine.bou.readerforselfoss.transformers.DepthPageTransformer import apps.amine.bou.readerforselfoss.utils.Config import apps.amine.bou.readerforselfoss.utils.succeeded import apps.amine.bou.readerforselfoss.utils.toggleStar -import com.crashlytics.android.Crashlytics import com.ftinc.scoop.Scoop import kotlinx.android.synthetic.main.activity_reader.* import me.relex.circleindicator.CircleIndicator @@ -132,13 +131,7 @@ class ReaderActivity : AppCompatActivity() { "response errorBody: ${response.errorBody()?.string()} " + "body success: ${response.body()?.success} " + "body isSuccess: ${response.body()?.isSuccess}" - Crashlytics.setUserIdentifier(userIdentifier) - Crashlytics.log( - 100, - "READ_DEBUG_SUCCESS", - message - ) - Crashlytics.logException(Exception("Was success, but did it work ?")) + // TODO: logs } } @@ -147,13 +140,7 @@ class ReaderActivity : AppCompatActivity() { t: Throwable ) { if (debugReadingItems) { - Crashlytics.setUserIdentifier(userIdentifier) - Crashlytics.log( - 100, - "READ_DEBUG_ERROR", - t.message - ) - Crashlytics.logException(t) + // TODO: logs } } } diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt index 1d275c1..3098730 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/ItemsAdapter.kt @@ -12,7 +12,6 @@ import apps.amine.bou.readerforselfoss.api.selfoss.SelfossApi import apps.amine.bou.readerforselfoss.api.selfoss.SuccessResponse import apps.amine.bou.readerforselfoss.themes.AppColors import apps.amine.bou.readerforselfoss.utils.succeeded -import com.crashlytics.android.Crashlytics import retrofit2.Call import retrofit2.Callback import retrofit2.Response @@ -89,10 +88,7 @@ abstract class ItemsAdapter : RecyclerView.Adapte "response errorBody: ${response.errorBody()?.string()} " + "body success: ${response.body()?.success} " + "body isSuccess: ${response.body()?.isSuccess}" - Crashlytics.setUserIdentifier(userIdentifier) - Crashlytics.log(100, "READ_DEBUG_SUCCESS", message) - Crashlytics.logException(Exception("Was success, but did it work ?")) - + // TODO: logs Toast.makeText(app.baseContext, message, Toast.LENGTH_LONG).show() } doUnmark(i, position) @@ -100,9 +96,7 @@ abstract class ItemsAdapter : RecyclerView.Adapte override fun onFailure(call: Call, t: Throwable) { if (debugReadingItems) { - Crashlytics.setUserIdentifier(userIdentifier) - Crashlytics.log(100, "READ_DEBUG_ERROR", t.message) - Crashlytics.logException(t) + // TODO: logs Toast.makeText(app.baseContext, t.message, Toast.LENGTH_LONG).show() } Toast.makeText( diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt index 7604bae..fc41b54 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/fragments/ArticleFragment.kt @@ -35,8 +35,6 @@ import apps.amine.bou.readerforselfoss.utils.sourceAndDateText import apps.amine.bou.readerforselfoss.utils.toPx import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions -import com.crashlytics.android.Crashlytics -import com.ftinc.scoop.Scoop import com.github.rubensousa.floatingtoolbar.FloatingToolbar import kotlinx.android.synthetic.main.fragment_article.view.* import retrofit2.Call @@ -197,25 +195,13 @@ class ArticleFragment : Fragment() { rootView.titleView.text = response.body()!!.title url = response.body()!!.url } catch (e: Exception) { - Crashlytics.setUserIdentifier(prefs.getString("unique_id", "")) - Crashlytics.log( - 100, - "MERCURY_CONTENT_EXCEPTION", - "source titleView or url issues" - ) - Crashlytics.logException(e) + // TODO: logs } try { htmlToWebview(response.body()!!.content.orEmpty(), prefs, context) } catch (e: Exception) { - Crashlytics.setUserIdentifier(prefs.getString("unique_id", "")) - Crashlytics.log( - 100, - "MERCURY_CONTENT_EXCEPTION", - "Webview issue ${e.message}" - ) - Crashlytics.logException(e) + // TODO: logs } try { @@ -229,30 +215,13 @@ class ArticleFragment : Fragment() { .apply(RequestOptions.fitCenterTransform()) .into(rootView.imageView) } catch (e: Exception) { - Crashlytics.setUserIdentifier( - prefs.getString( - "unique_id", - "" - ) - ) - Crashlytics.log( - 100, - "MERCURY_CONTENT_EXCEPTION", - "Glide issue with image ${response.body()!!.lead_image_url}" - ) - Crashlytics.logException(e) + // TODO: logs } } else { rootView.imageView.visibility = View.GONE } } catch (e: Exception) { - Crashlytics.setUserIdentifier(prefs.getString("unique_id", "")) - Crashlytics.log( - 100, - "MERCURY_CONTENT_EXCEPTION", - "Glide or image issue" - ) - Crashlytics.logException(e) + // TODO: logs } try { @@ -260,35 +229,17 @@ class ArticleFragment : Fragment() { rootView.progressBar.visibility = View.GONE } catch (e: Exception) { - Crashlytics.setUserIdentifier(prefs.getString("unique_id", "")) - Crashlytics.log( - 100, - "MERCURY_CONTENT_EXCEPTION", - "Scroll or visibility issues" - ) - Crashlytics.logException(e) + // TODO: logs } } else { try { openInBrowserAfterFailing(customTabsIntent) } catch (e: Exception) { - Crashlytics.setUserIdentifier(prefs.getString("unique_id", "")) - Crashlytics.log( - 100, - "MERCURY_CONTENT_EXCEPTION", - "Browser after failing issue" - ) - Crashlytics.logException(e) + // TODO: logs } } } catch (e: Exception) { - Crashlytics.setUserIdentifier(prefs.getString("unique_id", "")) - Crashlytics.log( - 100, - "MERCURY_CONTENT_EXCEPTION", - "UNCAUGHT (?) Fatal Exception on mercury response" - ) - Crashlytics.logException(e) + // TODO: logs } } diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/AppUtils.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/AppUtils.kt index dc77688..10ee17e 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/AppUtils.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/AppUtils.kt @@ -2,60 +2,11 @@ package apps.amine.bou.readerforselfoss.utils import android.content.Context import android.content.Intent -import android.content.SharedPreferences -import android.net.Uri -import android.support.v7.app.AlertDialog import apps.amine.bou.readerforselfoss.R -import com.google.firebase.remoteconfig.FirebaseRemoteConfig fun String?.isEmptyOrNullOrNullString(): Boolean = this == null || this == "null" || this.isEmpty() -fun Context.checkApkVersion( - settings: SharedPreferences, - editor: SharedPreferences.Editor, - mFirebaseRemoteConfig: FirebaseRemoteConfig -) = { - fun isThereAnUpdate() { - val APK_LINK = "github_apk" - - val apkLink = mFirebaseRemoteConfig.getString(APK_LINK) - val storedLink = settings.getString(APK_LINK, "") - if (apkLink != storedLink && !apkLink.isEmpty()) { - val alertDialog = AlertDialog.Builder(this).create() - alertDialog.setTitle(getString(R.string.new_apk_available_title)) - alertDialog.setMessage(getString(R.string.new_apk_available_message)) - alertDialog.setButton( - AlertDialog.BUTTON_POSITIVE, - getString(R.string.new_apk_available_get) - ) { _, _ -> - editor.putString(APK_LINK, apkLink) - editor.apply() - val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(apkLink)) - startActivity(browserIntent) - } - alertDialog.setButton( - AlertDialog.BUTTON_NEUTRAL, getString(R.string.new_apk_available_no), - { dialog, _ -> - editor.putString(APK_LINK, apkLink) - editor.apply() - dialog.dismiss() - } - ) - alertDialog.show() - } - } - - mFirebaseRemoteConfig.fetch(43200) - .addOnCompleteListener { task -> - if (task.isSuccessful) { - mFirebaseRemoteConfig.activateFetched() - } - - isThereAnUpdate() - } -} - fun String.longHash(): Long { var h = 98764321261L val l = this.length diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ItemsUtils.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ItemsUtils.kt index 6b81aca..157af47 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ItemsUtils.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/utils/ItemsUtils.kt @@ -2,7 +2,6 @@ package apps.amine.bou.readerforselfoss.utils import android.text.format.DateUtils import apps.amine.bou.readerforselfoss.api.selfoss.Item -import com.crashlytics.android.Crashlytics import java.text.ParseException import java.text.SimpleDateFormat import java.util.* @@ -13,12 +12,7 @@ fun String.toTextDrawableString(): String { try { textDrawable.append(s[0]) } catch (e: StringIndexOutOfBoundsException) { - Crashlytics.log( - 100, - "TEXT_DRAWABLE_INDEX_OUT_OF_BOUND", - this + " produces ${e.message}" - ) - Crashlytics.logException(e) + // TODO: logs } } return textDrawable.toString() diff --git a/app/src/main/res/menu/home_menu.xml b/app/src/main/res/menu/home_menu.xml index 3f424ec..0137db5 100644 --- a/app/src/main/res/menu/home_menu.xml +++ b/app/src/main/res/menu/home_menu.xml @@ -20,11 +20,6 @@ android:orderInCategory="99" android:title="@string/menu_home_refresh" /> - - "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml index e4be249..e93c2de 100644 --- a/app/src/main/res/values-ar-rSA/strings.xml +++ b/app/src/main/res/values-ar-rSA/strings.xml @@ -64,7 +64,6 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml index 88f097e..6de815e 100644 --- a/app/src/main/res/values-ca-rES/strings.xml +++ b/app/src/main/res/values-ca-rES/strings.xml @@ -64,7 +64,7 @@ "Mostra el recompte d'articles no llegits amb un distintiu a la barra inferior." "Mostra el recompte d'articles no llegits" "Mostra el recompte d'articles llegits" - "Convida amics" + "Prova aquesta aplicació per als canals RSS de Selfoss." "Jo utilitzo aquesta aplicació per llegir els canals RSS de Selfoss. Segur que a tu també t'agrada!" "Prova l'aplicació" diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index e4be249..d9b2772 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -64,7 +64,7 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" + "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml index e4be249..d9b2772 100644 --- a/app/src/main/res/values-da-rDK/strings.xml +++ b/app/src/main/res/values-da-rDK/strings.xml @@ -64,7 +64,7 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" + "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index c678df6..5043a09 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -64,7 +64,7 @@ "Zeige die Zahl ungelesener Artikel in der unteren Leiste." "Zeige Anzahl ungelesener Artikel" "Zeige Anzahl der Favoriten und gelesenen Artikel" - "Freunde einladen" + "Probiere diese App für deine Selfoss RSS-Feeds!" "Ich benutze diese App für meine Selfoss RSS-Feeds. Vielleicht magst du sie auch!" "Probier die App" diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml index e4be249..d9b2772 100644 --- a/app/src/main/res/values-el-rGR/strings.xml +++ b/app/src/main/res/values-el-rGR/strings.xml @@ -64,7 +64,7 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" + "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index b7df64e..d5ef19b 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -64,7 +64,7 @@ "Mostrar el recuento no leído como una insignia de la barra inferior." "Mostrar recuento no leído" "Mostrar recuento de favoritos y leídos" - "Invitar amigos" + "¡Prueba esta aplicación para tu contenido RSS de Selfoss!" "Yo uso esta aplicación para mi contenido RSS de Selfoss. ¡Te puede gusta también!" "Probar la aplicación" diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml index e4be249..d9b2772 100644 --- a/app/src/main/res/values-fi-rFI/strings.xml +++ b/app/src/main/res/values-fi-rFI/strings.xml @@ -64,7 +64,7 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" + "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index c4c452c..a0df6af 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -64,7 +64,7 @@ "Afficher le nombre d'articles non lus sur la barre en bas de l'écran" "Afficher le nombre de non lus" "Afficher le nombre de favoris et d'articles lus" - "Inviter des amis" + "Essaye cette application pour les flux RSS Selfoss !" "J'utilise cette applications pour mon flux RSS Selfoss. Tu aimeras peut être !" "Essayer maintenant" diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml index e4be249..d9b2772 100644 --- a/app/src/main/res/values-hu-rHU/strings.xml +++ b/app/src/main/res/values-hu-rHU/strings.xml @@ -64,7 +64,7 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" + "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index 8605595..1e70e38 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -64,7 +64,7 @@ "Tampilkan jumlah item yang belum dibaca di bilah bawah." "Tampilkan jumlah item yang belum dibaca" "Tampilkan jumlah item untuk favorit dan sudah dibaca" - "Undang teman" + "Coba mengggunakan aplikasi ini untuk umpan RSS Selfoss Anda !" "Saya menggunakan aplikasi ini untuk umpan RSS Selfoss saya. Anda akan menyukainya juga!" "Coba aplikasi" diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index e4be249..d9b2772 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -64,7 +64,7 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" + "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml index e4be249..d9b2772 100644 --- a/app/src/main/res/values-iw-rIL/strings.xml +++ b/app/src/main/res/values-iw-rIL/strings.xml @@ -64,7 +64,7 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" + "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index e4be249..d9b2772 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -64,7 +64,7 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" + "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index e4be249..d9b2772 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -64,7 +64,7 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" + "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml index 141702a..6d73c69 100644 --- a/app/src/main/res/values-nl-rNL/strings.xml +++ b/app/src/main/res/values-nl-rNL/strings.xml @@ -64,7 +64,7 @@ "Geef het aantal ongelezen artikelen weer in de balk onderaan" "Geef aantal ongelezen weer" "Geef aantal weer bij favorieten en gelezen" - "Vrienden uitnodigen" + "Probeer deze app voor je Selfoss RSS feeds!" "Ik gebruik deze app voor mijn Selfoss RSS feeds. Misschien is het ook wat voor jou!" "App proberen" diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index e4be249..d9b2772 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -64,7 +64,7 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" + "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index e4be249..d9b2772 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -64,7 +64,7 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" + "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index b45b862..fdd2866 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -64,7 +64,7 @@ "Exibir a contagem de artigos não lidos como um badge na barra inferior." "Exibir contagem de artigos não lidos" "Exibir contagem de lidos e favoritos" - "Convidar amigos" + "Experimente este aplicativo para seus feeds RSS do Selfoss !" "Eu uso o app para o visualizar meu feed RSS do Selfoss. Você vai gostar também !" "Experimente o aplicativo" diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 6e60eff..3441810 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -64,7 +64,7 @@ "Exibir a contagem não lida como um emblema para a barra inferior." "Exibir a contagem não lida" "Exibir a contagem para o favorito e leitura" - "Convidar amigos" + "Tente este aplicativo para seus Selfoss RSS feeds!" "Eu uso este app para meus Selfoss RSS feeds. Você pode gostar também!" "Tente o aplicativo" diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml index e4be249..d9b2772 100644 --- a/app/src/main/res/values-ro-rRO/strings.xml +++ b/app/src/main/res/values-ro-rRO/strings.xml @@ -64,7 +64,7 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" + "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index e4be249..d9b2772 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -64,7 +64,7 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" + "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml index e4be249..d9b2772 100644 --- a/app/src/main/res/values-sr-rSP/strings.xml +++ b/app/src/main/res/values-sr-rSP/strings.xml @@ -64,7 +64,7 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" + "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index e4be249..d9b2772 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -64,7 +64,7 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" + "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 7cf751c..41dc625 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -64,7 +64,7 @@ "Okunmamış sayıyı, alt çubuk için bir rozet olarak görüntüleyin." "Okunmamış sayıyı görüntüle" "Favori ve okunan sayıları göster" - "Arkadaşları davet et" + "Selfoss RSS yayınlarınız için bu uygulamayı deneyin!" "Bu uygulamayı Selfoss RSS özet akışlarım için kullanıyorum. Sizin de hoşunuza gidebilir !" "Uygulamayı dene" diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml index e4be249..d9b2772 100644 --- a/app/src/main/res/values-uk-rUA/strings.xml +++ b/app/src/main/res/values-uk-rUA/strings.xml @@ -64,7 +64,7 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" + "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml index e4be249..d9b2772 100644 --- a/app/src/main/res/values-vi-rVN/strings.xml +++ b/app/src/main/res/values-vi-rVN/strings.xml @@ -64,7 +64,7 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" + "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 5856626..684b2f5 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -64,7 +64,7 @@ "将未读数在底部显示为一个徽标。" "显示未读数" "显示收藏和已读的计数" - "邀请朋友" + "尝试用这个应用来阅读你的 Selfoss RSS 源！" "我用这个应用来阅读我的 Selfoss RSS 源。你也会喜欢的！" "试用应用程序" diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 0b98a50..1adf9c4 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -64,7 +64,7 @@ "将未读数在底部显示为一个徽标。" "显示未读数" "显示收藏和已读的计数" - "邀请朋友" + "尝试用这个应用来阅读你的 Selfoss RSS 源！" "我用这个应用来阅读我的 Selfoss RSS 源。你也会喜欢的！" "试用应用程序" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 706e768..e9ec573 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -62,7 +62,6 @@ "Display the unread count as a badge for the bottom bar." "Display unread count" "Display count for favorite and read" - "Invite friends" "Try this app for your Selfoss RSS feeds !" "I use this app for my Selfoss RSS feeds. You may like it too !" "Try the app" diff --git a/build.gradle b/build.gradle index 657022c..42d6957 100644 --- a/build.gradle +++ b/build.gradle @@ -12,10 +12,6 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:3.1.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - classpath 'com.google.gms:google-services:3.3.0' } }