Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • briar/briar-mailbox
1 result
Show changes
Commits on Source (1)
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 33 deletions
build.gradle
View file @ 181c32a5
......@@ -27,6 +27,7 @@ allprojects {
//noinspection JcenterRepositoryObsolete
jcenter() // for dependencies that haven't moved, yet
mavenCentral()
mavenLocal()
}
}
......
mailbox-android/build.gradle
View file @ 181c32a5
......@@ -55,7 +55,7 @@ configurations {
dependencies {
implementation project(path: ':mailbox-core', configuration: 'default')
implementation project(path: ':dont-kill-me-lib')
implementation 'org.briarproject:dont-kill-me-lib:0.1'
implementation 'com.github.tony19:logback-android:2.0.0'
implementation 'androidx.appcompat:appcompat:1.4.1'
......
mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/AbstractDoNotKillMeFragment.java
View file @ 181c32a5
......@@ -44,7 +44,7 @@ public abstract class AbstractDoNotKillMeFragment extends Fragment
public View onCreateView(LayoutInflater inflater,
@Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
requireActivity().setTitle(getString(R.string.setup_doze_title));
requireActivity().setTitle(getString(R.string.dnkm_doze_title));
setHasOptionsMenu(false);
View v = inflater.inflate(R.layout.fragment_dont_kill_me, container,
false);
......@@ -93,8 +93,7 @@ public abstract class AbstractDoNotKillMeFragment extends Fragment
dozeView.setChecked(true);
} else if (getContext() != null) {
secondAttempt = true;
String s = getString(
org.briarproject.android.dontkillmelib.R.string.setup_doze_explanation);
String s = getString(R.string.dnkm_doze_explanation);
showOnboardingDialog(getContext(), s);
}
}
......
mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/DoNotKillMeUtils.java
View file @ 181c32a5
......@@ -12,8 +12,7 @@ public class DoNotKillMeUtils {
new AlertDialog.Builder(ctx,
R.style.OnboardingDialogTheme)
.setMessage(text)
.setNeutralButton(
org.briarproject.android.dontkillmelib.R.string.got_it,
.setNeutralButton(R.string.dnkm_got_it,
(dialog, which) -> dialog.cancel())
.show();
}
......
mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/DozeView.java
View file @ 181c32a5
......@@ -28,10 +28,9 @@ public class DozeView extends PowerView {
public DozeView(Context context, @Nullable AttributeSet attrs,
int defStyleAttr) {
super(context, attrs, defStyleAttr);
setText(org.briarproject.android.dontkillmelib.R.string.setup_doze_intro);
setText(R.string.dnkm_doze_intro);
setIcon(R.drawable.ic_battery_alert_white);
setButtonText(
org.briarproject.android.dontkillmelib.R.string.setup_doze_button);
setButtonText(R.string.dnkm_doze_button);
}
@Override
......@@ -45,7 +44,7 @@ public class DozeView extends PowerView {
@Override
protected int getHelpText() {
return org.briarproject.android.dontkillmelib.R.string.setup_doze_explanation;
return R.string.dnkm_doze_explanation;
}
@Override
......
mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/HuaweiAppLaunchView.java
View file @ 181c32a5
......@@ -26,10 +26,9 @@ public class HuaweiAppLaunchView extends PowerView {
public HuaweiAppLaunchView(Context context, @Nullable AttributeSet attrs,
int defStyleAttr) {
super(context, attrs, defStyleAttr);
setText(org.briarproject.android.dontkillmelib.R.string.setup_huawei_app_launch_text);
setText(R.string.dnkm_huawei_app_launch_text);
setIcon(R.drawable.ic_restore_mirrored_white);
setButtonText(
org.briarproject.android.dontkillmelib.R.string.setup_huawei_app_launch_button);
setButtonText(R.string.dnkm_huawei_app_launch_button);
}
@Override
......@@ -40,7 +39,7 @@ public class HuaweiAppLaunchView extends PowerView {
@Override
@StringRes
protected int getHelpText() {
return org.briarproject.android.dontkillmelib.R.string.setup_huawei_app_launch_help;
return R.string.dnkm_huawei_app_launch_help;
}
@Override
......
mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/HuaweiProtectedAppsView.java
View file @ 181c32a5
......@@ -4,6 +4,7 @@ import android.content.Context;
import android.util.AttributeSet;
import org.briarproject.android.dontkillmelib.PowerUtils;
import org.briarproject.mailbox.R;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
......@@ -27,9 +28,8 @@ public class HuaweiProtectedAppsView extends PowerView {
@Nullable AttributeSet attrs,
int defStyleAttr) {
super(context, attrs, defStyleAttr);
setText(org.briarproject.android.dontkillmelib.R.string.setup_huawei_text);
setButtonText(
org.briarproject.android.dontkillmelib.R.string.setup_huawei_button);
setText(R.string.dnkm_huawei_protected_text);
setButtonText(R.string.dnkm_huawei_protected_button);
}
@Override
......@@ -40,7 +40,7 @@ public class HuaweiProtectedAppsView extends PowerView {
@Override
@StringRes
protected int getHelpText() {
return org.briarproject.android.dontkillmelib.R.string.setup_huawei_help;
return R.string.dnkm_huawei_protected_help;
}
@Override
......
mailbox-android/src/main/java/org/briarproject/mailbox/android/dontkillme/XiaomiView.java
View file @ 181c32a5
......@@ -3,6 +3,8 @@ package org.briarproject.mailbox.android.dontkillme;
import android.content.Context;
import android.util.AttributeSet;
import org.briarproject.mailbox.R;
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
import androidx.annotation.UiThread;
......@@ -25,9 +27,8 @@ public class XiaomiView extends PowerView {
public XiaomiView(Context context, @Nullable AttributeSet attrs,
int defStyleAttr) {
super(context, attrs, defStyleAttr);
setText(org.briarproject.android.dontkillmelib.R.string.setup_xiaomi_text);
setButtonText(
org.briarproject.android.dontkillmelib.R.string.setup_xiaomi_button);
setText(R.string.dnkm_xiaomi_text);
setButtonText(R.string.dnkm_xiaomi_button);
}
@Override
......@@ -38,16 +39,14 @@ public class XiaomiView extends PowerView {
@Override
@StringRes
protected int getHelpText() {
return org.briarproject.android.dontkillmelib.R.string.setup_xiaomi_help;
return R.string.dnkm_xiaomi_help;
}
@Override
protected void onButtonClick() {
int bodyRes = isMiuiTenOrLater()
?
org.briarproject.android.dontkillmelib.R.string.setup_xiaomi_dialog_body_new
:
org.briarproject.android.dontkillmelib.R.string.setup_xiaomi_dialog_body_old;
? R.string.dnkm_xiaomi_dialog_body_new
: R.string.dnkm_xiaomi_dialog_body_old;
showOnboardingDialog(getContext(), getContext().getString(bodyRes));
setChecked(true);
}
......
mailbox-android/src/main/res/layout/fragment_dont_kill_me.xml
View file @ 181c32a5
......@@ -78,7 +78,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:enabled="false"
android:text="@string/create_account_button"
android:text="@string/button_continue"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
......
mailbox-android/src/main/res/layout/power_view.xml
View file @ 181c32a5
......@@ -14,7 +14,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/icon"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/setup_huawei_text" />
tools:text="@string/dnkm_huawei_protected_text" />
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/icon"
......@@ -23,7 +23,7 @@
android:layout_height="48dp"
android:layout_marginEnd="12dp"
android:layout_marginRight="12dp"
android:contentDescription="@string/help"
android:contentDescription="@string/dnkm_help"
android:padding="12dp"
app:layout_constraintBottom_toBottomOf="@+id/textView"
app:layout_constraintEnd_toStartOf="@+id/textView"
......@@ -53,7 +53,7 @@
app:layout_constraintEnd_toStartOf="@+id/helpButton"
app:layout_constraintStart_toEndOf="@+id/icon"
app:layout_constraintTop_toBottomOf="@+id/textView"
tools:text="@string/setup_huawei_button" />
tools:text="@string/dnkm_huawei_protected_button" />
<ImageButton
android:id="@+id/helpButton"
......@@ -61,7 +61,7 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/help"
android:contentDescription="@string/dnkm_help"
app:layout_constraintBottom_toBottomOf="@+id/button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/button"
......
settings.gradle
View file @ 181c32a5
......@@ -2,5 +2,3 @@ include ':mailbox-core'
include ':mailbox-android'
include ':mailbox-cli'
include ':mailbox-cli'
include ':dont-kill-me-lib'