TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-19 21:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #149 from loki-project/device-linking

Browse Source 
Clean
This commit is contained in:
gmbnt 2020-03-19 14:19:29 +11:00 committed by GitHub
commit a47021efc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
res/values-small/dimens.xml
View File

@ -1,5 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Session -->
<!-- Font Sizes -->
<dimen name="very_small_font_size">10sp</dimen>
<dimen name="small_font_size">13sp</dimen>
<dimen name="medium_font_size">15sp</dimen>
<dimen name="large_font_size">20sp</dimen>
<dimen name="very_large_font_size">25sp</dimen>
<dimen name="massive_font_size">50sp</dimen>
<!-- Session -->
<dimen name="onboarding_title_size">32sp</dimen>
<dimen name="onboarding_subtitle_size">18sp</dimen>
</resources>

10
res/values/dimens.xml
View File

@ -4,11 +4,11 @@
<!-- Session -->
<!-- Font Sizes -->
<dimen name="very_small_font_size">10sp</dimen>
<dimen name="small_font_size">13sp</dimen>
<dimen name="medium_font_size">15sp</dimen>
<dimen name="large_font_size">20sp</dimen>
<dimen name="very_large_font_size">25sp</dimen>
<dimen name="very_small_font_size">12sp</dimen>
<dimen name="small_font_size">15sp</dimen>
<dimen name="medium_font_size">17sp</dimen>
<dimen name="large_font_size">22sp</dimen>
<dimen name="very_large_font_size">27sp</dimen>
<dimen name="massive_font_size">50sp</dimen>
<!-- Element Sizes -->

7
src/org/thoughtcrime/securesms/BaseActionBarActivity.java
View File

@ -28,6 +28,7 @@ import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageActivityHe
import org.thoughtcrime.securesms.util.dynamiclanguage.DynamicLanguageContextWrapper;
import java.lang.reflect.Field;
import java.util.Date;
import network.loki.messenger.R;
@ -35,6 +36,7 @@ import network.loki.messenger.R;
public abstract class BaseActionBarActivity extends AppCompatActivity {
private static final String TAG = BaseActionBarActivity.class.getSimpleName();
private BroadcastReceiver broadcastReceiver;
private Date lastUnexpectedDeviceLinkRequestDate;
@Override
protected void onCreate(Bundle savedInstanceState) {
@ -57,6 +59,11 @@ public abstract class BaseActionBarActivity extends AppCompatActivity {
@Override
public void onReceive(Context context, Intent intent) {
Date now = new Date();
if (lastUnexpectedDeviceLinkRequestDate != null) {
if (now.getTime() - lastUnexpectedDeviceLinkRequestDate.getTime() < 30 * 1000) { return; }
}
lastUnexpectedDeviceLinkRequestDate = now;
Toast.makeText(BaseActionBarActivity.this, "Open the device link screen by going to \"Settings\"> \"Devices\" > \"Link a Device\" to link your devices.", Toast.LENGTH_LONG).show();
}
};