Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue 881, 853: Repeat to create LPC connect/disconnect #279

Merged
merged 6 commits into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#### 2.15.1

- Fix it should show "answered by <ext>" in call history (issue 862)
- Fix ios it should not connect lpc multiple (issue 853, 881)

#### 2.14.10

- Implement runtime permissions request
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled true
versionCode 214010
versionName "2.14.10"
versionCode 215001
versionName "2.15.1"
}

signingConfigs {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -878,14 +878,14 @@ public void onClick(View v) {
case R.id.btn_back:
onRequestUnlock(v);
break;
// vIncomingCall
// vIncomingCall
case R.id.btn_answer:
onBtnAnswerClick(v);
break;
case R.id.btn_reject:
onBtnRejectClick(v);
break;
// vCallManage
// vCallManage
case R.id.view_call_manage:
onViewCallManageClick(v);
break;
Expand Down
2 changes: 2 additions & 0 deletions ios/BrekekeLPC/Settings/Settings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ public struct Settings: Codable, Equatable {
}

static var bundleIdentifier = "com.brekeke.phonedev"
static var lpcBundleIdentifier = "group.com.brekeke.lpcdev"

var pushManagerSettings = PushManagerSettings()
var token: String
var tokenVoip: String
Expand Down
2 changes: 1 addition & 1 deletion ios/BrekekeLPC/Settings/SettingsManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class SettingsManager: NSObject {
private let settingsWillWriteSubject = PassthroughSubject<Void, Never>()
private static let settingsKey = "settings"
private static let userDefaults =
UserDefaults(suiteName: "group.com.brekeke.lpc")!
UserDefaults(suiteName: Settings.lpcBundleIdentifier)!
private let settingsSubject: CurrentValueSubject<Settings, Never>
private static let logger = Logger(
prependString: "SettingsManager",
Expand Down
25 changes: 12 additions & 13 deletions ios/BrekekeLPCExtension/BrekekeLPCExtension.entitlements
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.developer.networking.networkextension</key>
<array>
<string>app-push-provider</string>
</array>
<key>com.apple.security.application-groups</key>
<array>
<string>group.com.brekeke.lpc</string>
</array>
</dict>
<dict>
<key>com.apple.developer.networking.networkextension</key>
<array>
<string>app-push-provider</string>
</array>
<key>com.apple.security.application-groups</key>
<array>
<string>group.com.brekeke.lpcdev</string>
</array>
</dict>
</plist>
4 changes: 2 additions & 2 deletions ios/BrekekePhone.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 16.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
MARKETING_VERSION = 2.14.10;
MARKETING_VERSION = 2.15.1;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.brekeke.phonedev.BrekekeLPCExtension;
Expand Down Expand Up @@ -858,7 +858,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 16.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
LIBRARY_SEARCH_PATHS = "$(SDKROOT)/usr/lib/swift$(inherited)";
MARKETING_VERSION = 2.14.10;
MARKETING_VERSION = 2.15.1;
MTL_FAST_MATH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.brekeke.phonedev.BrekekeLPCExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
69 changes: 34 additions & 35 deletions ios/BrekekePhone/BrekekePhone.entitlements
Original file line number Diff line number Diff line change
@@ -1,37 +1,36 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>aps-environment</key>
<string>production</string>
<key>com.apple.developer.icloud-container-identifiers</key>
<array>
<string>iCloud.$(CFBundleIdentifier)</string>
</array>
<key>com.apple.developer.icloud-services</key>
<array>
<string>CloudDocuments</string>
</array>
<key>com.apple.developer.networking.networkextension</key>
<array>
<string>app-push-provider</string>
</array>
<key>com.apple.developer.networking.wifi-info</key>
<true />
<key>com.apple.developer.ubiquity-container-identifiers</key>
<array>
<string>iCloud.$(CFBundleIdentifier)</string>
</array>
<key>com.apple.developer.ubiquity-kvstore-identifier</key>
<string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
<key>com.apple.security.application-groups</key>
<array>
<string>group.com.brekeke.lpc</string>
</array>
<key>keychain-access-groups</key>
<array>
<string>$(AppIdentifierPrefix)com.brekeke.phonedev</string>
</array>
</dict>
<dict>
<key>aps-environment</key>
<string>production</string>
<key>com.apple.developer.icloud-container-identifiers</key>
<array>
<string>iCloud.$(CFBundleIdentifier)</string>
</array>
<key>com.apple.developer.icloud-services</key>
<array>
<string>CloudDocuments</string>
</array>
<key>com.apple.developer.networking.networkextension</key>
<array>
<string>app-push-provider</string>
</array>
<key>com.apple.developer.networking.wifi-info</key>
<true/>
<key>com.apple.developer.ubiquity-container-identifiers</key>
<array>
<string>iCloud.$(CFBundleIdentifier)</string>
</array>
<key>com.apple.developer.ubiquity-kvstore-identifier</key>
<string>$(TeamIdentifierPrefix)$(CFBundleIdentifier)</string>
<key>com.apple.security.application-groups</key>
<array>
<string>group.com.brekeke.lpcdev</string>
</array>
<key>keychain-access-groups</key>
<array>
<string>$(AppIdentifierPrefix)com.brekeke.phonedev</string>
</array>
</dict>
</plist>
2 changes: 1 addition & 1 deletion ios/BrekekePhone/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.14.10</string>
<string>2.15.1</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "brekekephone",
"version": "2.14.10",
"version": "2.15.1",
"private": true,
"homepage": "./",
"scripts": {
Expand Down