diff --git a/Makefile b/Makefile index 97cf5d48..8cf4e4fc 100644 --- a/Makefile +++ b/Makefile @@ -127,16 +127,17 @@ deploy: if [ '$(DEVICE_IP)' != '' ]; then \ ldid -Sentitlements.xml Natives/build/PojavLauncher.app/PojavLauncher; \ if [ '$(DEVICE_PORT)' != '' ]; then \ - scp -P $(DEVICE_PORT) Natives/build/libpojavexec.dylib root@$(DEVICE_IP):/Applications/PojavLauncher.app/Frameworks/libpojavexec.dylib || exit 1; \ - scp -P $(DEVICE_PORT) Natives/build/PojavLauncher.app/PojavLauncher root@$(DEVICE_IP):/Applications/PojavLauncher.app/PojavLauncher || exit 1; \ - scp -P $(DEVICE_PORT) JavaApp/local_out/launcher.jar root@$(DEVICE_IP):/Applications/PojavLauncher.app/libs/launcher.jar || exit 1; \ - ssh root@$(DEVICE_IP) -p $(DEVICE_PORT) -t "killall PojavLauncher"; \ + scp -P $(DEVICE_PORT) -o "StrictHostKeyChecking no" -o "UserKnownHostsFile=/dev/null" Natives/build/libpojavexec.dylib \ + Natives/build/PojavLauncher.app/PojavLauncher \ + JavaApp/local_out/launcher.jar \ + root@$(DEVICE_IP):/var/tmp; \ + ssh root@$(DEVICE_IP) -p $(DEVICE_PORT) -t "mv /var/tmp/libpojavexec.dylib /Applications/PojavLauncher.app/Frameworks/libpojavexec.dylib && mv /var/tmp/PojavLauncher /Applications/PojavLauncher.app/PojavLauncher && mv /var/tmp/launcher.jar /Applications/PojavLauncher.app/libs/launcher.jar && killall PojavLauncher"; \ else \ - scp Natives/build/libpojavexec.dylib root@$(DEVICE_IP):/Applications/PojavLauncher.app/Frameworks/libpojavexec.dylib || exit 1; \ - scp Natives/build/PojavLauncher.app/PojavLauncher root@$(DEVICE_IP):/Applications/PojavLauncher.app/PojavLauncher || exit 1; \ - scp JavaApp/local_out/launcher.jar root@$(DEVICE_IP):/Applications/PojavLauncher.app/libs/launcher.jar || exit 1; \ - ssh root@$(DEVICE_IP) -p $(DEVICE_PORT) -t "killall PojavLauncher"; \ - ssh root@$(DEVICE_IP) -t "killall PojavLauncher"; \ + scp -o "StrictHostKeyChecking no" -o "UserKnownHostsFile=/dev/null" Natives/build/libpojavexec.dylib \ + Natives/build/PojavLauncher.app/PojavLauncher \ + JavaApp/local_out/launcher.jar \ + root@$(DEVICE_IP):/var/tmp; \ + ssh root@$(DEVICE_IP) -t "mv /var/tmp/libpojavexec.dylib /Applications/PojavLauncher.app/Frameworks/libpojavexec.dylib && mv /var/tmp/PojavLauncher /Applications/PojavLauncher.app/PojavLauncher && mv /var/tmp/launcher.jar /Applications/PojavLauncher.app/libs/launcher.jar && killall PojavLauncher"; \ fi; \ else \ echo 'You need to run '\''export DEVICE_IP='\'' to use make deploy.'; \ diff --git a/Natives/AboutLauncherViewController.m b/Natives/AboutLauncherViewController.m index 62fc8944..4f453d85 100644 --- a/Natives/AboutLauncherViewController.m +++ b/Natives/AboutLauncherViewController.m @@ -52,18 +52,25 @@ [logoVerView setFont:[UIFont boldSystemFontOfSize:10]]; UILabel *logoNoteView = [[UILabel alloc] initWithFrame:CGRectMake(20.0, 10.0, width - 40, 700)]; - logoNoteView.text = @"Created by PojavLauncherTeam in 2021. We do not exist on TikTok. No one from the dev team makes TikTok videos.\n\nDuyKhanhTran - lead iOS port developer\nDoregon - UI/UX design\n\nSpecial thanks to Hayden Seay, for porting OpenJDK 16, making this possible, and hosting on Procursus."; + logoNoteView.text = @"Created by PojavLauncherTeam in 2021. We do not exist on TikTok. No one from the dev team makes TikTok videos.\n\nDuyKhanhTran - lead iOS port developer\nDoregon - UI/UX design\nSpecial thanks to Hayden Seay, for porting OpenJDK 16, making this possible, and hosting on Procursus."; logoNoteView.lineBreakMode = NSLineBreakByWordWrapping; logoNoteView.numberOfLines = 0; [logoNoteView sizeToFit]; [scrollView addSubview:logoNoteView]; - UITextView *links = [[UITextView alloc] initWithFrame:CGRectMake(15, logoNoteView.frame.size.height + 9, width - 40, height - (logoNoteView.frame.size.height + 9))]; - links.text = @"Discord: https://discord.gg/pojavlauncher\nGitHub: https://bit.ly/2TIXhAA\nSubreddit: https://reddit.com/r/PojavLauncher\nWiki: https://pojavlauncherteam.github.io"; - links.editable = NO; - links.dataDetectorTypes = UIDataDetectorTypeAll; - [scrollView addSubview:links]; - [links setFont:[UIFont systemFontOfSize:17]]; + UITextView *linkTextView = [[UITextView alloc] initWithFrame:CGRectMake(15, logoNoteView.frame.size.height + 9, width - 40, 84)]; + linkTextView.text = @"Discord: https://discord.gg/pojavlauncher\nSubreddit: https://reddit.com/r/PojavLauncher\nWiki: https://pojavlauncherteam.github.io"; + linkTextView.editable = NO; + linkTextView.dataDetectorTypes = UIDataDetectorTypeAll; + [scrollView addSubview:linkTextView]; + [linkTextView setFont:[UIFont systemFontOfSize:17]]; + + UILabel *safetyNoteView = [[UILabel alloc] initWithFrame:CGRectMake(20.0, linkTextView.frame.origin.y + linkTextView.frame.size.height - 2, width - 40, 700)]; + safetyNoteView.text = @"Stay safe when jailbroken. Make sure to install PojavLauncher from the official repositories to prevent the risk of malware."; + safetyNoteView.lineBreakMode = NSLineBreakByWordWrapping; + safetyNoteView.numberOfLines = 0; + [safetyNoteView sizeToFit]; + [scrollView addSubview:safetyNoteView]; self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:@"Send your logs" style:UIBarButtonItemStyleDone target:self action:@selector(latestLogShare)]; diff --git a/Natives/resources/Assets.car b/Natives/resources/Assets.car index 5259412f..39333497 100644 Binary files a/Natives/resources/Assets.car and b/Natives/resources/Assets.car differ