Don't use any android.R.string resources so that we do not have to force the locale

app/src/main/java/com/commit451/gitlab/App.kt

@@ -2,8 +2,6 @@ package com.commit451.gitlab
 import android.app.Application
 import android.content.Context
-import android.content.res.Resources
-import android.support.annotation.VisibleForTesting
 import android.support.multidex.MultiDex
 import com.commit451.gitlab.api.GitLab
 import com.commit451.gitlab.api.GitLabFactory
@@ -22,12 +20,11 @@ import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import org.greenrobot.eventbus.EventBus
 import timber.log.Timber
-import java.util.*
 /**
  * App for one time init things and to house singletons
  */
-open class App : Application() {
+class App : Application() {
     companion object {
@@ -64,8 +61,6 @@ open class App : Application() {
         setupThreeTen()
         Prefs.init(this)
-        //So that we don't get weird half translations
-        forceLocale(Locale.ENGLISH)
         setupCrashReporting()
         if (BuildConfig.DEBUG) {
@@ -109,47 +104,27 @@ open class App : Application() {
         return currentAccount
     }
-    @VisibleForTesting
-    protected open fun setupMultidex() {
+    fun setupMultidex() {
         MultiDex.install(this)
     }
-    @VisibleForTesting
-    protected open fun setupCrashReporting() {
+    fun setupCrashReporting() {
         FabricUtil.init(this)
     }
-    @VisibleForTesting
-    protected open fun setupLeakCanary() {
+    fun setupLeakCanary() {
         LeakCanary.install(this)
     }
-    @VisibleForTesting
-    protected open fun setupThreeTen() {
+    fun setupThreeTen() {
         AndroidThreeTen.init(this)
     }
-    private fun forceLocale(locale: Locale) {
-        try {
-            Locale.setDefault(locale)
-
-            val resources = arrayOf(Resources.getSystem(), baseContext.resources)
-            for (res in resources) {
-                val configuration = res.configuration
-                configuration.locale = locale
-                res.updateConfiguration(configuration, res.displayMetrics)
-            }
-        } catch (e: Exception) {
-            Timber.e(e)
-        }
-
-    }
-
-    private fun initGitLab(account: Account, clientBuilder: OkHttpClient.Builder) {
+    fun initGitLab(account: Account, clientBuilder: OkHttpClient.Builder) {
         gitLab = GitLabFactory.createGitLab(account, clientBuilder)
     }
-    private fun initPicasso(client: OkHttpClient) {
+    fun initPicasso(client: OkHttpClient) {
         picasso = PicassoFactory.createPicasso(client)
     }
 }

app/src/main/java/com/commit451/gitlab/activity/AddIssueActivity.kt

@@ -105,8 +105,8 @@ class AddIssueActivity : MorphActivity() {
                 AlertDialog.Builder(this@AddIssueActivity)
                         .setTitle(R.string.remove)
                         .setMessage(R.string.are_you_sure_you_want_to_remove)
-                        .setPositiveButton(android.R.string.yes) { _, _ -> adapterLabels.removeLabel(label) }
-                        .setNegativeButton(android.R.string.no) { dialog, _ -> dialog.dismiss() }
+                        .setPositiveButton(R.string.yes) { _, _ -> adapterLabels.removeLabel(label) }
+                        .setNegativeButton(R.string.no) { dialog, _ -> dialog.dismiss() }
                         .show()
             }
         })
@@ -273,8 +273,8 @@ class AddIssueActivity : MorphActivity() {
         AlertDialog.Builder(this)
                 .setTitle(R.string.discard)
                 .setMessage(R.string.are_you_sure_you_want_to_discard)
-                .setPositiveButton(android.R.string.yes) { _, _ -> dismiss() }
-                .setNegativeButton(android.R.string.no) { dialog, _ -> dialog.dismiss() }
+                .setPositiveButton(R.string.yes) { _, _ -> dismiss() }
+                .setNegativeButton(R.string.no) { dialog, _ -> dialog.dismiss() }
                 .show()
     }

app/src/main/java/com/commit451/gitlab/activity/IssueActivity.kt

@@ -145,7 +145,11 @@ class IssueActivity : BaseActivity() {
     @OnClick(R.id.fab_edit_issue)
     fun onEditIssueClick(fab: View) {
-        Navigator.navigateToEditIssue(this@IssueActivity, fab, project!!, issue!!)
+        val project = project
+        val issue = issue
+        if (project != null && issue != null) {
+            Navigator.navigateToEditIssue(this@IssueActivity, fab, project, issue)
+        }
     }
     override fun onCreate(savedInstanceState: Bundle?) {

app/src/main/java/com/commit451/gitlab/fragment/ProjectFragment.kt

@@ -76,8 +76,8 @@ class ProjectFragment : ButterKnifeFragment() {
             AlertDialog.Builder(activity)
                     .setTitle(R.string.project_fork_title)
                     .setMessage(R.string.project_fork_message)
-                    .setNegativeButton(android.R.string.cancel, null)
-                    .setPositiveButton(android.R.string.ok) { _, _ ->
+                    .setNegativeButton(R.string.cancel, null)
+                    .setPositiveButton(R.string.ok) { _, _ ->
                         App.get().gitLab.forkProject(it.id)
                                 .setup(bindUntilEvent(FragmentEvent.DESTROY_VIEW))
                                 .subscribe(object : CustomSingleObserver<String>() {

app/src/main/res/values/strings.xml

@@ -5,6 +5,10 @@
     <string name="app_name">LabCoat</string>
     <string name="unknown">Unknown</string>
     <string name="or">or</string>
+    <string name="ok">OK</string>
+    <string name="cancel">Cancel</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
     <!-- Drawer -->
     <string name="nav_projects">Projects</string>