Compare commits

..

4 Commits

Author SHA1 Message Date
akwizgran
a114d4db15 Bump version numbers for 1.0.11 release. 2018-07-04 08:45:03 +01:00
akwizgran
73b7879c64 Update translations. 2018-07-04 08:44:00 +01:00
akwizgran
e622a518ac Merge branch 'fix_npe_keyfrag' into 'master'
Fix a possible null reference bug

See merge request briar/briar!853
2018-07-03 17:20:59 +00:00
goapunk
28ea3d014a Fix a possible null reference bug 2018-07-03 11:33:13 +02:00
5 changed files with 16 additions and 12 deletions

View File

@@ -8,8 +8,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 26
versionCode 10010
versionName "1.0.10"
versionCode 10011
versionName "1.0.11"
consumerProguardFiles 'proguard-rules.txt'
}

View File

@@ -238,8 +238,8 @@ android {
defaultConfig {
minSdkVersion 14
targetSdkVersion 26
versionCode 10010
versionName "1.0.10"
versionCode 10011
versionName "1.0.11"
applicationId "org.briarproject.briar.android"
resValue "string", "app_package", "org.briarproject.briar.android"
resValue "string", "app_name", "Briar"

View File

@@ -177,7 +177,7 @@ public abstract class KeyAgreementActivity extends BriarActivity implements
// FIXME #824
FragmentManager fm = getSupportFragmentManager();
if (fm.findFragmentByTag(KeyAgreementFragment.TAG) == null) {
BaseFragment f = KeyAgreementFragment.newInstance(this);
BaseFragment f = KeyAgreementFragment.newInstance();
fm.beginTransaction()
.replace(R.id.fragmentContainer, f, f.getUniqueTag())
.addToBackStack(f.getUniqueTag())

View File

@@ -91,15 +91,19 @@ public class KeyAgreementFragment extends BaseEventFragment
private KeyAgreementTask task;
private KeyAgreementEventListener listener;
public static KeyAgreementFragment newInstance(
KeyAgreementEventListener listener) {
public static KeyAgreementFragment newInstance() {
Bundle args = new Bundle();
KeyAgreementFragment fragment = new KeyAgreementFragment();
fragment.listener = listener;
fragment.setArguments(args);
return fragment;
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
listener = (KeyAgreementEventListener) context;
}
@Override
public void injectFragment(ActivityComponent component) {
component.inject(this);

View File

@@ -62,8 +62,8 @@
<string name="transport_bt">Bluetooth</string>
<string name="transport_lan">Wi-Fi</string>
<!--Notifications-->
<string name="reminder_notification_title">Has 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_title">Heu sortit de Briar</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="ongoing_notification_title">Sessió iniciada</string>
<string name="ongoing_notification_text">Toca per a obrir Briar.</string>
@@ -224,8 +224,8 @@
<item quantity="one">%d publicacio</item>
<item quantity="other">%d apunts</item>
</plurals>
<string name="forum_new_entry_posted">Publicació del fòrum publicada</string>
<string name="forum_new_message_hint">Nova publicació</string>
<string name="forum_new_entry_posted">S\'ha publicat l\'apunt al fòrum</string>
<string name="forum_new_message_hint">Apunt nou</string>
<string name="forum_message_reply_hint">Resposta nova</string>
<string name="btn_reply">Respon</string>
<string name="forum_leave">Abandona el fòrum</string>