d'autres changements mineurs
This commit is contained in:
parent
f61db30c39
commit
d853f62968
|
@ -24,7 +24,6 @@
|
|||
android:theme="@style/SplashTheme">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
|
|
@ -28,10 +28,10 @@ class MainActivity : BaseActivity() {
|
|||
|
||||
override val layout = R.layout.activity_main
|
||||
|
||||
@SuppressLint("StaticFieldLeak")
|
||||
override fun initialize() {
|
||||
// créer la liste de conversations en parallèle
|
||||
Log.d(this::class.java.simpleName, "creating conversation list")
|
||||
val task = @SuppressLint("StaticFieldLeak")
|
||||
object: AsyncTask<Context, Void, List<NornMessage>>() {
|
||||
|
||||
override fun doInBackground(vararg params: Context): List<NornMessage> {
|
||||
|
@ -45,8 +45,7 @@ class MainActivity : BaseActivity() {
|
|||
container.adapter = NornListAdapter(result.toMutableList(), this@MainActivity)
|
||||
}
|
||||
|
||||
}
|
||||
task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)
|
||||
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)
|
||||
|
||||
// demander de définir Norn Talk comme application SMS par défaut
|
||||
if (Telephony.Sms.getDefaultSmsPackage(applicationContext) != applicationContext.packageName) {
|
||||
|
|
|
@ -72,7 +72,7 @@ abstract class BaseActivity: AppCompatActivity() {
|
|||
override fun onResume() {
|
||||
// demander le mot de passe si l'utilisateur est sorti de l'application
|
||||
if (currentActivity == null)
|
||||
if (this.preferences.getString(getString(R.string.password_key), "") != getString(R.string.default_password))
|
||||
if (this.preferences.getString(getString(R.string.password_key), getString(R.string.default_password)) != getString(R.string.default_password))
|
||||
popUpPasswd(null)
|
||||
|
||||
// changer l'activité courante
|
||||
|
|
|
@ -1,6 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="app_name">Norn Talk</string>
|
||||
<string name="action_settings">Paramètres</string>
|
||||
<string name="cancel">Annuler</string>
|
||||
<string name="ok">OK</string>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<resources>
|
||||
<string name="app_name">Norn Talk</string>
|
||||
<string name="app_name" translatable="false">Norn Talk</string>
|
||||
<string name="action_settings">Settings</string>
|
||||
<string name="hello_blank_fragment" translatable="false">Hello blank fragment</string>
|
||||
<string name="cancel">Cancel</string>
|
||||
|
|
|
@ -24,8 +24,6 @@
|
|||
<style name="AppTheme.PopupTheme">
|
||||
<item name="android:windowIsTranslucent">true</item>
|
||||
<item name="android:windowCloseOnTouchOutside">true</item>
|
||||
|
||||
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
|
Loading…
Reference in a new issue