aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt')
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
index 196ccd3..37eef88 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
@@ -1,6 +1,6 @@
1/* 1/*
2 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon 2 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
3 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD 3 * Copyright (C) 2017-2019 Pacien TRAN-GIRARD
4 * 4 *
5 * This program is free software: you can redistribute it and/or modify 5 * This program is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by 6 * it under the terms of the GNU General Public License as published by
@@ -20,11 +20,11 @@ package org.pacien.tincapp.activities
20 20
21import android.content.Intent 21import android.content.Intent
22import android.os.Bundle 22import android.os.Bundle
23import android.support.annotation.LayoutRes 23import androidx.annotation.LayoutRes
24import android.support.annotation.StringRes 24import androidx.annotation.StringRes
25import android.support.design.widget.Snackbar 25import com.google.android.material.snackbar.Snackbar
26import android.support.v7.app.AlertDialog 26import androidx.appcompat.app.AlertDialog
27import android.support.v7.app.AppCompatActivity 27import androidx.appcompat.app.AppCompatActivity
28import android.view.* 28import android.view.*
29import kotlinx.android.synthetic.main.base_activity.* 29import kotlinx.android.synthetic.main.base_activity.*
30import org.pacien.tincapp.R 30import org.pacien.tincapp.R