|
@@ -21,10 +21,8 @@
|
|
package com.nextcloud.talk.activities;
|
|
package com.nextcloud.talk.activities;
|
|
|
|
|
|
import android.annotation.SuppressLint;
|
|
import android.annotation.SuppressLint;
|
|
-import android.content.Context;
|
|
|
|
import android.os.Bundle;
|
|
import android.os.Bundle;
|
|
import android.util.Log;
|
|
import android.util.Log;
|
|
-import android.view.WindowManager;
|
|
|
|
import android.webkit.SslErrorHandler;
|
|
import android.webkit.SslErrorHandler;
|
|
|
|
|
|
import com.nextcloud.talk.R;
|
|
import com.nextcloud.talk.R;
|
|
@@ -47,7 +45,6 @@ import javax.inject.Inject;
|
|
import androidx.annotation.Nullable;
|
|
import androidx.annotation.Nullable;
|
|
import androidx.appcompat.app.AppCompatActivity;
|
|
import androidx.appcompat.app.AppCompatActivity;
|
|
import autodagger.AutoInjector;
|
|
import autodagger.AutoInjector;
|
|
-import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper;
|
|
|
|
|
|
|
|
@AutoInjector(NextcloudTalkApplication.class)
|
|
@AutoInjector(NextcloudTalkApplication.class)
|
|
public class BaseActivity extends AppCompatActivity {
|
|
public class BaseActivity extends AppCompatActivity {
|
|
@@ -58,16 +55,10 @@ public class BaseActivity extends AppCompatActivity {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
protected void onCreate(Bundle savedInstanceState) {
|
|
- getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
|
|
|
|
NextcloudTalkApplication.getSharedApplication().getComponentApplication().inject(this);
|
|
NextcloudTalkApplication.getSharedApplication().getComponentApplication().inject(this);
|
|
super.onCreate(savedInstanceState);
|
|
super.onCreate(savedInstanceState);
|
|
}
|
|
}
|
|
|
|
|
|
- @Override
|
|
|
|
- protected void attachBaseContext(Context newBase) {
|
|
|
|
- super.attachBaseContext(CalligraphyContextWrapper.wrap(newBase));
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
public void showCertificateDialog(X509Certificate cert, MagicTrustManager magicTrustManager,
|
|
public void showCertificateDialog(X509Certificate cert, MagicTrustManager magicTrustManager,
|
|
@Nullable SslErrorHandler sslErrorHandler) {
|
|
@Nullable SslErrorHandler sslErrorHandler) {
|
|
DateFormat formatter = DateFormat.getDateInstance(DateFormat.LONG);
|
|
DateFormat formatter = DateFormat.getDateInstance(DateFormat.LONG);
|