Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
b74284e
Adaptations to Robolectric 4.3
TranceLove Jul 19, 2020
1b43654
build.gradle cleanups, add support for test against API 28
TranceLove Jul 25, 2020
75f496c
Fixes for editing SMB connections
TranceLove Jul 28, 2020
97db16f
[WIP] test cases collection and fixes as work goes on
TranceLove Aug 1, 2020
d280966
[WIP] test cases collection and fixes as work goes on
TranceLove Aug 2, 2020
eb9b94f
1946: Add translucent theme at amaze startup
VishalNehra Aug 7, 2020
67da23d
[WIP] test cases collection
TranceLove Aug 8, 2020
03b7d56
Additional try/catch to handle broken symlinks
TranceLove Aug 8, 2020
a0f2183
Fixes for editing SMB connections
TranceLove Jul 28, 2020
0b6a61c
MainActivityTest test addConnection()
TranceLove Aug 8, 2020
1d93a30
Changes per PR feedback
TranceLove Aug 9, 2020
6eaa25f
Merge pull request #1947 from TeamAmaze/issue/1946
TranceLove Aug 9, 2020
8e94af5
Adaptation for running the build on JDK 9
TranceLove Aug 9, 2020
9329fee
Fix screen rotation problem after PR #1947 applied
TranceLove Aug 10, 2020
21a3586
Merge pull request #1948 from TeamAmaze/bugfix/ssh-broken-symlink
TranceLove Aug 15, 2020
232d4e2
#1856. Fix for app crash when using save as option from browser. Adde…
Aug 16, 2020
e88d832
#1856. Fix for app crash when using save as option from browser. Adde…
Aug 16, 2020
7a6f2fa
Fix OTG not loading file lists on Android >= N + refactoring
TranceLove Aug 14, 2020
c6c77da
Fix unit test regression
TranceLove Aug 17, 2020
1f8c822
Merge pull request #1952 from TeamAmaze/bugfix/1946-regression
VishalNehra Aug 18, 2020
a207953
Merge pull request #1945 from TranceLove/bugfix/smb-mainthread-renaming
TranceLove Aug 19, 2020
14691f2
Lifting tweaks in CustomSshJConfig to enable advanced crypto features
TranceLove Aug 18, 2020
a42268e
Merge pull request #1962 from TeamAmaze/bugfix/1961
TranceLove Aug 19, 2020
a5473eb
Changes per PR feedback
TranceLove Aug 19, 2020
58bd39d
Fix screen rotation problem after PR #1947 applied
TranceLove Aug 10, 2020
d791bb4
Fixes for editing SMB connections
TranceLove Jul 28, 2020
8fa65d1
Lifting tweaks in CustomSshJConfig to enable advanced crypto features
TranceLove Aug 18, 2020
4cfdc04
#1856. Fix for app crash when using save as option from browser. Adde…
Aug 19, 2020
5192653
#1856. Fix for app crash when using save as option from browser. Adde…
Aug 19, 2020
b5a401c
#1856. Fix for app crash when using save as option from browser. Adde…
Aug 19, 2020
62691e4
Merge pull request #1958 from pcsaunak/release/3.5
VishalNehra Aug 20, 2020
999f6b1
Merge pull request #1959 from TeamAmaze/bugfix/1951
TranceLove Aug 20, 2020
f7d3f2a
Adaptations to Robolectric 4.3
TranceLove Jul 19, 2020
9aa4318
build.gradle cleanups, add support for test against API 28
TranceLove Jul 25, 2020
a1c5bf1
[WIP] test cases collection and fixes as work goes on
TranceLove Aug 1, 2020
d90cb83
[WIP] test cases collection and fixes as work goes on
TranceLove Aug 2, 2020
3d1bb3e
[WIP] test cases collection
TranceLove Aug 8, 2020
f57c275
MainActivityTest test addConnection()
TranceLove Aug 8, 2020
eeba28a
Adaptation for running the build on JDK 9
TranceLove Aug 9, 2020
80102b1
Merge branch 'TranceLove/feature/1918' of github.com:TeamAmaze/AmazeF…
TranceLove Aug 20, 2020
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
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,11 @@ public void onCreate() {
utilsProvider = new UtilitiesProvider(this);
utilsHandler = new UtilsHandler(this, utilitiesDatabase);

// FIXME: in unit tests when AppConfig is rapidly created/destroyed this call will cause
// IllegalThreadStateException.
// Until this gets fixed only one test case can be run in a time. - Raymond, 24/4/2018
backgroundHandlerThread.start();
backgroundHandler = new Handler(backgroundHandlerThread.getLooper());

runInBackground(jcifs.Config::registerSmbURLHandler);

// disabling file exposure method check for api n+
StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
StrictMode.setVmPolicy(builder.build());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
*/
public class UtilsHandler {

private static final String TAG = UtilsHandler.class.getSimpleName();

private final Context context;

private final UtilitiesDatabase utilitiesDatabase;
Expand Down Expand Up @@ -313,6 +315,13 @@ public void renameBookmark(String oldName, String oldPath, String newName, Strin
}

public void renameSMB(String oldName, String oldPath, String newName, String newPath) {
try {
oldPath = SmbUtil.getSmbEncryptedPath(AppConfig.getInstance(), oldPath);
newPath = SmbUtil.getSmbEncryptedPath(AppConfig.getInstance(), newPath);
} catch (GeneralSecurityException | IOException e) {
Log.e(TAG, "Error encrypting SMB path", e);
}

SmbEntry smbEntry = utilitiesDatabase.smbEntryDao().findByNameAndPath(oldName, oldPath);
smbEntry.name = newName;
smbEntry.path = newPath;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,6 @@ public void afterTextChanged(Editable s) {
String userp = "", passp = "", ipp = "", domainp = "";
conName.setText(name);
try {
jcifs.Config.registerSmbURLHandler();
URL a = new URL(path);
String userinfo = a.getUserInfo();
if (userinfo != null) {
Expand Down