Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-up-mirrors' into 'master'

Browse Source 
Fix up mirrors

See merge request fdroid/fdroidclient!697
This commit is contained in:
Hans-Christoph Steiner 2018-06-25 15:32:54 +00:00
commit 9e2800a9b9
3 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/org/fdroid/fdroid/net/DownloaderService.java
View File

@ -31,16 +31,24 @@ import android.os.PatternMatcher;
import android.os.Process; import android.os.Process;
import android.support.v4.content.LocalBroadcastManager; import android.support.v4.content.LocalBroadcastManager;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log;
import org.fdroid.fdroid.ProgressListener; import org.fdroid.fdroid.ProgressListener;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
import org.fdroid.fdroid.Utils; import org.fdroid.fdroid.Utils;
import org.fdroid.fdroid.data.SanitizedFile; import org.fdroid.fdroid.data.SanitizedFile;
import org.fdroid.fdroid.installer.ApkCache; import org.fdroid.fdroid.installer.ApkCache;
import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.SSLKeyException;
import javax.net.ssl.SSLPeerUnverifiedException;
import javax.net.ssl.SSLProtocolException;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.net.ConnectException; import java.net.ConnectException;
import java.net.HttpRetryException;
import java.net.NoRouteToHostException;
import java.net.SocketTimeoutException; import java.net.SocketTimeoutException;
import java.net.UnknownHostException;
/** /**
* DownloaderService is a service that handles asynchronous download requests * DownloaderService is a service that handles asynchronous download requests
@ -215,7 +223,10 @@ public class DownloaderService extends Service {
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
sendBroadcast(uri, Downloader.ACTION_INTERRUPTED, localFile, repoId, originalUrlString); sendBroadcast(uri, Downloader.ACTION_INTERRUPTED, localFile, repoId, originalUrlString);
} catch (ConnectException | SocketTimeoutException e) { } catch (ConnectException | HttpRetryException | NoRouteToHostException | SocketTimeoutException
| SSLHandshakeException | SSLKeyException | SSLPeerUnverifiedException | SSLProtocolException
| UnknownHostException e) {
Log.e(TAG, e.getLocalizedMessage());
sendBroadcast(uri, Downloader.ACTION_CONNECTION_FAILED, localFile, repoId, originalUrlString); sendBroadcast(uri, Downloader.ACTION_CONNECTION_FAILED, localFile, repoId, originalUrlString);
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();

5
app/src/main/java/org/fdroid/fdroid/views/ManageReposActivity.java
View File

@ -271,6 +271,9 @@ public class ManageReposActivity extends AppCompatActivity
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
dialog.dismiss(); dialog.dismiss();
if (isImportingRepo) {
ManageReposActivity.this.finish();
}
} }
}); });
@ -785,7 +788,7 @@ public class ManageReposActivity extends AppCompatActivity
repo.userMirrors = new String[]{url}; repo.userMirrors = new String[]{url};
} else { } else {
int last = repo.userMirrors.length; int last = repo.userMirrors.length;
repo.userMirrors = Arrays.copyOf(repo.userMirrors, last); repo.userMirrors = Arrays.copyOf(repo.userMirrors, last + 1);
repo.userMirrors[last] = url; repo.userMirrors[last] = url;
} }
values.put(RepoTable.Cols.USER_MIRRORS, Utils.serializeCommaSeparatedString(repo.userMirrors)); values.put(RepoTable.Cols.USER_MIRRORS, Utils.serializeCommaSeparatedString(repo.userMirrors));

2
app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
View File

@ -345,8 +345,10 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationB
} else { } else {
startActivity(new Intent(ACTION_ADD_REPO, intent.getData(), this, ManageReposActivity.class)); startActivity(new Intent(ACTION_ADD_REPO, intent.getData(), this, ManageReposActivity.class));
} }
finish();
} else if (parser.getErrorMessage() != null) { } else if (parser.getErrorMessage() != null) {
Toast.makeText(this, parser.getErrorMessage(), Toast.LENGTH_LONG).show(); Toast.makeText(this, parser.getErrorMessage(), Toast.LENGTH_LONG).show();
finish();
} }
} }
} }