forked from Louvorg/ReaderForSelfoss-multiplatform
		
	Compare commits
	
		
			2 Commits
		
	
	
		
			v123020491
			...
			v123020511
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | 6ac97ed3fe | ||
|  | d583b937b7 | 
| @@ -1,3 +1,9 @@ | ||||
| **v123020491** | ||||
|  | ||||
| - fix: Fixed acra bug reporting. | ||||
|  | ||||
| -------------------------------------------------------------------- | ||||
|  | ||||
| **v123010301** | ||||
|  | ||||
| - Chore: acra config. | ||||
|   | ||||
| @@ -34,6 +34,7 @@ import org.kodein.di.* | ||||
| class MyApp : MultiDexApplication(), DIAware { | ||||
|  | ||||
|     override val di by DI.lazy { | ||||
|         bind<AppSettingsService>() with singleton { AppSettingsService(ACRA.isACRASenderServiceProcess()) } | ||||
|         import(networkModule) | ||||
|         bind<DriverFactory>() with singleton { DriverFactory(applicationContext) } | ||||
|         bind<ReaderForSelfossDB>() with singleton { ReaderForSelfossDB(driverFactory.createDriver()) } | ||||
|   | ||||
| @@ -9,7 +9,6 @@ import org.kodein.di.instance | ||||
| import org.kodein.di.singleton | ||||
|  | ||||
| val networkModule by DI.Module { | ||||
|     bind<AppSettingsService>() with singleton { AppSettingsService() } | ||||
|     bind<SelfossApi>() with singleton { SelfossApi(instance()) } | ||||
|     bind<MercuryApi>() with singleton { MercuryApi() } | ||||
| } | ||||
| @@ -0,0 +1,70 @@ | ||||
| package bou.amine.apps.readerforselfossv2.service | ||||
|  | ||||
| import com.russhwolf.settings.Settings | ||||
|  | ||||
| // This will be used in ACRA process. For now, it does nothing. | ||||
| // This is to fix ACRA not sending reports anymore. | ||||
| // See https://www.acra.ch/docs/Troubleshooting-Guide#applicationoncreate | ||||
| class ACRASettings : Settings { | ||||
|     override val keys: Set<String> = emptySet() | ||||
|     override val size: Int = 0 | ||||
|  | ||||
|     override fun clear() { | ||||
|         // Nothing | ||||
|     } | ||||
|  | ||||
|     override fun getBoolean(key: String, defaultValue: Boolean): Boolean = false | ||||
|  | ||||
|     override fun getBooleanOrNull(key: String): Boolean? = null | ||||
|  | ||||
|     override fun getDouble(key: String, defaultValue: Double): Double = 0.0 | ||||
|  | ||||
|     override fun getDoubleOrNull(key: String): Double? = null | ||||
|  | ||||
|     override fun getFloat(key: String, defaultValue: Float): Float = 0.0F | ||||
|  | ||||
|     override fun getFloatOrNull(key: String): Float? = null | ||||
|  | ||||
|     override fun getInt(key: String, defaultValue: Int): Int = 0 | ||||
|  | ||||
|     override fun getIntOrNull(key: String): Int? = null | ||||
|  | ||||
|     override fun getLong(key: String, defaultValue: Long): Long = 0 | ||||
|  | ||||
|     override fun getLongOrNull(key: String): Long? = null | ||||
|  | ||||
|     override fun getString(key: String, defaultValue: String): String = "0" | ||||
|  | ||||
|     override fun getStringOrNull(key: String): String? = null | ||||
|  | ||||
|     override fun hasKey(key: String): Boolean = false | ||||
|  | ||||
|     override fun putBoolean(key: String, value: Boolean) { | ||||
|         // Nothing | ||||
|     } | ||||
|  | ||||
|     override fun putDouble(key: String, value: Double) { | ||||
|         // Nothing | ||||
|     } | ||||
|  | ||||
|     override fun putFloat(key: String, value: Float) { | ||||
|         // Nothing | ||||
|     } | ||||
|  | ||||
|     override fun putInt(key: String, value: Int) { | ||||
|         // Nothing | ||||
|     } | ||||
|  | ||||
|     override fun putLong(key: String, value: Long) { | ||||
|         // Nothing | ||||
|     } | ||||
|  | ||||
|     override fun putString(key: String, value: String) { | ||||
|         // Nothing | ||||
|     } | ||||
|  | ||||
|     override fun remove(key: String) { | ||||
|         // Nothing | ||||
|     } | ||||
|  | ||||
| } | ||||
| @@ -2,8 +2,8 @@ package bou.amine.apps.readerforselfossv2.service | ||||
|  | ||||
| import com.russhwolf.settings.Settings | ||||
|  | ||||
| class AppSettingsService { | ||||
|     val settings: Settings = Settings() | ||||
| class AppSettingsService(acraSenderServiceProcess: Boolean = false) { | ||||
|     val settings: Settings = if (acraSenderServiceProcess) { ACRASettings() } else { Settings() } | ||||
|  | ||||
|     // Api related | ||||
|     private var _apiVersion: Int = -1 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user