Merge branch 'dev' into firebase
commit
5db952d676
@ -1,116 +1,114 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout
|
<ScrollView
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent">
|
||||||
android:background="@drawable/default_session_background"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:layout_weight="1"/>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginLeft="@dimen/very_large_spacing"
|
|
||||||
android:layout_marginRight="@dimen/very_large_spacing"
|
|
||||||
android:textSize="@dimen/very_large_font_size"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:textColor="@color/text"
|
|
||||||
android:text="@string/activity_pn_mode_title" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginLeft="@dimen/very_large_spacing"
|
|
||||||
android:layout_marginTop="10dp"
|
|
||||||
android:layout_marginRight="@dimen/very_large_spacing"
|
|
||||||
android:textSize="@dimen/medium_font_size"
|
|
||||||
android:textColor="@color/text"
|
|
||||||
android:text="@string/activity_pn_mode_explanation" />
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/fcmOptionView"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginLeft="@dimen/very_large_spacing"
|
android:background="@drawable/default_session_background"
|
||||||
android:layout_marginTop="@dimen/medium_spacing"
|
android:orientation="vertical">
|
||||||
android:layout_marginRight="@dimen/very_large_spacing"
|
|
||||||
android:padding="12dp"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:background="@drawable/pn_option_background">
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textSize="@dimen/medium_font_size"
|
android:layout_marginLeft="@dimen/very_large_spacing"
|
||||||
android:textColor="@color/text"
|
android:layout_marginTop="@dimen/very_large_spacing"
|
||||||
|
android:layout_marginRight="@dimen/very_large_spacing"
|
||||||
|
android:textSize="@dimen/very_large_font_size"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:text="@string/activity_pn_mode_fcm_option_title" />
|
android:textColor="@color/text"
|
||||||
|
android:text="@string/activity_pn_mode_title" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginLeft="@dimen/very_large_spacing"
|
||||||
android:textSize="@dimen/very_small_font_size"
|
android:layout_marginTop="@dimen/medium_spacing"
|
||||||
|
android:layout_marginRight="@dimen/very_large_spacing"
|
||||||
|
android:textSize="@dimen/medium_font_size"
|
||||||
android:textColor="@color/text"
|
android:textColor="@color/text"
|
||||||
android:text="@string/activity_pn_mode_fcm_option_explanation" />
|
android:text="@string/activity_pn_mode_explanation" />
|
||||||
|
|
||||||
<TextView
|
<LinearLayout
|
||||||
|
android:id="@+id/fcmOptionView"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginLeft="@dimen/very_large_spacing"
|
||||||
android:textSize="@dimen/very_small_font_size"
|
android:layout_marginTop="20dp"
|
||||||
android:textColor="@color/accent"
|
android:layout_marginRight="@dimen/very_large_spacing"
|
||||||
android:textStyle="bold"
|
android:padding="12dp"
|
||||||
android:text="@string/activity_pn_mode_recommended_option_tag" />
|
android:orientation="vertical"
|
||||||
|
android:background="@drawable/pn_option_background">
|
||||||
|
|
||||||
</LinearLayout>
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textSize="@dimen/medium_font_size"
|
||||||
|
android:textColor="@color/text"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:text="@string/activity_pn_mode_fcm_option_title" />
|
||||||
|
|
||||||
<LinearLayout
|
<TextView
|
||||||
android:id="@+id/backgroundPollingOptionView"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_marginTop="4dp"
|
||||||
android:layout_marginLeft="@dimen/very_large_spacing"
|
android:textSize="@dimen/very_small_font_size"
|
||||||
android:layout_marginTop="@dimen/small_spacing"
|
android:textColor="@color/text"
|
||||||
android:layout_marginRight="@dimen/very_large_spacing"
|
android:text="@string/activity_pn_mode_fcm_option_explanation" />
|
||||||
android:padding="12dp"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:background="@drawable/pn_option_background">
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:textSize="@dimen/very_small_font_size"
|
||||||
|
android:textColor="@color/accent"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:text="@string/activity_pn_mode_recommended_option_tag" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/backgroundPollingOptionView"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textSize="@dimen/medium_font_size"
|
android:layout_marginLeft="@dimen/very_large_spacing"
|
||||||
android:textColor="@color/text"
|
android:layout_marginTop="@dimen/small_spacing"
|
||||||
android:textStyle="bold"
|
android:layout_marginRight="@dimen/very_large_spacing"
|
||||||
android:text="@string/activity_pn_mode_background_polling_option_title" />
|
android:padding="12dp"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:background="@drawable/pn_option_background">
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textSize="@dimen/medium_font_size"
|
||||||
|
android:textColor="@color/text"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:text="@string/activity_pn_mode_background_polling_option_title" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
|
android:textSize="@dimen/very_small_font_size"
|
||||||
|
android:textColor="@color/text"
|
||||||
|
android:text="@string/activity_pn_mode_background_polling_option_explanation" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
|
<Button
|
||||||
|
style="@style/MediumProminentFilledButton"
|
||||||
|
android:id="@+id/registerButton"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="@dimen/medium_button_height"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginLeft="@dimen/massive_spacing"
|
||||||
android:textSize="@dimen/very_small_font_size"
|
android:layout_marginTop="@dimen/medium_spacing"
|
||||||
android:textColor="@color/text"
|
android:layout_marginRight="@dimen/massive_spacing"
|
||||||
android:text="@string/activity_pn_mode_background_polling_option_explanation" />
|
android:layout_marginBottom="@dimen/medium_spacing"
|
||||||
|
android:text="@string/continue_2" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<View
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:layout_weight="1"/>
|
|
||||||
|
|
||||||
<Button
|
|
||||||
style="@style/MediumProminentFilledButton"
|
|
||||||
android:id="@+id/registerButton"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="@dimen/medium_button_height"
|
|
||||||
android:layout_marginLeft="@dimen/massive_spacing"
|
|
||||||
android:layout_marginRight="@dimen/massive_spacing"
|
|
||||||
android:layout_marginBottom="@dimen/medium_spacing"
|
|
||||||
android:text="Continue" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
</ScrollView>
|
@ -1,116 +1,114 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<LinearLayout
|
<ScrollView
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="wrap_content">
|
||||||
android:background="@drawable/default_session_background"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<View
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="0dp"
|
|
||||||
android:layout_weight="1"/>
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginLeft="@dimen/very_large_spacing"
|
|
||||||
android:layout_marginRight="@dimen/very_large_spacing"
|
|
||||||
android:textSize="18sp"
|
|
||||||
android:textStyle="bold"
|
|
||||||
android:textColor="@color/text"
|
|
||||||
android:text="@string/activity_pn_mode_title" />
|
|
||||||
|
|
||||||
<TextView
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginLeft="@dimen/very_large_spacing"
|
|
||||||
android:layout_marginTop="4dp"
|
|
||||||
android:layout_marginRight="@dimen/very_large_spacing"
|
|
||||||
android:textSize="13sp"
|
|
||||||
android:textColor="@color/text"
|
|
||||||
android:text="@string/activity_pn_mode_explanation" />
|
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/fcmOptionView"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginLeft="@dimen/very_large_spacing"
|
android:background="@drawable/default_session_background"
|
||||||
android:layout_marginTop="4dp"
|
android:orientation="vertical">
|
||||||
android:layout_marginRight="@dimen/very_large_spacing"
|
|
||||||
android:padding="10dp"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:background="@drawable/pn_option_background">
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textSize="14sp"
|
android:layout_marginLeft="@dimen/very_large_spacing"
|
||||||
android:textColor="@color/text"
|
android:layout_marginTop="@dimen/very_large_spacing"
|
||||||
|
android:layout_marginRight="@dimen/very_large_spacing"
|
||||||
|
android:textSize="@dimen/large_font_size"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:text="@string/activity_pn_mode_fcm_option_title" />
|
android:textColor="@color/text"
|
||||||
|
android:text="@string/activity_pn_mode_title" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginLeft="@dimen/very_large_spacing"
|
||||||
android:textSize="@dimen/very_small_font_size"
|
android:layout_marginTop="@dimen/small_spacing"
|
||||||
|
android:layout_marginRight="@dimen/very_large_spacing"
|
||||||
|
android:textSize="@dimen/small_font_size"
|
||||||
android:textColor="@color/text"
|
android:textColor="@color/text"
|
||||||
android:text="@string/activity_pn_mode_fcm_option_explanation" />
|
android:text="@string/activity_pn_mode_explanation" />
|
||||||
|
|
||||||
<TextView
|
<LinearLayout
|
||||||
|
android:id="@+id/fcmOptionView"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginLeft="@dimen/very_large_spacing"
|
||||||
android:textSize="@dimen/very_small_font_size"
|
android:layout_marginTop="12dp"
|
||||||
android:textColor="@color/accent"
|
android:layout_marginRight="@dimen/very_large_spacing"
|
||||||
android:textStyle="bold"
|
android:padding="12dp"
|
||||||
android:text="@string/activity_pn_mode_recommended_option_tag" />
|
android:orientation="vertical"
|
||||||
|
android:background="@drawable/pn_option_background">
|
||||||
|
|
||||||
</LinearLayout>
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textSize="@dimen/medium_spacing"
|
||||||
|
android:textColor="@color/text"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:text="@string/activity_pn_mode_fcm_option_title" />
|
||||||
|
|
||||||
<LinearLayout
|
<TextView
|
||||||
android:id="@+id/backgroundPollingOptionView"
|
android:layout_width="match_parent"
|
||||||
android:layout_width="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_marginTop="4dp"
|
||||||
android:layout_marginLeft="@dimen/very_large_spacing"
|
android:textSize="@dimen/very_small_font_size"
|
||||||
android:layout_marginTop="4dp"
|
android:textColor="@color/text"
|
||||||
android:layout_marginRight="@dimen/very_large_spacing"
|
android:text="@string/activity_pn_mode_fcm_option_explanation" />
|
||||||
android:padding="10dp"
|
|
||||||
android:orientation="vertical"
|
|
||||||
android:background="@drawable/pn_option_background">
|
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textSize="14sp"
|
android:layout_marginTop="4dp"
|
||||||
android:textColor="@color/text"
|
android:textSize="@dimen/very_small_font_size"
|
||||||
android:textStyle="bold"
|
android:textColor="@color/accent"
|
||||||
android:text="@string/activity_pn_mode_background_polling_option_title" />
|
android:textStyle="bold"
|
||||||
|
android:text="@string/activity_pn_mode_recommended_option_tag" />
|
||||||
|
|
||||||
<TextView
|
</LinearLayout>
|
||||||
|
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/backgroundPollingOptionView"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="4dp"
|
android:layout_marginLeft="@dimen/very_large_spacing"
|
||||||
android:textSize="@dimen/very_small_font_size"
|
android:layout_marginTop="@dimen/small_spacing"
|
||||||
android:textColor="@color/text"
|
android:layout_marginRight="@dimen/very_large_spacing"
|
||||||
android:text="@string/activity_pn_mode_background_polling_option_explanation" />
|
android:padding="12dp"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:background="@drawable/pn_option_background">
|
||||||
|
|
||||||
</LinearLayout>
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:textSize="@dimen/medium_spacing"
|
||||||
|
android:textColor="@color/text"
|
||||||
|
android:textStyle="bold"
|
||||||
|
android:text="@string/activity_pn_mode_background_polling_option_title" />
|
||||||
|
|
||||||
<View
|
<TextView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="0dp"
|
android:layout_height="wrap_content"
|
||||||
android:layout_weight="1"/>
|
android:layout_marginTop="4dp"
|
||||||
|
android:textSize="@dimen/very_small_font_size"
|
||||||
|
android:textColor="@color/text"
|
||||||
|
android:text="@string/activity_pn_mode_background_polling_option_explanation" />
|
||||||
|
|
||||||
<Button
|
</LinearLayout>
|
||||||
style="@style/MediumProminentFilledButton"
|
|
||||||
android:id="@+id/registerButton"
|
<Button
|
||||||
android:layout_width="match_parent"
|
style="@style/MediumProminentFilledButton"
|
||||||
android:layout_height="@dimen/medium_button_height"
|
android:id="@+id/registerButton"
|
||||||
android:layout_marginLeft="@dimen/massive_spacing"
|
android:layout_width="match_parent"
|
||||||
android:layout_marginRight="@dimen/massive_spacing"
|
android:layout_height="@dimen/medium_button_height"
|
||||||
android:layout_marginBottom="@dimen/medium_spacing"
|
android:layout_marginLeft="@dimen/massive_spacing"
|
||||||
android:text="@string/continue_2" />
|
android:layout_marginTop="@dimen/medium_spacing"
|
||||||
|
android:layout_marginRight="@dimen/massive_spacing"
|
||||||
|
android:layout_marginBottom="@dimen/medium_spacing"
|
||||||
|
android:text="@string/continue_2" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
||||||
|
|
||||||
</LinearLayout>
|
</ScrollView>
|
@ -1,38 +0,0 @@
|
|||||||
package org.thoughtcrime.securesms.loki.api
|
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import android.content.Intent
|
|
||||||
import org.thoughtcrime.securesms.database.DatabaseFactory
|
|
||||||
import org.thoughtcrime.securesms.service.PersistentAlarmManagerListener
|
|
||||||
import org.thoughtcrime.securesms.util.TextSecurePreferences
|
|
||||||
import java.util.concurrent.TimeUnit
|
|
||||||
|
|
||||||
class BackgroundOpenGroupPollWorker : PersistentAlarmManagerListener() {
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
private val pollInterval = TimeUnit.MINUTES.toMillis(4)
|
|
||||||
|
|
||||||
@JvmStatic
|
|
||||||
fun schedule(context: Context) {
|
|
||||||
BackgroundOpenGroupPollWorker().onReceive(context, Intent())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getNextScheduledExecutionTime(context: Context): Long {
|
|
||||||
return TextSecurePreferences.getOpenGroupBackgroundPollTime(context)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun onAlarm(context: Context, scheduledTime: Long): Long {
|
|
||||||
if (scheduledTime != 0L) {
|
|
||||||
val openGroups = DatabaseFactory.getLokiThreadDatabase(context).getAllPublicChats().map { it.value }
|
|
||||||
for (openGroup in openGroups) {
|
|
||||||
val poller = LokiPublicChatPoller(context, openGroup)
|
|
||||||
poller.stop()
|
|
||||||
poller.pollForNewMessages()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
val nextTime = System.currentTimeMillis() + pollInterval
|
|
||||||
TextSecurePreferences.setOpenGroupBackgroundPollTime(context, nextTime)
|
|
||||||
return nextTime
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue