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

Fixed account creator values in rc + removed splashscreen activity that is a bit useless after all

Browse source
This commit is contained in:
Sylvain Berfini 2019-05-21 10:07:52 +02:00
parent fdc3e164e4
commit 6ae75e34b9
5 changed files with 23 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/AndroidManifest.xml
View file

@ -66,7 +66,7 @@
<!-- Starting activities -->
<activity
android:name=".activities.SplashScreenActivity"
android:name=".activities.LinphoneLauncherActivity"
android:noHistory="true"
android:theme="@style/LinphoneLauncherStyle">
<intent-filter>
@ -76,11 +76,6 @@
</intent-filter>
</activity>
<activity
android:name=".activities.LinphoneLauncherActivity"
android:noHistory="true"
android:theme="@style/LinphoneLauncherStyle"/>
<!-- Main activities -->
<activity

5
app/src/main/java/org/linphone/activities/LinphoneLauncherActivity.java
View file

@ -21,6 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
import android.app.Activity;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.os.Bundle;
import android.os.Handler;
import org.linphone.LinphoneManager;
@ -39,6 +40,10 @@ public class LinphoneLauncherActivity extends Activity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getResources().getBoolean(R.bool.orientation_portrait_only)) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
}
if (!getResources().getBoolean(R.bool.use_full_screen_image_splashscreen)) {
setContentView(R.layout.launch_screen);
} // Otherwise use drawable/launch_screen layer list up until first activity starts

72
app/src/main/java/org/linphone/activities/SplashScreenActivity.java
View file

@ -1,72 +0,0 @@
package org.linphone.activities;
/*
SplashScreenActivity.java
Copyright (C) 2019 Belledonne Communications, Grenoble, France
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import android.app.Activity;
import android.content.Intent;
import android.content.pm.ActivityInfo;
import android.os.Bundle;
import android.os.Handler;
import org.linphone.R;
/**
* This activity does pretty much nothing except starting the linphone launcher that will be
* starting the Service which takes time and will delay the splashscreen UI creation to later, and
* until that time it will display the default windowBackground. This activity will load faster,
* thus showing the splashscreen sooner.
*/
public class SplashScreenActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (getResources().getBoolean(R.bool.orientation_portrait_only)) {
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
}
if (!getResources().getBoolean(R.bool.use_full_screen_image_splashscreen)) {
setContentView(R.layout.launch_screen);
} // Otherwise use drawable/launch_screen layer list up until first activity starts
}
@Override
protected void onResume() {
super.onResume();
// Start the linphone launcher asynchronously otherwise it will wait for launcher to be
// loaded which will render this workaround useless.
new Handler()
.postDelayed(
new Runnable() {
@Override
public void run() {
Intent intent = new Intent();
intent.setClass(
SplashScreenActivity.this, LinphoneLauncherActivity.class);
if (getIntent() != null && getIntent().getExtras() != null) {
intent.putExtras(getIntent().getExtras());
}
intent.setAction(getIntent().getAction());
intent.setType(getIntent().getType());
startActivity(intent);
}
},
100);
}
}

6
app/src/main/res/raw/default_assistant_create.rc
View file

@ -28,10 +28,10 @@
</section>
<section name="assistant">
<entry name="password_max_length" overwrite="true">-1</entry>
<entry name="password_min_length" overwrite="true">1</entry>
<entry name="password_min_length" overwrite="true">0</entry>
<entry name="username_length" overwrite="true">-1</entry>
<entry name="username_max_length" overwrite="true">64</entry>
<entry name="username_max_length" overwrite="true">128</entry>
<entry name="username_min_length" overwrite="true">1</entry>
<entry name="username_regex" overwrite="true">^[a-z0-9+_.\-]*$</entry>
<entry name="username_regex" overwrite="true">^[a-zA-Z0-9+_.\-]*$</entry>
</section>
</config>

8
app/src/main/res/raw/linphone_assistant_create.rc
View file

@ -26,4 +26,12 @@
<section name="lime">
<entry name="x3dh_server_url" overwrite="true">https://lime.linphone.org/lime-server/lime-server.php</entry>
</section>
<section name="assistant">
<entry name="password_max_length" overwrite="true">-1</entry>
<entry name="password_min_length" overwrite="true">1</entry>
<entry name="username_length" overwrite="true">-1</entry>
<entry name="username_max_length" overwrite="true">64</entry>
<entry name="username_min_length" overwrite="true">1</entry>
<entry name="username_regex" overwrite="true">^[a-z0-9+_.\-]*$</entry>
</section>
</config>