mirror of
https://code.briarproject.org/briar/briar.git
synced 2026-02-14 11:49:04 +01:00
Compare commits
4 Commits
release-1.
...
release-1.
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a114d4db15 | ||
|
|
73b7879c64 | ||
|
|
e622a518ac | ||
|
|
28ea3d014a |
@@ -8,8 +8,8 @@ android {
|
|||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 14
|
minSdkVersion 14
|
||||||
targetSdkVersion 26
|
targetSdkVersion 26
|
||||||
versionCode 10010
|
versionCode 10011
|
||||||
versionName "1.0.10"
|
versionName "1.0.11"
|
||||||
consumerProguardFiles 'proguard-rules.txt'
|
consumerProguardFiles 'proguard-rules.txt'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -238,8 +238,8 @@ android {
|
|||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion 14
|
minSdkVersion 14
|
||||||
targetSdkVersion 26
|
targetSdkVersion 26
|
||||||
versionCode 10010
|
versionCode 10011
|
||||||
versionName "1.0.10"
|
versionName "1.0.11"
|
||||||
applicationId "org.briarproject.briar.android"
|
applicationId "org.briarproject.briar.android"
|
||||||
resValue "string", "app_package", "org.briarproject.briar.android"
|
resValue "string", "app_package", "org.briarproject.briar.android"
|
||||||
resValue "string", "app_name", "Briar"
|
resValue "string", "app_name", "Briar"
|
||||||
|
|||||||
@@ -177,7 +177,7 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
|
|||||||
// FIXME #824
|
// FIXME #824
|
||||||
FragmentManager fm = getSupportFragmentManager();
|
FragmentManager fm = getSupportFragmentManager();
|
||||||
if (fm.findFragmentByTag(KeyAgreementFragment.TAG) == null) {
|
if (fm.findFragmentByTag(KeyAgreementFragment.TAG) == null) {
|
||||||
BaseFragment f = KeyAgreementFragment.newInstance(this);
|
BaseFragment f = KeyAgreementFragment.newInstance();
|
||||||
fm.beginTransaction()
|
fm.beginTransaction()
|
||||||
.replace(R.id.fragmentContainer, f, f.getUniqueTag())
|
.replace(R.id.fragmentContainer, f, f.getUniqueTag())
|
||||||
.addToBackStack(f.getUniqueTag())
|
.addToBackStack(f.getUniqueTag())
|
||||||
|
|||||||
@@ -91,15 +91,19 @@ public class KeyAgreementFragment extends BaseEventFragment
|
|||||||
private KeyAgreementTask task;
|
private KeyAgreementTask task;
|
||||||
private KeyAgreementEventListener listener;
|
private KeyAgreementEventListener listener;
|
||||||
|
|
||||||
public static KeyAgreementFragment newInstance(
|
public static KeyAgreementFragment newInstance() {
|
||||||
KeyAgreementEventListener listener) {
|
|
||||||
Bundle args = new Bundle();
|
Bundle args = new Bundle();
|
||||||
KeyAgreementFragment fragment = new KeyAgreementFragment();
|
KeyAgreementFragment fragment = new KeyAgreementFragment();
|
||||||
fragment.listener = listener;
|
|
||||||
fragment.setArguments(args);
|
fragment.setArguments(args);
|
||||||
return fragment;
|
return fragment;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onAttach(Context context) {
|
||||||
|
super.onAttach(context);
|
||||||
|
listener = (KeyAgreementEventListener) context;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void injectFragment(ActivityComponent component) {
|
public void injectFragment(ActivityComponent component) {
|
||||||
component.inject(this);
|
component.inject(this);
|
||||||
|
|||||||
@@ -62,8 +62,8 @@
|
|||||||
<string name="transport_bt">Bluetooth</string>
|
<string name="transport_bt">Bluetooth</string>
|
||||||
<string name="transport_lan">Wi-Fi</string>
|
<string name="transport_lan">Wi-Fi</string>
|
||||||
<!--Notifications-->
|
<!--Notifications-->
|
||||||
<string name="reminder_notification_title">Has sortit de Briar</string>
|
<string name="reminder_notification_title">Heu sortit de Briar</string>
|
||||||
<string name="reminder_notification_text">Toqueu per tornar a iniciar sessió o feu lliscar el dit per descartar.</string>
|
<string name="reminder_notification_text">Toqueu per reiniciar la sessió o feu lliscar el dit per descartar-la.</string>
|
||||||
<string name="reminder_notification_channel_title">Recordatori d\'inici de sessió de Briar</string>
|
<string name="reminder_notification_channel_title">Recordatori d\'inici de sessió de Briar</string>
|
||||||
<string name="ongoing_notification_title">Sessió iniciada</string>
|
<string name="ongoing_notification_title">Sessió iniciada</string>
|
||||||
<string name="ongoing_notification_text">Toca per a obrir Briar.</string>
|
<string name="ongoing_notification_text">Toca per a obrir Briar.</string>
|
||||||
@@ -224,8 +224,8 @@
|
|||||||
<item quantity="one">%d publicacio</item>
|
<item quantity="one">%d publicacio</item>
|
||||||
<item quantity="other">%d apunts</item>
|
<item quantity="other">%d apunts</item>
|
||||||
</plurals>
|
</plurals>
|
||||||
<string name="forum_new_entry_posted">Publicació del fòrum publicada</string>
|
<string name="forum_new_entry_posted">S\'ha publicat l\'apunt al fòrum</string>
|
||||||
<string name="forum_new_message_hint">Nova publicació</string>
|
<string name="forum_new_message_hint">Apunt nou</string>
|
||||||
<string name="forum_message_reply_hint">Resposta nova</string>
|
<string name="forum_message_reply_hint">Resposta nova</string>
|
||||||
<string name="btn_reply">Respon</string>
|
<string name="btn_reply">Respon</string>
|
||||||
<string name="forum_leave">Abandona el fòrum</string>
|
<string name="forum_leave">Abandona el fòrum</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user