Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add missing strings

Browse source
This commit is contained in:
Margaux Clerc 2016-02-09 10:28:31 +01:00
parent bf62766a4e
commit 9ad4962aa0
5 changed files with 5 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
res/layout/assistant_remote_provisioning_login.xml
View file

@ -4,11 +4,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<TextView
<TextView
android:text="@string/assistant_remote_provisioning_title" android:text="@string/assistant_remote_provisioning_title"
android:contentDescription="@string/content_description_welcome"
style="@style/font6" style="@style/font6"
android:textAllCaps="true" android:textAllCaps="true"
android:paddingTop="20dp" android:paddingTop="20dp"

3
res/layout/remote_provisioning.xml
View file

@ -5,8 +5,7 @@
android:background="@color/colorH" android:background="@color/colorH"
android:orientation="vertical" > android:orientation="vertical" >
<ImageView <ImageView
android:contentDescription="@string/content_description_welcome"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:adjustViewBounds="true" android:adjustViewBounds="true"

1
res/values/strings.xml
View file

@ -85,6 +85,7 @@
<string name="wizard_password_incorrect">Your password is invalid (6 characters min).</string> <string name="wizard_password_incorrect">Your password is invalid (6 characters min).</string>
<string name="wizard_passwords_unmatched">Passwords do not match.</string> <string name="wizard_passwords_unmatched">Passwords do not match.</string>
<string name="setup_confirm_username">Your username will be %s.\r\n\r\nIt may differ from your input to match requirements.\r\nDo you accept?</string> <string name="setup_confirm_username">Your username will be %s.\r\n\r\nIt may differ from your input to match requirements.\r\nDo you accept?</string>
<string name="first_launch_no_login_password">Please enter your login and password</string>
<!-- Dailer --> <!-- Dailer -->
<string name="address_bar_hint">Enter a number or an address</string> <string name="address_bar_hint">Enter a number or an address</string>

35
src/org/linphone/ChatListFragment.java
View file

@ -204,41 +204,6 @@ public class ChatListFragment extends Fragment implements OnClickListener, OnIte
} else { } else {
backInCall.setVisibility(View.INVISIBLE); backInCall.setVisibility(View.INVISIBLE);
} }
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(LinphoneActivity.instance());
boolean updateNeeded = prefs.getBoolean(getString(R.string.pref_first_time_linphone_chat_storage), true);
updateNeeded = updateNeeded && !isVersionUsingNewChatStorage();
if (updateNeeded) {
AsyncTask<Void, Void, Void> task = new AsyncTask<Void, Void, Void>() {
private ProgressDialog pd;
@Override
protected void onPreExecute() {
pd = new ProgressDialog(LinphoneActivity.instance());
pd.setTitle(getString(R.string.wait));
pd.setMessage(getString(R.string.importing_messages));
pd.setCancelable(false);
pd.setIndeterminate(true);
pd.show();
}
@Override
protected Void doInBackground(Void... arg0) {
try {
if (importAndroidStoredMessagedIntoLibLinphoneStorage()) {
prefs.edit().putBoolean(getString(R.string.pref_first_time_linphone_chat_storage), false).commit();
LinphoneActivity.instance().getChatStorage().restartChatStorage();
}
} catch (Exception e) {
e.printStackTrace();
}
return null;
}
@Override
protected void onPostExecute(Void result) {
pd.dismiss();
}
};
task.execute((Void[])null);
}
if (LinphoneActivity.isInstanciated()) { if (LinphoneActivity.isInstanciated()) {
LinphoneActivity.instance().selectMenu(FragmentsAvailable.CHAT_LIST); LinphoneActivity.instance().selectMenu(FragmentsAvailable.CHAT_LIST);

4
src/org/linphone/assistant/RemoteProvisioningActivity.java
View file

@ -163,12 +163,12 @@ public class RemoteProvisioningActivity extends Activity {
new AlertDialog.Builder(RemoteProvisioningActivity.this) new AlertDialog.Builder(RemoteProvisioningActivity.this)
.setTitle(getString(R.string.remote_provisioning_again_title)) .setTitle(getString(R.string.remote_provisioning_again_title))
.setMessage(getString(R.string.remote_provisioning_again_message)) .setMessage(getString(R.string.remote_provisioning_again_message))
.setPositiveButton(R.string.button_ok, new DialogInterface.OnClickListener() { .setPositiveButton(R.string.accept, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
setRemoteProvisioningAddressAndRestart(configUriParam); setRemoteProvisioningAddressAndRestart(configUriParam);
} }
}) })
.setNegativeButton(R.string.button_cancel, new DialogInterface.OnClickListener() { .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
goToLinphoneActivity(); goToLinphoneActivity();
} }