Merge pull request #26 from jonan/master

Merge commits from Jonan repository

app/build.gradle

@@ -6,13 +6,13 @@ if (file('credentials.config').exists() ) {
 }
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '26.0.1'
+    compileSdkVersion 27
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         applicationId 'jp.forkhub'
         minSdkVersion 19
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1020800
         versionName '1.2.8'
     }
@@ -41,10 +41,10 @@ repositories {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.android.support:design:26.0.0'
+    compile 'com.android.support:design:27.0.2'
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.squareup.retrofit2:converter-moshi:2.3.0'
-    compile 'com.squareup.okhttp3:okhttp-urlconnection:3.8.1'
+    compile 'com.squareup.okhttp3:okhttp-urlconnection:3.9.1'
     compile 'org.roboguice:roboguice:2.0'
     compile 'com.google.code.gson:gson:2.7'
     compile 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:4.4.0.201606070830-r'

app/src/main/java/com/github/mobile/core/commit/CommitUriMatcher.java

@@ -45,11 +45,17 @@ public static Intent getCommitIntent(List<String> pathSegments) {
         if (repo == null)
             return null;
 
+        if (pathSegments.size() == 6) {
+            if ("pull".equals(pathSegments.get(2)) && "commits".equals(pathSegments.get(4))) {
+                return getSingleCommitIntent(repo, pathSegments);
+            } else {
+                return null;
+            }
+        }
+
         switch (pathSegments.get(2)) {
         case "commit":
             return getSingleCommitIntent(repo, pathSegments);
-        case "pull":
-            return getSingleCommitIntent(repo, pathSegments);
         case "compare":
             return getCommitCompareIntent(repo, pathSegments);
         default:
@@ -58,11 +64,7 @@ public static Intent getCommitIntent(List<String> pathSegments) {
     }
 
     private static Intent getSingleCommitIntent(Repository repo, List<String> pathSegments) {
-        String ref;
-        if (pathSegments.size() == 4 || pathSegments.size() == 6)
-            ref = pathSegments.get(pathSegments.size() - 1);
-        else
-            return null;
+        String ref = pathSegments.get(pathSegments.size() - 1);
 
         if (TextUtils.isEmpty(ref))
             return null;

app/src/main/java/com/github/mobile/ui/issue/IssuesViewActivity.java

@@ -319,7 +319,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
         case android.R.id.home:
             Repository repository = repo;
-            if (repository == null) {
+            if (repository == null && pager != null) {
                 int position = pager.getCurrentItem();
                 RepositoryId repoId = repoIds.get(position);
                 if (repoId != null) {

app/src/main/java/com/github/mobile/ui/repo/RepositoryContributorsFragment.java

@@ -98,8 +98,7 @@ public void onListItemClick(ListView l, View v, int position, long id) {
             protected void onSuccess(User user) throws Exception {
                 super.onSuccess(user);
 
-                if (!AccountUtils.isUser(getActivity(), user))
-                    startActivity(UserViewActivity.createIntent(user));
+                startActivity(UserViewActivity.createIntent(user));
             }
         }.execute();
     }

app/src/main/java/com/github/mobile/ui/search/SearchUserListFragment.java

@@ -103,8 +103,7 @@ public void onListItemClick(ListView l, View v, int position, long id) {
             protected void onSuccess(org.eclipse.egit.github.core.User user) throws Exception {
                 super.onSuccess(user);
 
-                if (!AccountUtils.isUser(getActivity(), user))
-                    startActivity(UserViewActivity.createIntent(user));
+                startActivity(UserViewActivity.createIntent(user));
             }
         }.execute();
     }

app/src/main/java/com/github/mobile/ui/team/TeamMembersFragment.java

@@ -91,8 +91,7 @@ protected SingleTypeAdapter<User> createAdapter(List<User> items) {
     @Override
     public void onListItemClick(ListView l, View v, int position, long id) {
         User user = (User) l.getItemAtPosition(position);
-        if (!AccountUtils.isUser(getActivity(), user))
-            startActivity(UserViewActivity.createIntent(user));
+        startActivity(UserViewActivity.createIntent(user));
     }
 
     @Override

app/src/main/java/com/github/mobile/ui/user/OrgMembersFragment.java

@@ -104,8 +104,7 @@ public void onOrganizationSelected(User organization) {
     @Override
     public void onListItemClick(ListView l, View v, int position, long id) {
         User user = (User) l.getItemAtPosition(position);
-        if (!AccountUtils.isUser(getActivity(), user))
-            startActivity(UserViewActivity.createIntent(user));
+        startActivity(UserViewActivity.createIntent(user));
     }
 
     @Override

app/src/main/java/com/github/mobile/ui/user/PagedUserFragment.java

@@ -56,7 +56,6 @@ protected SingleTypeAdapter<User> createAdapter(List<User> items) {
     @Override
     public void onListItemClick(ListView l, View v, int position, long id) {
         User user = (User) l.getItemAtPosition(position);
-        if (!AccountUtils.isUser(getActivity(), user))
-            startActivity(UserViewActivity.createIntent(user));
+        startActivity(UserViewActivity.createIntent(user));
     }
 }

app/src/main/res/values-pt-rBR/strings.xml

@@ -121,6 +121,7 @@
     <string name="issue_event_review_requested">solicitou revisão de %1$s</string>
     <string name="issue_event_review_request_removed">removeu a solicitação para revisão de %1$s</string>
     <string name="issue_event_reviewed">revisado</string>
+    <string name="issue_event_review_pending">iniciou uma revisão</string>
     <string name="issue_event_review_dismissed">rejeitou sua revisão</string>
     <string name="issue_event_closed">fechou isto</string>
     <string name="issue_event_closed_from_commit">fechou isto do commit %1$s</string>
@@ -335,13 +336,15 @@
     <string name="open_in_browser">Abrir no navegador</string>
     <string name="show_password">Mostrar senha</string>
     <string name="write">Escrever</string>
-    <string name="preview">Previsualizar</string>
+    <string name="preview">Pré-visualizar</string>
     <string name="show_raw_markdown">Mostrar remarcação pura</string>
     <string name="render_markdown">Iterpretar remarcação</string>
     <string name="copy_hash">Copiar hash</string>
     <string name="toast_msg_copied">Copiado para a área de tranferência</string>
     <string name="loading_teams">Carregando Equipes...</string>
     <string name="rate_forkhub_dialog_text">Se você gosta deste aplicativo, mostre sua avaliação classificando-o na Play Store.</string>
     <string name="rate">Taxa</string>
+    <string name="logout">Sair</string>
+    <string name="parent_repo">Repositório principal</string>
 
 </resources>

app/src/main/res/values-tr/strings.xml

@@ -24,6 +24,8 @@
     <string name="error_contributors_load">Katkıda Bulunanları Yükleme Başarısız Oldu</string>
     <string name="error_gist_load">Gist Yükleme Başarısız Oldu</string>
     <string name="error_notifications_load">Bildirimleri Yükleme Başarısız Oldu</string>
+    <string name="error_projects_load">Projeleri Yükleme Başarısız Oldu</string>
+    <string name="error_cards_load">Kartları Yükleme Başarısız Oldu</string>
     <string name="error_news_load">Haberleri Yükleme Başarısız Oldu</string>
     <string name="error_followers_load">Takipçileri Yükleme Başarısız Oldu</string>
     <string name="error_people_load">Kişileri Yükleme Başarısız Oldu</string>
@@ -60,6 +62,8 @@
     <string name="loading_notifications">Daha Fazla Bildirim Yükleniyor…</string>
     <string name="loading_more_issues">Daha Fazla Sorun Yükleniyor…</string>
     <string name="loading_issues">Sorunlar Yükleniyor…</string>
+    <string name="loading_projects">Projeler Yükleniyor…</string>
+    <string name="loading_cards">Kartlar Yükleniyor…</string>
     <string name="loading_comments">Yorumlar Yükleniyor…</string>
     <string name="loading_repositories">Depolar Yükleniyor…</string>
     <string name="loading_issue">Sorun Yükleniyor…</string>
@@ -68,6 +72,7 @@
     <string name="loading_people">Kişiler Yükleniyor…</string>
     <string name="loading_gists">Gist\'ler Yükleniyor…</string>
     <string name="loading_collaborators">Ortak Çalışanlar Yükleniyor…</string>
+    <string name="loading_teams">Takımlar Yükleniyor…</string>
     <string name="loading_milestones">Dönüm Noktaları Yükleniyor…</string>
     <string name="loading_labels">Etiketler Yükleniyor…</string>
     <string name="loading_commits">Onaylamalar Yükleniyor…</string>
@@ -90,6 +95,8 @@
     <string name="no_teams">Takım Yok</string>
     <string name="no_news">Haber Yok</string>
     <string name="no_commits">Onaylama Yok</string>
+    <string name="no_projects">Proje Yok</string>
+    <string name="no_cards">Kart Yok</string>
     <!--  -->
 
 
@@ -111,6 +118,11 @@
     <string name="issue_event_milestone_removed">bunu %1$s dönüm noktasından sildi</string>
     <string name="issue_event_merged">onaylama %1$s ile birleştirdi</string>
     <string name="issue_event_referenced">bu soruna %1$s onaylamasından referans verdi</string>
+    <string name="issue_event_cross_referenced">bu soruna %1$s deposundan referans verdi</string>
+    <string name="issue_event_review_requested">%1$s\'den inceleme istedi</string>
+    <string name="issue_event_review_request_removed">%1$s\'den gelen inceleme isteğini kaldırdı</string>
+    <string name="issue_event_reviewed">incelendi</string>
+    <string name="issue_event_review_dismissed">incelemesini reddetti</string>
     <string name="issue_event_closed">bunu kapattı</string>
     <string name="issue_event_closed_from_commit">%1$s onaylaması ile bunu kapattı</string>
     <string name="issue_event_reopened">bunu yeniden açtı</string>
@@ -157,6 +169,7 @@
     <string name="dashboard_issues_title">Sorun Kontrol Paneli</string>
     <string name="bookmarks">Yer İmleri</string>
     <string name="report_issue">Sorun bildir</string>
+    <string name="logout">Çıkış yap</string>
     <string name="gists_title">Gist\'ler</string>
     <string name="issue_title">Sorun #</string>
     <string name="pull_request_title">Çekme Talebi #</string>
@@ -184,9 +197,12 @@
     <string name="select_milestone">Dönüm Noktası Seç</string>
     <string name="select_labels">Etiket Seç</string>
     <string name="select_ref">Bir Dal Veya Etiket Seç</string>
+    <string name="login_pass_explanation">ForkHub parolanızı sadece &lt;i>Kişisel Erişim Anahtarı&lt;/i> oluşturmak için kullanacaktır. İsterseniz kendiniz bir adet &lt;a href=\"https://github.com/settings/tokens\">oluşturabilir&lt;/a> ve burada şifre olarak kullanabilirsiniz.</string>
     <string name="enter_otp_code_title">Doğrulama Kodu</string>
     <string name="enter_otp_code_message">Hesabınızda Iki-Faktörlü doğrulama etkin. Kimliğinizi doğrulamak için doğrulama kodunuzu giriniz.</string>
     <string name="star_forkhub_dialog_text">Eğer bu uygulamayı beğendiyseniz, lütfen desteğinizi oylayarak vererek gösteriniz.</string>
+    <string name="rate_forkhub_dialog_text">Bu uygulamayı beğendiyseniz, lütfen Play Store\'da derecelendirerek desteğinizi gösteriniz.</string>
+    <string name="rate">Derecelendir</string>
     <string name="no_milestone">Dönüm Noktası Yok</string>
     <string name="unassigned">Kimse Atanmamış</string>
     <string name="assigned">atanmış</string>
@@ -242,6 +258,7 @@
     <string name="prefix_created">oluşturuldu\u0020</string>
     <string name="prefix_updated">güncellendi\u0020</string>
     <string name="prefix_opened">açıldı\u0020</string>
+    <string name="updated">Güncellendi %1$s</string>
     <string name="clear">Temizle</string>
     <string name="pull_request_commits">Onaylamalar: %d</string>
     <string name="pull_request_mergeable_text">Bu dalın merkezi dal ile çakışması yok.</string>
@@ -308,6 +325,7 @@
     <string name="tab_code">Kod</string>
     <string name="tab_commits">Onaylamalar</string>
     <string name="tab_issues">Sorunlar</string>
+    <string name="tab_projects">projeler</string>
     <string name="tab_pull_requests">Çekme Istekleri</string>
     <string name="tab_watched">İzlediklerim</string>
     <string name="tab_assigned">Atandıklarım</string>
@@ -326,5 +344,6 @@
     <string name="render_markdown">Markdown dosyasını renderla</string>
     <string name="copy_hash">Hash Kodunu Kopyala</string>
     <string name="toast_msg_copied">Kopyalandı</string>
+    <string name="parent_repo">Ana depo</string>
 
 </resources>

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Mar 04 11:22:22 CET 2017
+#Sat Feb 03 17:59:02 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip